diff --git a/lua_probject/base_project/Game/View/LoginView.lua b/lua_probject/base_project/Game/View/LoginView.lua index 7fc31ac5..2297cef3 100644 --- a/lua_probject/base_project/Game/View/LoginView.lua +++ b/lua_probject/base_project/Game/View/LoginView.lua @@ -11,6 +11,7 @@ function LoginView.new() local self = setmetatable({}, { __index = M }) self.class = "LoginView" self._full = true + self._full_offset = false self:init() return self end @@ -50,46 +51,8 @@ function M:init() iOSWXLoginErrorView.new() return end - GameApplication.Instance:SetAppInfo(self:EncodeAppInfo(self._lineData, self._chooseIndex)) - ViewUtil.ShowModalWait(true, "正在登录游戏...", 2) - coroutine.start(function() - coroutine.wait(8) - if self.isWXCallBackMark then - return - end - ViewUtil.CloseModalWait() - ViewUtil.ErrorTip(10000, "微信登录失败！") - if GetPlatform() == "iOS" then - view:GetController('wx').selectedIndex = 0 - view:GetChild('btn_ShowLine').visible = false - end - iOSWXLoginErrorView.new() - end) - if (not GameApplication.Instance.accountTest) then - GameApplication.Instance:WXLogin(handler(self, self.LoginCallBack)) - else - --local ctr_user = view:GetController("user") - local _tex_unionid = view:GetChild("tex_unionid") - - local utez = _tex_unionid.text --.. (ctr_user.selectedIndex + 1) - - local _data = {} - _data["userId"] = utez - local key = "userId" - local s, e = pcall(function() - Utils.SaveLocalFile(key, json.encode(_data)) - end) - if not s then - print("Error:" .. e) - end - DataManager.SelfUser.acc = utez - -- DataManager.SelfUser.acc = utez - DataManager.SelfUser.nick_name = utez - DataManager.SelfUser.sex = 1 - DataManager.SelfUser.head_url = "" - self:LoginCallBack(0) - end + self:CallWxLogin() -- end -- end) @@ -288,10 +251,10 @@ function M:QuickLogin() end function M:LoginCallBack(result, data) - self.isWXCallBackMark = true - print("微信登录返回================================================================") - print("result===>"..result) - pt(data) + -- self.isWXCallBackMark = true + -- print("微信登录返回================================================================") + -- print("result===>" .. result) + -- pt(data) if (not result) or result ~= 0 then if result == 10 then ViewUtil.ShowModalWait(true, nil, 2) @@ -300,7 +263,8 @@ function M:LoginCallBack(result, data) ViewUtil.CloseModalWait() return end - + ViewUtil.CloseModalWait() + PlayerPrefs.SetString("chooseLine", self._chooseIndex - 1) if data then local jd = json.decode(data) pt(jd) @@ -358,3 +322,56 @@ function M:ReplaceClip1(e, t, i, n) t.url = string.format("%s%03d", n, i) return i + 6 end + +function M:CallWxLogin(index) + local index = index or 0 + local view = self._view + + GameApplication.Instance:SetAppInfo(self:EncodeAppInfo(self._lineData, self._chooseIndex)) + ViewUtil.ShowModalWait(true, "正在登录游戏...", 2) + coroutine.start(function() + coroutine.wait(3) + if self.isWXCallBackMark then + return + end + if GetPlatform() == "iOS" then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(10000, "微信登录失败！") + view:GetController('wx').selectedIndex = 0 + view:GetChild('btn_ShowLine').visible = false + else + if index > 8 then + ViewUtil.CloseModalWait() + ViewUtil.ErrorTip(10000, "微信登录失败！") + iOSWXLoginErrorView.new() + else + self._chooseIndex = self._chooseIndex % 8 + 1 + self._view:GetChild('list_show').selectedIndex = self._chooseIndex - 1 + self:CallWxLogin(index + 1) + end + end + end) + if (not GameApplication.Instance.accountTest) then + GameApplication.Instance:WXLogin(handler(self, self.LoginCallBack)) + else + local _tex_unionid = view:GetChild("tex_unionid") + + local utez = _tex_unionid.text --.. (ctr_user.selectedIndex + 1) + + local _data = {} + _data["userId"] = utez + local key = "userId" + local s, e = pcall(function() + Utils.SaveLocalFile(key, json.encode(_data)) + end) + if not s then + print("Error:" .. e) + end + DataManager.SelfUser.acc = utez + -- DataManager.SelfUser.acc = utez + DataManager.SelfUser.nick_name = utez + DataManager.SelfUser.sex = 1 + DataManager.SelfUser.head_url = "" + self:LoginCallBack(0) + end +end diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua index 5eeb0780..b4db3b19 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_ResultView.lua @@ -132,10 +132,10 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards) end local list_residue = self._view:GetChild('list_residue') list_residue:RemoveChildrenToPool() - for i, v in ipairs(remaincards) do - local rc = list_residue:AddItemFromPool() - rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v) - end + -- for i, v in ipairs(remaincards) do + -- local rc = list_residue:AddItemFromPool() + -- rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v) + -- end end diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info b/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info index 3ae5f342..b68d2941 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/ab5pciv.info @@ -2,6 +2,9 @@ "objectStatus": { "n47_ab5p": { "collapsed": true + }, + "n45_ab5p": { + "collapsed": true } }, "adaptiveTest": true, diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info index 61b06a3a..574ccbdb 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/naupko.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n0_naup": { + "hidden": true + }, "n2_naup": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 4c933947..e552e0f9 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,25 +2,78 @@ "libview.firstColumnWidth": 367, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://v0j9abjygq7med", - "ui://v0j9abjygq7mcu" + "ui://m7iejg46ruljhmp", + "ui://2d9xdj6zngxlckb", + "ui://27vd145bko559b" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://v0j9abjygq7mcu", + "doc.activeDoc": "ui://27vd145bko559b", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", + "/buttons/", + "27vd145b", + "/component/", + "27vd145b", + "/component/share/", + "27vd145b", + "/font/", + "27vd145b", + "/font/images/", + "27vd145b", + "/font/images/btn_keyboard/", + "27vd145b", + "/font/images/win/", + "27vd145b", "/images/", + "27vd145b", + "/images/btn_keyboard/", + "27vd145b", + "/images/currency/", + "27vd145b", + "/images/dismiss_room/", + "27vd145b", + "/images/game/", + "27vd145b", + "/images/head/", + "27vd145b", + "/images/head/realname/", + "2d9xdj6z", + "/", + "2d9xdj6z", + "/component/", + "2d9xdj6z", + "/component/user_info/", + "2d9xdj6z", + "/component/user_info/edit/", "v0j9abjy", "/", + "v0j9abjy", + "/component/", + "v0j9abjy", + "/component/clearing/", + "v0j9abjy", + "/component/clearing/clearing1/", "lx6k641g", "/", "lx6k641g", - "/image/" + "/image/", + "m7iejg46", + "/", + "m7iejg46", + "/component/", + "m7iejg46", + "/component/Lst_info/", + "m7iejg46", + "/component/nav/", + "m7iejg46", + "/images/", + "m7iejg46", + "/mgr/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/Win_ConnectTip.xml b/wb_new_ui/assets/Common/Win_ConnectTip.xml index 6b8f263c..bd312f35 100644 --- a/wb_new_ui/assets/Common/Win_ConnectTip.xml +++ b/wb_new_ui/assets/Common/Win_ConnectTip.xml @@ -1,16 +1,16 @@ - + - - + +