强制打开观战

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

@@ -14,23 +14,8 @@ local function ShowMainView(self)
     self.root.familyType.selectedIndex = rootLastIndex or 1
 end
 
-local function LoadData(BanData)
-
-end
-
-local function GetIconFromGroupData(playerId, group)
-    local player = group.memberMap[playerId]
-    if player then
-        return player.portrait
-    end
-
-    print("玩家不在group中，无法找到头像 玩家id=", playerId)
-
-    return ""
-end
-
 local function RemoveItem(table, condition)
-    for _, item in pairs(table) do
+    for _,item in pairs(table) do
         if condition(item) then 
             table[_] = nil
         end
@@ -38,7 +23,7 @@ local function RemoveItem(table, condition)
 
     --修复下标
     local re = {}
-    for _, item in pairs(table) do
+    for _,item in pairs(table) do 
         re[#re + 1] = item
     end
 
@@ -51,11 +36,12 @@ local function GetPlayerFromGroupData(playerId, group)
         return player
     end
 
-    print("玩家不在group中， 玩家id=", playerId)
+    print("玩家不在group中， 玩家id=",playerId)
     return nil
 end
 
 local function AllUid(deskList)
+
     local re = {}
     pt(deskList)
     for _, player in pairs(deskList) do 
@@ -65,6 +51,7 @@ local function AllUid(deskList)
 end
 
 local function AddPlayer(data, self)
+
     if self.sending then 
         ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
         return
@@ -83,7 +70,7 @@ local function AddPlayer(data, self)
                 ViewUtil.ShowBannerOnScreenCenter("设置失败")
                 return
             end
-            data.deskList[#data.deskList + 1] = { uid = number.uid }
+            data.deskList[#data.deskList + 1] = {uid = number.uid}
             self:ReflashDesk()
         end)
     end)
@@ -111,13 +98,25 @@ local function DelPalyer(data, uid, self)
     end
     players = fix
     
+    self.sending = true
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function() self:ReflashDesk() end)
+    fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res) 
+        self.sending = false
+        if res.ReturnCode ~= 0 then 
+            ViewUtil.ShowBannerOnScreenCenter("删除失败")
+            return
+        end
+        data.deskList = RemoveItem(data.deskList, function(item)
+            if item.uid == uid then 
+                return true
+            end
+        end)
+        self:ReflashDesk() 
+    end)
 end
 
-
-
 local function DelDesk(data, self)
+
     if self.sending then 
         ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
         return
@@ -186,7 +185,7 @@ local function list_BanedPlayersRenderer(index, obj, data, self, fatherIndex)
 end
 
 local function list_banItemRenderer(index, obj, self)
-    local data = self.BanData[index + 1]
+    local data = self.BanData[index +1]
     --print("刷新关系")
     --pt(data)
     local tex_name = obj:GetChild("tex_name")
@@ -227,6 +226,7 @@ end
 
 
 function BanDesk:TryShow(r)
+
     local view = BanDesk.New()
 
     self.root = r
@@ -259,6 +259,7 @@ function BanDesk.New()
 end
 
 function BanDesk:Init()
+
     self.sending = false
 
     self.btn_close = self._view:GetChild("btn_close")
@@ -292,48 +293,20 @@ function BanDesk:Init()
         list_banItemRenderer(index, obj, self)
     end
 
-
-    --     list_BanedPlayers.itemRenderer = function(playerIndex, playerObj)
-
-    --         local loader_icon = playerObj:GetChild("loader_icon")
-    --         local tex_name = playerObj:GetChild("tex_name")
-
-    --         local player = data.deskList[playerIndex + 1]
-    --         playerObj:GetController("cStyle").selectedIndex = 0
-    --         tex_name.text = player.nick
-    --         local img = GetIconFromGroupData(player.uid, self.root._group)
-    --         ImageLoad.Load(img, loader_icon)
-
-    --         local btn_delPlayer = playerObj:GetChild("btn_delPlayer")
-    --         btn_delPlayer.onClick:Set(function()
-    --             -- 删除玩家按钮
-    --             self.changedIndex = index
-    --             DelPalyer(data, player.uid, self)
-    --         end)
-    --     end
-
-    --     list_BanedPlayers.numItems = #data.deskList
-
-    --     local add_play = list_BanedPlayers:AddItemFromPool()
-    --     add_play:GetController("cStyle").selectedIndex = 1
-    --     add_play:GetChild("btn_addPlayer").onClick:Set(function()
-    --         -- 添加玩家按钮
-    --         self.changedIndex = index
-    --         AddPlayer(data, self)
-    --     end)
-    -- end
 end
 
 function BanDesk:Reflash()
+
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local groupId = self.root._group.id
 
-    fgCtr:FG_GetBanTable1(groupId, function(res)
+    fgCtr:FG_GetBanTable1(groupId,function(res)
         self:GetBanTableCallback(res)
     end)
 end
 
 function BanDesk:GetBanTableCallback(res)
+
     self.BanData = Sort(res.Data.ban_list)
     self.list_banItem.numItems = #self.BanData
 
@@ -342,6 +315,7 @@ function BanDesk:GetBanTableCallback(res)
     local btn_addBanItem = addBanItem:GetChild("btn_addBanItem")
     addBanItem:GetController("cStyle").selectedIndex = 1
     btn_addBanItem.onClick:Set(function()
+
         if self.sending then 
             ViewUtil.ShowBannerOnScreenCenter("正在操作中。。")
             return
@@ -372,4 +346,5 @@ function BanDesk:CloseRemaskWindow()
     self.cSetName.selectedIndex = 0
 end
 
+
 return BanDesk

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

@@ -54,6 +54,7 @@ function FamilyMyFamily:TryShow(groupId, r)
 end
 
 function FamilyMyFamily:Show()
+
     self:Refalsh()
 
     HideMainView()
@@ -66,6 +67,7 @@ function FamilyMyFamily:Close()
 end
 
 function FamilyMyFamily:Refalsh()
+
     self.family = DataManager.groups.groupMap[self.groupId]
 
     self.tex_fName.text = self.family.name
@@ -75,7 +77,7 @@ function FamilyMyFamily:Refalsh()
     self.tex_nocice.text = self.family.notice
     ImageLoad.Load(self.family.o_portrait, self.loader_icon)
 
-    self.cStyle.selectedIndex = self.family.lev - 1
+    self.cStyle.selectedIndex = self.family.lev -1
 
     -- index = 0 是显示隐藏按钮
     self.showNumber = self.family.isShow
@@ -166,7 +168,7 @@ function FamilyMyFamily:Init()
 
     self.btn_quitFamily.onClick:Set(function()
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        print("发送了退出协议 familyid = ", self.family.id)
+        print("发送了退出协议 familyid = ",self.family.id)
         fgCtr:FG_ExitGroup(self.family.id, function(res)
             if res.ReturnCode ~= 0 then 
                 return
@@ -192,6 +194,7 @@ function FamilyMyFamily:Init()
     self.btn_confirmNotice.onClick:Set(ChangeNotice)
 
     self.btn_hideNumber.onClick:Set(function()
+
         if self.isShowContenting == true then 
             ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
             return
@@ -201,7 +204,7 @@ function FamilyMyFamily:Init()
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
         self.isShowContenting = true 
-        fgCtr:FG_SetGroupShow(0, self.family.id, function(res)
+        fgCtr:FG_SetGroupShow(0, self.family.id, function (res)
             print("收到协议M:FG_SetGroupShow")
             pt(res)
             self.isShowContenting = false
@@ -225,55 +228,7 @@ function FamilyMyFamily:Init()
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
         self.isShowContenting = true 
-        fgCtr:FG_SetGroupShow(1, self.family.id, function(res)
+        fgCtr:FG_SetGroupShow(1, self.family.id, function (res)
-            print("收到协议M:FG_SetGroupShow")
-            pt(res)
-            self.isShowContenting = false
-            if res.ReturnCode ~= 0 then
-                ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
-                return
-            end
-            self.family.isShow = 1
-            self:Refalsh()
-            ViewUtil.ShowBannerOnScreenCenter("设置成功")
-        end)
-    end)
-
-    self.btn_hideNumber.onClick:Set(function()
-        if self.isShowContenting == true then
-            ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
-            return
-        end
-
-        print("点击了")
-
-        local fgCtr = ControllerManager.GetController(NewGroupController)
-        self.isShowContenting = true
-        fgCtr:FG_SetGroupShow(0, self.family.id, function(res)
-            print("收到协议M:FG_SetGroupShow")
-            pt(res)
-            self.isShowContenting = false
-            if res.ReturnCode ~= 0 then
-                ViewUtil.ShowBannerOnScreenCenter("设置失败，请稍后再试。。")
-                return
-            end
-            self.family.isShow = 0
-            self:Refalsh()
-            ViewUtil.ShowBannerOnScreenCenter("设置成功")
-        end)
-    end)
-
-    self.btn_showNumber.onClick:Set(function()
-        if self.isShowContenting == true then
-            ViewUtil.ShowBannerOnScreenCenter("设置中，请稍后再试。。")
-            return
-        end
-
-        print("点击了")
-
-        local fgCtr = ControllerManager.GetController(NewGroupController)
-        self.isShowContenting = true
-        fgCtr:FG_SetGroupShow(1, self.family.id, function(res)
             print("收到协议M:FG_SetGroupShow")
             pt(res)
             self.isShowContenting = false

lua_probject/base_project/Game/View/FamilyView.lua

@@ -40,7 +40,7 @@ function M:init(url)
     self._full_offset = false
     local view = self._view
 
-    FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self)
+    -- FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
 
@@ -341,10 +341,10 @@ function M:UpdateFamilyRoom(fgCtr, id)
                 roomList[newIndex].id)
             obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1
             obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2
-            if self._group.isWatch == 1 then
+            -- if self._group.isWatch == 1 then
             -- 允许观战
             obj:GetController('type').selectedIndex = 1
-            end
+            -- end
             local plist = roomList[newIndex].plist
             local insertName = ""
             for i = 1, #plist do

wb_new_ui/assets/Family/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/box_time.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="435,66" extention="ComboBox">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="3"/>
+  <displayList>
+    <image id="n0_95rc" name="n0" src="95rc7d4p" fileName="FamilyRoomCardRecord/Image/Rectangle 165(2).png" xy="0,0" size="435,66">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_95rc" name="title" xy="0,-3" size="370,72" font="ui://27vd145bh35o7ill" fontSize="54" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+    <image id="n2_95rc" name="n2" src="95rc7d4o" fileName="FamilyRoomCardRecord/Image/Group 558.png" xy="369,0"/>
+  </displayList>
+  <ComboBox dropdown="ui://htcn7v3r95rc7d4m"/>
+  <customProperty target="" propertyId="0"/>
+  <customProperty target="" propertyId="0"/>
+  <customProperty target="" propertyId="0"/>
+</component>

wb_new_ui/assets/Family/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/box_time_item.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="414,66" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <text id="n1_95rc" name="title" xy="0,-3" size="414,72" font="ui://27vd145bh35o7ill" fontSize="54" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="99999&#xA;">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Family/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/box_time_popup.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="150,200">
+  <displayList>
+    <image id="n0_95rc" name="n0" src="95rc7d4p" fileName="FamilyRoomCardRecord/Image/Rectangle 165(2).png" xy="0,-4" size="150,208">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <list id="n1_95rc" name="list" xy="0,0" size="150,200" overflow="hidden" defaultItem="ui://htcn7v3r95rc7d4l">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+  <relation target="n1_95rc" sidePair="height-height"/>
+</component>

wb_new_ui/assets/Family/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/item_record.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2004,135">
+  <displayList>
+    <image id="n0_95rc" name="n0" src="95rc7d4f" fileName="Main/Image/Group 365.png" xy="-11,-11" size="2026,157"/>
+    <text id="n1_95rc" name="tex_time" xy="228,31" size="546,72" font="ui://27vd145bh35o7il1" fontSize="54" color="#444444" align="center" vAlign="middle" text="2025-03-21 14:30:23"/>
+    <image id="n2_95rc" name="n2" src="95rc7d4h" fileName="FamilyRoomCardRecord/Image/Rectangle 186.png" xy="999,15"/>
+    <text id="n3_95rc" name="tex_num" xy="1230,31" size="546,72" font="ui://27vd145bh35o7il1" fontSize="54" color="#444444" align="center" vAlign="middle" autoSize="none" text="50"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/FamilyRoomCardRecord/FamilyRoomCardRecord/com_familyRoomCardRecord.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170">
+  <displayList>
+    <image id="n0_95rc" name="n0" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="228,165" size="2076,993"/>
+    <image id="n1_95rc" name="n1" src="ieus7d1e" fileName="Main/Image/Rectangle 121.png" xy="246,183" size="2040,957"/>
+    <image id="n11_95rc" name="n11" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="931,24" group="n14_95rc">
+      <relation target="n12_95rc" sidePair="left-left"/>
+    </image>
+    <text id="n12_95rc" name="n12" xy="1048,27" size="436,94" group="n14_95rc" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="充值房卡记录">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <image id="n13_95rc" name="n13" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1538,24" group="n14_95rc" flip="hz">
+      <relation target="n12_95rc" sidePair="right-right"/>
+    </image>
+    <group id="n14_95rc" name="n14" xy="931,24" size="670,99"/>
+    <image id="n2_95rc" name="n2" src="95rc7d4e" fileName="Main/Image/Group 557.png" xy="264,304" size="2004,72"/>
+    <list id="n4_95rc" name="list_record" xy="182,396" size="2168,671" layout="flow_vt" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3r95rc7d4g" align="center">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n5_95rc" name="n5" xy="611,312" size="309,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" autoSize="none" text="时间"/>
+    <text id="n6_95rc" name="n6" xy="1610,314" size="309,56" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" autoSize="none" text="充值房卡数"/>
+    <graph id="n8_95rc" name="n8" xy="1263,304" size="6,73" type="rect" lineColor="#00000000" fillColor="#fffbefd3"/>
+    <component id="n9_95rc" name="box_time" src="95rc7d4n" fileName="FamilyRoomCardRecord/Component/box_time.xml" xy="1811,185">
+      <ComboBox visibleItemCount="10">
+        <item title="45"/>
+        <item title="37537"/>
+        <item title="8974"/>
+        <item title="879871"/>
+      </ComboBox>
+    </component>
+    <component id="n10_95rc" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/package.xml

@@ -363,6 +363,14 @@
     <image id="k3567d51" name="Rectangle 291.png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="20,19,50,55"/>
     <image id="k3567d52" name="Rectangle 290.png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="20,18,45,50"/>
     <component id="k3567d53" name="item_msg.xml" path="/FamilyMsgRecord/Component/"/>
+    <component id="ftxw7d54" name="com_familyRoomCardRecord.xml" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/"/>
+    <component id="ftxw7d55" name="box_time.xml" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/"/>
+    <component id="ftxw7d56" name="box_time_item.xml" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/"/>
+    <component id="ftxw7d57" name="box_time_popup.xml" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/"/>
+    <component id="ftxw7d58" name="item_record.xml" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/Component/"/>
+    <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/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1387,6 +1387,18 @@
     <component id="lj2n19e" name="Comp_3_HandCard2_Record.xml" path="/Main_new/Main_new_3/Component/"/>
     <component id="lj2n19f" name="Comp_3_OutCard2.xml" path="/Main_new/Main_new_3/Component/"/>
     <component id="lj2n19g" name="Comp_3_OutCard3.xml" path="/Main_new/Main_new_3/Component/"/>
+    <image id="ogdm19h" name="4919.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19i" name="4920.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19j" name="4921.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19k" name="4922.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19l" name="4923.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19m" name="4924.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19n" name="4925.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19o" name="4926.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19p" name="4927.png" path="/Main_new/record/font/"/>
+    <image id="ogdm19q" name="4928.png" path="/Main_new/record/font/"/>
+    <font id="ogdm19r" name="MJ_recordSpeed.fnt" path="/Main_new/record/font/"/>
+    <image id="ogdm19s" name="x.png" path="/Main_new/record/font/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes.meta

@@ -3,5 +3,5 @@ guid: c1652156a48ed314e92cb8121851e5aa
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/static/fonts/方正胖娃_GBK.ttf.meta

@@ -18,5 +18,5 @@ TrueTypeFontImporter:
   useLegacyBoundsCalculation: 0
   shouldRoundAdvanceValue: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/static/cdca520f4b13217a3dbd2189f62db36d
   assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "rank",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.6"
+    "version": "1.0.7"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.6",
+    "ver": "1.0.7",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.6",
+    "version": "1.0.7",
     "bundle": "base/main_zipaimajiang"
   }
 ]