diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index a2c44be8..d4c992c5 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -180,7 +180,7 @@ function M:connect(host, groupId, callback) end end) else - self.connecting = false + self:disconnect() _mgr_client:destroy() if callback then callback({ ReturnCode = 101 }) diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 65603634..c51b072a 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -580,8 +580,22 @@ function M:EnterGroup(fgCtr, id) ViewUtil:CloseModalWait2() if res.ReturnCode ~= 0 then if res.ReturnCode == 101 then - ViewUtil:ShowModalWait2(0.01) - self:EnterGroup(fgCtr, id) + -- ViewUtil:ShowModalWait2(0.01) + -- self:EnterGroup(fgCtr, id) + local _curren_msg = + MsgWindow.new( + self._root_view, + '您的账号在另一个地点登录， 请确定您的账号是否泄密', + MsgWindow.MsgMode.OnlyOk + ) + PlayerPrefs.DeleteKey('session_id') + PlayerPrefs.Save() + _curren_msg.onOk:Add( + function() + RestartGame() + end + ) + _curren_msg:Show() return end ViewUtil.ErrorTip(res.ReturnCode, "获取房间列表列表失败") diff --git a/lua_probject/base_project/Game/ViewManager.lua b/lua_probject/base_project/Game/ViewManager.lua index c8ae6485..cb3c07fa 100644 --- a/lua_probject/base_project/Game/ViewManager.lua +++ b/lua_probject/base_project/Game/ViewManager.lua @@ -63,9 +63,23 @@ local function __OnGameConnectAction(state) --这两种情况默认重连 elseif state == SocketCode.DisconnectByServer then -- __NetTip("网络断开连接！") - NetResetConnectWindow.ShowNetReset() - ControllerManager.reset_join_room = 0 - ControllerManager.ResetJionRoom() + -- NetResetConnectWindow.ShowNetReset() + local _curren_msg = + MsgWindow.new( + nil, + '您的账号在另一个地点登录， 请确定您的账号是否泄密', + MsgWindow.MsgMode.OnlyOk + ) + PlayerPrefs.DeleteKey('session_id') + PlayerPrefs.Save() + _curren_msg.onOk:Add( + function() + RestartGame() + end + ) + _curren_msg:Show() + -- ControllerManager.reset_join_room = 0 + -- ControllerManager.ResetJionRoom() elseif state == SocketCode.ExceptionOnConnect or state == SocketCode.NetworkException then -- __NetTip("请检查您的网络环境！") NetResetConnectWindow.ShowNetReset() diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index 34da9d35..208587a1 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,11 +1,11 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.16", + "ver": "1.0.17", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.16" + "version": "1.0.17" }, { "ver": "1.0.7", diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.16.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.17.bytes similarity index 94% rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.16.bytes rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.17.bytes index 71c5c6b5..838068f2 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.16.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.17.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes deleted file mode 100644 index 9ab52b55..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.66.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.66.bytes deleted file mode 100644 index c1211260..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.66.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.67.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.67.bytes deleted file mode 100644 index b296e7f8..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.67.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.85.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.85.bytes deleted file mode 100644 index c305797c..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.85.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.80.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.80.bytes deleted file mode 100644 index 1ec3f81e..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.80.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.58.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.58.bytes deleted file mode 100644 index 7ea27645..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.58.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/asset_config1.0.17.json b/wb_unity_pro/Pack/asset_config1.0.17.json new file mode 100644 index 00000000..208587a1 --- /dev/null +++ b/wb_unity_pro/Pack/asset_config1.0.17.json @@ -0,0 +1,109 @@ +[ + { + "lua_path": "/tolua_project,/base_project,/main_project", + "ver": "1.0.17", + "name": "base_script", + "check": true, + "bundle": "base/base_script", + "version": "1.0.17" + }, + { + "ver": "1.0.7", + "name": "common", + "check": true, + "bundle": "base/common", + "version": "1.0.7" + }, + { + "ver": "1.0.7", + "name": "login", + "check": true, + "bundle": "base/login", + "version": "1.0.7" + }, + { + "ver": "1.0.8", + "name": "lobby", + "check": true, + "bundle": "base/lobby", + "version": "1.0.8" + }, + { + "ver": "1.0.7", + "name": "Family", + "check": true, + "bundle": "base/Family", + "version": "1.0.7" + }, + { + "ver": "1.0.6", + "name": "chat", + "check": true, + "bundle": "base/chat", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "name": "newgroup", + "check": true, + "bundle": "base/newgroup", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "name": "rank", + "check": true, + "version": "1.0.6", + "bundle": "base/rank" + }, + { + "ver": "1.0.8", + "name": "main_majiang", + "check": true, + "version": "1.0.8", + "bundle": "base/main_majiang" + }, + { + "ver": "1.0.6", + "name": "main_poker", + "check": true, + "version": "1.0.6", + "bundle": "base/main_poker" + }, + { + "ver": "1.0.6", + "name": "main_zipai", + "check": true, + "version": "1.0.6", + "bundle": "base/main_zipai" + }, + { + "ver": "1.0.6", + "name": "static", + "check": true, + "bundle": "base/static", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "is_res": true, + "name": "embed", + "check": true, + "bundle": "base/embed", + "version": "1.0.6" + }, + { + "ver": "1.0.6", + "name": "main_pokemajiang", + "check": true, + "version": "1.0.6", + "bundle": "base/main_pokemajiang" + }, + { + "ver": "1.0.6", + "name": "main_zipaimajiang", + "check": true, + "version": "1.0.6", + "bundle": "base/main_zipaimajiang" + } +]