同步

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -50,6 +50,7 @@ function M:FG_GroupList(callback)
                 group.messageCount = tem.messageCount
                 group.joins = tem.joins
                 group.notice = tem.notice
+                group.ban = tem.ban
                 l_groups:add(group)
             end
         end
@@ -171,6 +172,9 @@ function M:FG_UpdateGroupInfo(data, callback)
 
     if data.ban == nil then
         data.ban = group.ban
+        if data.ban == nil then
+            data.ban = 1
+        end
     end
 
     if data.ban_chat1 == nil then

lua_probject/base_project/Game/Controller/RoomController.lua

@@ -175,8 +175,9 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 			pt(game_info)
 			if ExtendHotupdate.CheckVersion(game_info) ~= ExtendHotupdate.VERSION_NORMAL then
 				ExtendHotupdate.UpdateGame(game_info, function()
-					res.ReturnCode = -2
+					-- res.ReturnCode = -2
-					callback(res)
+					-- callback(res)
+					self:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 				end)
 				return
 			end

lua_probject/base_project/Game/View/FamilyView.lua

@@ -729,7 +729,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
                 roomCtr:PublicJoinRoom(
                     Protocol.WEB_FG_MATCH_ROOM,
                     "",
-                    true,
+                    false,
                     function(response)
                         if (response.ReturnCode == -1) then
                             ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml

@@ -4,7 +4,7 @@
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
-  <controller name="mask_voice" pages="0,,1," selected="0"/>
+  <controller name="mask_voice" pages="0,,1," selected="1"/>
   <controller name="dismiss_room" pages="0,,1," selected="0"/>
   <controller name="Oener" pages="0,,1," selected="0"/>
   <controller name="tuoguan" pages="0,,1," selected="0"/>
@@ -73,10 +73,10 @@
     <component id="n56_n9qr" name="face" src="gq7m5x" fileName="component/head/Face3.xml" pkg="27vd145b" xy="0,0" size="144,144" alpha="0" touchable="false">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n57_n9qr" name="n57" src="n9qrclk" fileName="Main_new/Main/Image/gamechatback1(2).png" xy="-8,8" size="157,65" scale="1.3,1.3">
+    <image id="n57_n9qr" name="n57" src="n9qrclk" fileName="Main_new/Main/Image/gamechatback1(2).png" xy="-148,8" size="157,65" scale="1.3,1.3" flip="hz">
       <gearDisplay controller="mask_voice" pages="1"/>
     </image>
-    <component id="n58_n9qr" name="mask_voice" src="gq7m61" fileName="component/head/VoiceMask(1).xml" pkg="27vd145b" xy="18,14" touchable="false">
+    <component id="n58_n9qr" name="mask_voice" src="gq7m61" fileName="component/head/VoiceMask(1).xml" pkg="27vd145b" xy="-132,14" touchable="false">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
     <image id="n59_n9qr" name="n59" src="n9qrclp" fileName="Main_New/Image/coin.png" xy="-63,85" size="48,37">

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml

@@ -4,7 +4,7 @@
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
-  <controller name="mask_voice" pages="0,,1," selected="0"/>
+  <controller name="mask_voice" pages="0,,1," selected="1"/>
   <controller name="dismiss_room" pages="0,,1," selected="0"/>
   <controller name="Oener" pages="0,,1," selected="0"/>
   <controller name="tuoguan" pages="0,,1," selected="0"/>
@@ -69,14 +69,14 @@
       <gearDisplay controller="shengyu" pages="1"/>
       <relation target="" sidePair="left-center,right-center,top-bottom"/>
     </component>
-    <component id="n55_n9qr" name="chat" src="gq7m76" fileName="component/head/MsgBubble1.xml" pkg="27vd145b" xy="-148,36" size="216,67" alpha="0" touchable="false"/>
+    <component id="n55_n9qr" name="chat" src="gq7m6b" fileName="component/head/MsgBubble2.xml" pkg="27vd145b" xy="72,36" size="232,67" touchable="false"/>
     <component id="n56_n9qr" name="face" src="gq7m5x" fileName="component/head/Face3.xml" pkg="27vd145b" xy="0,0" size="144,144" alpha="0" touchable="false">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n57_n9qr" name="n57" src="n9qrclk" fileName="Main_new/Main/Image/gamechatback1(2).png" xy="-8,8" size="157,65" scale="1.3,1.3">
+    <image id="n57_n9qr" name="n57" src="n9qrclk" fileName="Main_new/Main/Image/gamechatback1(2).png" xy="74,8" size="157,65" scale="1.3,1.3">
       <gearDisplay controller="mask_voice" pages="1"/>
     </image>
-    <component id="n58_n9qr" name="mask_voice" src="gq7m61" fileName="component/head/VoiceMask(1).xml" pkg="27vd145b" xy="18,14" touchable="false">
+    <component id="n58_n9qr" name="mask_voice" src="gq7m61" fileName="component/head/VoiceMask(1).xml" pkg="27vd145b" xy="98,14" touchable="false">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
     <image id="n59_n9qr" name="n59" src="n9qrclp" fileName="Main_New/Image/coin.png" xy="153,85" size="48,37">

wb_new_ui/assets/Family/SelectNumber/Component/c_numberChild_select.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="2,up,3,down" selected="0"/>
   <controller name="lev" pages="0,群主,1,代理,2,普通" selected="0"/>
   <controller name="ban" pages="0,,1," selected="0"/>
-  <controller name="banDesk" pages="0,,1," selected="1"/>
+  <controller name="banDesk" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n1_86ct" name="n1" src="c8pn7cyy" fileName="NumberList/Image/Rectangle 2611.png" xy="-9,-3" size="779,198">
       <gearDisplay controller="ban" pages="0"/>
@@ -39,22 +39,23 @@
     <group id="n15_q3uh" name="n15" xy="13,15" size="614,170" advanced="true">
       <relation target="" sidePair="left-left"/>
     </group>
-    <image id="n8_86ct" name="n8" src="86ct7cwl" fileName="NumberList/Image/qunzhu.png" xy="594,12" group="n16_q3uh">
+    <image id="n8_86ct" name="n8" src="86ct7cwl" fileName="NumberList/Image/qunzhu.png" xy="664,15" size="88,46" group="n16_q3uh">
       <gearDisplay controller="lev" pages="0"/>
     </image>
-    <image id="n12_qz7i" name="n12" src="qz7i7cwx" fileName="NumberList/Image/zhuli.png" xy="594,15" group="n16_q3uh">
+    <image id="n12_qz7i" name="n12" src="qz7i7cwx" fileName="NumberList/Image/zhuli.png" xy="490,15" size="88,46" group="n16_q3uh">
       <gearDisplay controller="lev" pages="1"/>
     </image>
-    <image id="n13_qhq4" name="n13" src="qhq47d5n" fileName="NumberList/Image/禁玩.png" xy="492,15" group="n16_q3uh">
+    <image id="n13_qhq4" name="n13" src="qhq47d5n" fileName="NumberList/Image/禁玩.png" xy="388,15" size="88,45" group="n16_q3uh">
       <gearDisplay controller="ban" pages="1"/>
     </image>
-    <component id="n17_ofwa" name="n17" src="ofwa7d6k" fileName="Main/Component/btn_normol.xml" xy="667,57" size="85,72" group="n16_q3uh">
+    <group id="n16_q3uh" name="n16" xy="388,15" size="364,46" advanced="true">
-      <gearIcon controller="banDesk" pages="1" values="ui://htcn7v3r100mbt7d7n" default="ui://htcn7v3r100mbt7d7m"/>
-      <Button icon="ui://htcn7v3r100mbt7d7n"/>
-    </component>
-    <group id="n16_q3uh" name="n16" xy="492,12" size="260,117" advanced="true">
       <relation target="" sidePair="right-right"/>
     </group>
+    <component id="n17_ofwa" name="n17" src="ofwa7d6k" fileName="Main/Component/btn_normol.xml" xy="644,81" size="121,85">
+      <gearIcon controller="banDesk" pages="1" values="ui://htcn7v3r100mbt7d7n" default="ui://htcn7v3r100mbt7d7m"/>
+      <relation target="" sidePair="left-right"/>
+      <Button icon="ui://htcn7v3r100mbt7d7m"/>
+    </component>
   </displayList>
   <Button mode="Radio"/>
 </component>

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

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
   assetBundleVariant: 

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

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
   assetBundleVariant: 

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

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
   assetBundleVariant: 

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

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
   assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -1,41 +1,41 @@
 [
   {
-    "ver": "1.0.44",
+    "ver": "1.0.45",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.44",
+    "version": "1.0.45",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.62",
+    "ver": "1.0.63",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.62",
+    "version": "1.0.63",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.65",
+    "ver": "1.0.66",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.65",
+    "version": "1.0.66",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.49",
+    "ver": "1.0.50",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.49",
+    "version": "1.0.50",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.48",
+    "ver": "1.0.49",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.48",
+    "version": "1.0.49",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

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