diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index 282f9d1e..4c95b85a 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/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
diff --git a/lua_probject/base_project/Game/Controller/RoomController.lua b/lua_probject/base_project/Game/Controller/RoomController.lua
index 3211dd1a..1b83a0ea 100644
--- a/lua_probject/base_project/Game/Controller/RoomController.lua
+++ b/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
- callback(res)
+ -- res.ReturnCode = -2
+ -- callback(res)
+ self:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
end)
return
end
diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua
index 23bd5cc2..51f21289 100644
--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/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')
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml
index 43d9d266..6441796a 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_2.xml
@@ -4,7 +4,7 @@
-
+
@@ -73,10 +73,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml
index 8420a40c..e4b4fa7c 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_3.xml
@@ -4,7 +4,7 @@
-
+
@@ -69,14 +69,14 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Family/SelectNumber/Component/c_numberChild_select.xml b/wb_new_ui/assets/Family/SelectNumber/Component/c_numberChild_select.xml
index 1b06169d..41980a0c 100644
--- a/wb_new_ui/assets/Family/SelectNumber/Component/c_numberChild_select.xml
+++ b/wb_new_ui/assets/Family/SelectNumber/Component/c_numberChild_select.xml
@@ -3,7 +3,7 @@
-
+
@@ -39,22 +39,23 @@
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
index 661efe96..ddbd28cc 100644
Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgc.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgc.png.meta
index 9bed9e2c..2f48f646 100644
--- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgc.png.meta
+++ b/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:
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgd.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgd.png.meta
index bafe3c93..b17c3b65 100644
--- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgd.png.meta
+++ b/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:
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgh.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgh.png.meta
index a54b343d..95eb3e77 100644
--- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgh.png.meta
+++ b/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:
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgi.png.meta b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgi.png.meta
index 3d92db05..02d0360e 100644
--- a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_100mb7jgi.png.meta
+++ b/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:
diff --git a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index 47f08870..d3f91b02 100644
Binary files a/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ
diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json
index 0aa5aa33..4f092fb6 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json
+++ b/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"
}
diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json
index 9bd44449..dbe4feae 100644
--- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json
+++ b/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"
}
]
diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.12.bytes
deleted file mode 100644
index 5e1efa6e..00000000
Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.12.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes
new file mode 100644
index 00000000..3b4b88a6
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes
similarity index 97%
rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes
index a5dd4fbd..c9723994 100644
Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
similarity index 60%
rename from wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes
index 0e8b5731..b5560858 100644
Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.12.bytes and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.6.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.12.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
similarity index 100%
rename from wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.12.bytes
rename to wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.6.bytes
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.48.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.48.bytes
deleted file mode 100644
index 05bcf660..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.48.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.49.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.49.bytes
deleted file mode 100644
index ff225870..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.49.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.65.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.65.bytes
deleted file mode 100644
index df65e429..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.65.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.62.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.62.bytes
deleted file mode 100644
index 07e11da2..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.62.bytes and /dev/null differ
diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.44.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.44.bytes
deleted file mode 100644
index a548c850..00000000
Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.44.bytes and /dev/null differ