diff --git a/lua_probject/base_project/Game/Controller/RoomController.lua b/lua_probject/base_project/Game/Controller/RoomController.lua index bc0c69e5..3211dd1a 100644 --- a/lua_probject/base_project/Game/Controller/RoomController.lua +++ b/lua_probject/base_project/Game/Controller/RoomController.lua @@ -136,18 +136,23 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid) --获得玩法配置定位信息，如果开启了配置则必须强制有定位才能进入房间 local play = DataManager.groups:get(group_id):getPlay(pid) local pos = "" - if play and play.config and play.config.GPSDetection and play.config.GPSDetection > 0 then - if not DataManager.SelfUser.location then - get_gps(function(cmd, roomid, tem, callback, group_id, pid) - if not DataManager.SelfUser.location then - ViewUtil.ErrorMsg(nil, 55, "未开启gps定位，不能创建gps定位房") - return - end - self:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid) - end) - return + if play and play.config then + local config = json.decode(play.config) + if config.GPSDetection and config.GPSDetection > 0 then + if not DataManager.SelfUser.location then + get_gps(nil, { + _callback_lad = function(flag) + if flag then + self:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid) + return + end + ViewUtil.ErrorMsg(nil, 55, "未开启gps定位，不能创建gps定位房") + end + }) + return + end + pos = DataManager.SelfUser.location:Location2String() end - pos = DataManager.SelfUser.location:Location2String() end _data["pos"] = pos elseif cmd == Protocol.WEB_FG_QUEUE_ROOM then diff --git a/lua_probject/base_project/Game/View/ViewUtil.lua b/lua_probject/base_project/Game/View/ViewUtil.lua index bcf2aa49..99743ae2 100644 --- a/lua_probject/base_project/Game/View/ViewUtil.lua +++ b/lua_probject/base_project/Game/View/ViewUtil.lua @@ -227,10 +227,12 @@ function ad2d(decimal) end -- 获取gps -function get_gps(callback) +function get_gps(callback, data) + local _localAddress = data and data._callback_lad or nil if Application.platform == RuntimePlatform.IPhonePlayer or Application.platform == RuntimePlatform.Android then local s, e = pcall(function() Utils.LocalAddress(function(result, latitude, longitude) + if _localAddress then _localAddress(result, latitude, longitude) end if not result or (latitude == 0 and longitude == 0) then return end DataManager.SelfUser.location = Location.new(tostring(longitude) .. "," .. tostring(latitude)) if callback then callback() end diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index cb53d56f..0c9893ec 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json @@ -32,10 +32,10 @@ "bundle": "extend/majiang/nancheng" }, { - "ver": "1.0.33", + "ver": "1.0.34", "name": "黎川麻将", "check": true, - "version": "1.0.33", + "version": "1.0.34", "game_id": "87", "bundle": "extend/majiang/lichuan" }, diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index af385fff..b036bfbf 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.8", + "ver": "1.0.6", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.8" + "version": "1.0.6" }, { "ver": "1.0.8", @@ -29,11 +29,11 @@ "version": "1.0.8" }, { - "ver": "1.0.8", + "ver": "1.0.9", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.8" + "version": "1.0.9" }, { "ver": "1.0.8", diff --git a/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.18.bytes b/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.18.bytes deleted file mode 100644 index 26bbd3e0..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/fuzhou/asset_pack1.0.18.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.19.bytes b/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.19.bytes deleted file mode 100644 index 48089471..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/jinxi/asset_pack1.0.19.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.32.bytes b/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.32.bytes deleted file mode 100644 index 93731bec..00000000 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/nancheng/asset_pack1.0.32.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android/base/Family/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/Family/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes diff --git a/wb_unity_pro/Pack/Android/base/base_script/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes similarity index 56% rename from wb_unity_pro/Pack/Android/base/base_script/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes index 23516bcf..336b5659 100644 Binary files a/wb_unity_pro/Pack/Android/base/base_script/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes differ diff --git a/wb_unity_pro/Pack/Android/base/chat/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/chat/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/common/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes similarity index 99% rename from wb_unity_pro/Pack/Android/base/common/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes index a9d3a7cd..dbd71849 100644 Binary files a/wb_unity_pro/Pack/Android/base/common/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android/base/embed/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/embed/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/lobby/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/lobby/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/login/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/login/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/main_majiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes similarity index 99% rename from wb_unity_pro/Pack/Android/base/main_majiang/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes index 27fa5eea..1679dfc0 100644 Binary files a/wb_unity_pro/Pack/Android/base/main_majiang/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes differ diff --git a/wb_unity_pro/Pack/Android/base/main_pokemajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/main_pokemajiang/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/main_poker/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/main_poker/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/main_zipai/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/main_zipai/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/main_zipaimajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/main_zipaimajiang/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/newgroup/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/newgroup/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/rank/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/rank/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android/base/static/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes similarity index 100% rename from wb_unity_pro/Pack/Android/base/static/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.33.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.33.bytes index 6dfdb3d7..5dcc50ed 100644 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.33.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.33.bytes differ diff --git a/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.33.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes similarity index 98% rename from wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.33.bytes rename to wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes index 8b310248..5dcc50ed 100644 Binary files a/wb_unity_pro/Pack/Android/extend/majiang/lichuan/asset_pack1.0.33.bytes and b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes differ