diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua index 3b11b805..53bf89e8 100644 --- a/lua_probject/base_project/Game/Controller/LoginController.lua +++ b/lua_probject/base_project/Game/Controller/LoginController.lua @@ -49,7 +49,7 @@ local function __Login(cmd, _data, callBack) user.bind_pwd = data["havePassword"] user.retri_pwd = data["havegroup"] user.isBangding = tonumber(data.isBangding) - user.is_lock = tonumber(data.is_lock) or 0 + user.is_lock = tonumber(data.is_lock) or 0 user.real_info = account.real_info user.phone = account.phone @@ -218,7 +218,7 @@ function M:QuickLogin2(session_id, callback) end --设置是否绑定设备 -function M:LockDevice(flag,callback) +function M:LockDevice(flag, callback) local data = {} data.lockType = flag and 1 or 0 local _client = ControllerManager.WebClient @@ -227,6 +227,16 @@ function M:LockDevice(flag,callback) end) end +--快速登入加密 +function M:QuickPhoneLogin2(token, callback) + local _data = {} + _data.data = RSAHelper.Encrypt(json.encode({ + deviceCode = UnityEngine.SystemInfo.deviceModel .. UnityEngine.SystemInfo.operatingSystem + })) + _data.loginToken = token, + __Login(Protocol.WEB_PHONE_LOGIN2, _data, callback) +end + function M.OnEnter(self) --print("login controller enter") end diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index a1ff8a69..afc85bd0 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -69,6 +69,9 @@ Protocol = { --设置是否绑定设备 WEB_LOCK_DEVICE = "acc/lock_device", + -- 用户手机号直接登录 + WEB_PHONE_LOGIN2 = "acc/phone_login_2", + ----rank---- WEB_GET_MILITARY = "military/get_military", diff --git a/lua_probject/base_project/Game/View/LoginView.lua b/lua_probject/base_project/Game/View/LoginView.lua index 2297cef3..1a65ca7f 100644 --- a/lua_probject/base_project/Game/View/LoginView.lua +++ b/lua_probject/base_project/Game/View/LoginView.lua @@ -60,10 +60,16 @@ function M:init() local btn_phone = view:GetChild("btn_phone") btn_phone.onClick:Set(function() - self:PhoneLogin() + -- self:PhoneLogin() + self:OnClickJVerifyLogin() end) self:InitClip() + + local mgr = JVerifyManager.Instance + if mgr then + mgr:Init() + end end function M:Destroy() @@ -375,3 +381,113 @@ function M:CallWxLogin(index) self:LoginCallBack(0) end end + +local cjson = require "cjson" + +local function ParseJVerifyResult(jsonStr) + if not jsonStr or jsonStr == "" then + return nil + end + + local ok, data = pcall(cjson.decode, jsonStr) + if not ok then + print("[JVerify] json decode failed:", jsonStr) + return nil + end + + return data +end + +function M:OnClickJVerifyLogin() + local mgr = JVerifyManager.Instance + print("mgr = ", mgr) + + if mgr == nil then + print("[JVerify] manager is nil") + return + end + + local enable = mgr:CheckEnable() + print("[JVerify] CheckEnable = ", tostring(enable)) + + if not enable then + print("[JVerify] 当前环境不支持一键登录") + return + end + + mgr:ClearPreLoginResult() + mgr:ClearLoginAuthResult() + + mgr:PreLogin(5000) + + coroutine.start(function() + local t = 0 + while t < 8 do + coroutine.wait(0.2) + t = t + 0.2 + + local preLoginJson = mgr:GetPreLoginResult() + if preLoginJson ~= nil and preLoginJson ~= "" then + print("[JVerify] preLogin raw = ", preLoginJson) + mgr:ClearPreLoginResult() + + local preData = ParseJVerifyResult(preLoginJson) + if preData and tonumber(preData.code) == 7000 then + print("[JVerify] preLogin success, start loginAuth") + mgr:LoginAuth() + self:PollJVerifyLoginResult() + else + print("[JVerify] preLogin failed") + end + return + end + end + + print("[JVerify] preLogin timeout") + end) +end + +function M:PollJVerifyLoginResult() + local mgr = JVerifyManager.Instance + if mgr == nil then + print("[JVerify] manager is nil") + return + end + + coroutine.start(function() + local t = 0 + while t < 15 do + coroutine.wait(0.2) + t = t + 0.2 + + local loginJson = mgr:GetLoginAuthResult() + if loginJson ~= nil and loginJson ~= "" then + print("[JVerify] loginAuth raw = ", loginJson) + mgr:ClearLoginAuthResult() + + local data = ParseJVerifyResult(loginJson) + if data and tonumber(data.code) == 6000 then + local token = data.content or "" + print("[JVerify] loginToken = ", token) + + self:OnGetJVerifyToken(token) + else + print("[JVerify] loginAuth failed, code = ", data and data.code) + end + return + end + end + + print("[JVerify] loginAuth timeout") + end) +end + +function M:OnGetJVerifyToken(token) + print("[JVerify] final token = ", token) + + -- 下一步这里发给你的服务端 + local loginCtr = ControllerManager.GetController(LoginController) + loginCtr:QuickPhoneLogin2(token,function(response) + __login_response(self, response) + end) +end diff --git a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua index 1607d210..60a039f0 100644 --- a/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/hongzhong/EXMainView.lua @@ -28,7 +28,7 @@ function M:InitView(url) MJMainView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2") self._hu_tip = HuTipView.new(self) - self._view:GetChild('wanfa_text').text =room.room_config.people_num .. '人红中 ' .. room.score_times .. '倍' + self._view:GetChild('wanfa_text').text ='红中麻将 ' .. room.score_times local text_playName = self._view:GetChild('text_playName') if text_playName then text_playName.text = "红中麻将" diff --git a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua index 2db2a563..6e0b3bff 100644 --- a/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXMainView.lua @@ -28,7 +28,7 @@ function M:InitView(url) MJMainView.InitView(self,"ui://Main_Majiang/Main_"..room.room_config.people_num .. "_s2") self._hu_tip = HuTipView.new(self) - self._view:GetChild('wanfa_text').text =room.room_config.people_num .. '人转转麻将 ' .. room.score_times .. '倍' + self._view:GetChild('wanfa_text').text ='转转麻将 ' .. room.score_times local text_playName = self._view:GetChild('text_playName') if text_playName then text_playName.text = "转转麻将" diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index c50a7912..f93bb087 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -190,15 +190,15 @@ function M:InitView(url) self._view:GetChild('info_text'):GetChild('text').text = room.room_config:GetDes() if room.room_config.Leaf == 1 then if room.room_config.people_num == 2 then - self._view:GetChild('wanfa_text').text = '十五张' .. '二人跑得快' .. room.score_times .. '倍' + self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times else - self._view:GetChild('wanfa_text').text = '十五张' .. '三人跑得快' .. room.score_times .. '倍' + self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times end else if room.room_config.people_num == 2 then - self._view:GetChild('wanfa_text').text = '十六张' .. '二人跑得快' .. room.score_times .. '倍' + self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times else - self._view:GetChild('wanfa_text').text = '十六张' .. '三人跑得快' .. room.score_times .. '倍' + self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times end end local text_playName = self._view:GetChild('text_playName') diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index b96ee468..a67ff521 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -218,7 +218,12 @@ function M:InitPoker(pokerList, isPlayAni, open) self._ctr_canSendCard.selectedIndex = 1 self._flag_ruleCard = false self._view_handCard:RemoveChildren(0, -1, true) - -- table.sort(pokerList) + local cs = 0.95 + if DataManager.CurrenRoom.cardsize == 0 then + cs = 1 + elseif DataManager.CurrenRoom.cardsize == 1 then + cs = 0.95 + end if isPlayAni == true then self.cor_init_poker = coroutine.start( @@ -299,7 +304,8 @@ function M:InitPoker(pokerList, isPlayAni, open) local card_view = NewCardView(btn_card, card_number_code, card_flower_code) self.card_list[#self.card_list + 1] = card_view btn_card.data = card_view - btn_card.width = (GRoot.inst.width * 0.95 - self._view_handCard.columnGap * 15) / 16 + btn_card.width = (GRoot.inst.width - self._view_handCard.columnGap * 14) / 15*cs + btn_card.height = btn_card.width*1.18*cs end table.sort(self.card_list, tableSortNumber) self:AddTouchMoveEvent(self._view_handCard) @@ -316,7 +322,7 @@ end function M:updatePoker() local templist = {} - for i = #self.card_list,1,-1 do + for i = #self.card_list, 1, -1 do templist[#templist + 1] = self.card_list[i].card_code_flower end self:InitPoker(templist, false, 0) diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua index 245cf0d6..0d2e1884 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua @@ -1,10 +1,10 @@ local PlayerSelfCardInfoView = require("main.zipai.ZPPlayerSelfCardInfoView") local CardCheck = require("main.zipai.CardCheck") local M = {} --- -function M.new(view,mainView) - setmetatable(M, {__index = PlayerSelfCardInfoView}) - local self = setmetatable({},{__index = M}) +-- +function M.new(view, mainView) + setmetatable(M, { __index = PlayerSelfCardInfoView }) + local self = setmetatable({}, { __index = M }) self.class = "PlayerSelfCardInfoView" self._view = view self._mainView = mainView @@ -13,35 +13,33 @@ function M.new(view,mainView) return self end - function M:onTouchBegin(context) - if DataManager.CurrenRoom ==nil or DataManager.CurrenRoom.self_player ==nil then + if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then return end local button = context.sender local card = button.data - if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then + if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then self:ShowHuTip(card.card_item) end - card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_",card.card_item) + card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card.card_item) card.btn_card.sortingOrder = 100 - local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x,context.inputEvent.y)) - card.btn_card.xy = Vector2.New(card.btn_card.x+20 ,card.btn_card.y-50) + local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) + card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50) card.touch_pos = xy - button.xy - end function M:__OnDragEnd(context) - if DataManager.CurrenRoom ==nil or DataManager.CurrenRoom.self_player ==nil then + if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then return end if self.outcard_button then self.outcard_button = nil end local button = context.sender - + local card = button.data - + local _room = DataManager.CurrenRoom card.btn_card.sortingOrder = 0 -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat) @@ -53,7 +51,7 @@ function M:__OnDragEnd(context) else local isChangeCard = false self.outcard_button = nil - card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/201_",card.card_item) + card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/201_", card.card_item) self._area_handcard_list:AddChild(button) if #self.card_list == 1 then isChangeCard = false @@ -61,188 +59,184 @@ function M:__OnDragEnd(context) return end local CountCards = {} - for i=1,#self.card_list do + for i = 1, #self.card_list do local lists = {} if CountCards[self.card_list[i].index_X] == nil then - lists[#lists+1] = self.card_list[i] - CountCards[self.card_list[i].index_X]= lists + lists[#lists + 1] = self.card_list[i] + CountCards[self.card_list[i].index_X] = lists else - CountCards[self.card_list[i].index_X][#CountCards[self.card_list[i].index_X]+1] =self.card_list[i] + CountCards[self.card_list[i].index_X][#CountCards[self.card_list[i].index_X] + 1] = self.card_list[i] end end local minmark = 1 local maxmark = #self.card_list - if card == self.card_list[1] or card == self.card_list[#self.card_list] then + if card == self.card_list[1] or card == self.card_list[#self.card_list] then if self.card_list[1].index_X == self.card_list[2].index_X then - minmark =2 + minmark = 2 end - if self.card_list[#self.card_list].index_X == self.card_list[#self.card_list-1].index_X then - maxmark =#self.card_list-1 + if self.card_list[#self.card_list].index_X == self.card_list[#self.card_list - 1].index_X then + maxmark = #self.card_list - 1 end end - if button.x+button.width/2 < self.card_list[minmark].btn_card.x and #CountCards<10 then - list_remove(self.card_list,card) + if button.x + button.width / 2 < self.card_list[minmark].btn_card.x and #CountCards < 10 then + list_remove(self.card_list, card) local num = 0 - for i=1,#self.card_list do + for i = 1, #self.card_list do if card.index_X == self.card_list[i].index_X and card.index_Y < self.card_list[i].index_Y then - self.card_list[i].index_Y = self.card_list[i].index_Y - 1 + self.card_list[i].index_Y = self.card_list[i].index_Y - 1 end if card.index_X == self.card_list[i].index_X then - num = num+1 + num = num + 1 end end - if num ==0 then - for i=1,#self.card_list do - if self.card_list[i].index_X < card.index_X then - self.card_list[i].index_X = self.card_list[i].index_X + 1 - end + if num == 0 then + for i = 1, #self.card_list do + if self.card_list[i].index_X < card.index_X then + self.card_list[i].index_X = self.card_list[i].index_X + 1 + end end else - for i=1,#self.card_list do - self.card_list[i].index_X = self.card_list[i].index_X + 1 + for i = 1, #self.card_list do + self.card_list[i].index_X = self.card_list[i].index_X + 1 end end - card.index_X =1 - card.index_Y =1 - table.insert(self.card_list,1,card) + card.index_X = 1 + card.index_Y = 1 + table.insert(self.card_list, 1, card) isChangeCard = true - elseif button.x+button.width/2 > (self.card_list[maxmark].btn_card.x +button.width) and #CountCards<10 then - list_remove(self.card_list,card) + elseif button.x + button.width / 2 > (self.card_list[maxmark].btn_card.x + button.width) and #CountCards < 10 then + list_remove(self.card_list, card) local num = 0 - for i=1,#self.card_list do + for i = 1, #self.card_list do if card.index_X == self.card_list[i].index_X then - num = num+1 + num = num + 1 end if card.index_X == self.card_list[i].index_X and card.index_Y < self.card_list[i].index_Y then - self.card_list[i].index_Y = self.card_list[i].index_Y - 1 + self.card_list[i].index_Y = self.card_list[i].index_Y - 1 end end - if num ==0 then - for i=1,#self.card_list do - if self.card_list[i].index_X > card.index_X then - self.card_list[i].index_X = self.card_list[i].index_X - 1 - end + if num == 0 then + for i = 1, #self.card_list do + if self.card_list[i].index_X > card.index_X then + self.card_list[i].index_X = self.card_list[i].index_X - 1 + end end end - card.index_X =self.card_list[#self.card_list].index_X+1 - card.index_Y =1 - self.card_list[#self.card_list+1] =card + card.index_X = self.card_list[#self.card_list].index_X + 1 + card.index_Y = 1 + self.card_list[#self.card_list + 1] = card isChangeCard = true - else + else local MoveCard = false local MoveCardPos = 0 local MoveCardY = 0 - for i=1,#CountCards do + for i = 1, #CountCards do local card_view = CountCards[i][1] - if card_view~=nil then - if button.x+button.width/2 > card_view.old_postion.x and button.x+button.width/2 < (card_view.old_postion.x+button.width) then - if card ~= card_view and #CountCards[i] <4 and card.index_X ~= card_view.index_X then - + if card_view ~= nil then + if button.x + button.width / 2 > card_view.old_postion.x and button.x + button.width / 2 < (card_view.old_postion.x + button.width) then + if card ~= card_view and #CountCards[i] < 4 and card.index_X ~= card_view.index_X then MoveCardPos = i - MoveCardY = #CountCards[i]+1 + MoveCardY = #CountCards[i] + 1 MoveCard = true - list_remove(self.card_list,card) + list_remove(self.card_list, card) end end end end local MoveCardindex = 0 - -- local MoveCardY = 0 - if button.x+button.width/2 > card.old_postion.x and button.x+button.width/2 < (card.old_postion.x+button.width) then - if #CountCards[card.index_X]>1 then - for i=1,#CountCards[card.index_X] do + -- local MoveCardY = 0 + if button.x + button.width / 2 > card.old_postion.x and button.x + button.width / 2 < (card.old_postion.x + button.width) then + if #CountCards[card.index_X] > 1 then + for i = 1, #CountCards[card.index_X] do local _cv = CountCards[card.index_X][i] if _cv ~= card then - if button.y+button.height/2 > _cv.btn_card.y and button.y+button.height/2 < (_cv.btn_card.y+button.height) then + if button.y + button.height / 2 > _cv.btn_card.y and button.y + button.height / 2 < (_cv.btn_card.y + button.height) then --向下移動 - if ((button.y+button.height/2) +20) > (card.old_postion.y+button.height) then - MoveCardindex = -1 - MoveCardPos = card.index_X - MoveCardY = _cv.index_Y - MoveCard = true - list_remove(self.card_list,card) - --向上移動 - elseif ((button.y+button.height/2) -20) < card.old_postion.y then - MoveCardindex = 1 - MoveCardPos = card.index_X - MoveCardY = _cv.index_Y - MoveCard = true - list_remove(self.card_list,card) - end - elseif i == #CountCards[card.index_X] and button.y+button.height/2 < _cv.btn_card.y then - MoveCardindex = 1 - MoveCardPos = card.index_X - MoveCardY = _cv.index_Y - MoveCard = true - list_remove(self.card_list,card) - elseif i == 1 and button.y+button.height/2 > (_cv.btn_card.y+button.width) then - MoveCardindex = -1 - MoveCardPos = card.index_X - MoveCardY = _cv.index_Y - MoveCard = true - list_remove(self.card_list,card) + if ((button.y + button.height / 2) + 20) > (card.old_postion.y + button.height) then + MoveCardindex = -1 + MoveCardPos = card.index_X + MoveCardY = _cv.index_Y + MoveCard = true + list_remove(self.card_list, card) + --向上移動 + elseif ((button.y + button.height / 2) - 20) < card.old_postion.y then + MoveCardindex = 1 + MoveCardPos = card.index_X + MoveCardY = _cv.index_Y + MoveCard = true + list_remove(self.card_list, card) + end + elseif i == #CountCards[card.index_X] and button.y + button.height / 2 < _cv.btn_card.y then + MoveCardindex = 1 + MoveCardPos = card.index_X + MoveCardY = _cv.index_Y + MoveCard = true + list_remove(self.card_list, card) + elseif i == 1 and button.y + button.height / 2 > (_cv.btn_card.y + button.width) then + MoveCardindex = -1 + MoveCardPos = card.index_X + MoveCardY = _cv.index_Y + MoveCard = true + list_remove(self.card_list, card) end end end end - end - if MoveCard ==true and MoveCardindex ==0 then + if MoveCard == true and MoveCardindex == 0 then local num = 0 - for i=1,#self.card_list do + for i = 1, #self.card_list do if card.index_X == self.card_list[i].index_X and card.index_Y < self.card_list[i].index_Y then - self.card_list[i].index_Y = self.card_list[i].index_Y - 1 + self.card_list[i].index_Y = self.card_list[i].index_Y - 1 end if card.index_X == self.card_list[i].index_X then - num = num+1 + num = num + 1 end end - if num ==0 then - for i=1,#self.card_list do - if self.card_list[i].index_X > card.index_X then - self.card_list[i].index_X = self.card_list[i].index_X - 1 - end + if num == 0 then + for i = 1, #self.card_list do + if self.card_list[i].index_X > card.index_X then + self.card_list[i].index_X = self.card_list[i].index_X - 1 + end end if MoveCardPos > card.index_X then - MoveCardPos = MoveCardPos-1 + MoveCardPos = MoveCardPos - 1 end end - card.index_X =MoveCardPos - card.index_Y =MoveCardY - for i=#self.card_list,1,-1 do + card.index_X = MoveCardPos + card.index_Y = MoveCardY + for i = #self.card_list, 1, -1 do if MoveCardPos == self.card_list[i].index_X then - table.insert(self.card_list,(i+1),card) + table.insert(self.card_list, (i + 1), card) break end end isChangeCard = true - --上下移动 - elseif MoveCard ==true and MoveCardindex ~= 0 then - for i=1,#self.card_list do - if card.index_X == self.card_list[i].index_X then + --上下移动 + elseif MoveCard == true and MoveCardindex ~= 0 then + for i = 1, #self.card_list do + if card.index_X == self.card_list[i].index_X then --向下移动 if MoveCardindex == -1 then - if self.card_list[i].index_Y < card.index_Y and self.card_list[i].index_Y >= MoveCardY then + if self.card_list[i].index_Y < card.index_Y and self.card_list[i].index_Y >= MoveCardY then self.card_list[i].index_Y = self.card_list[i].index_Y + 1 - end - --向上移动 + --向上移动 else - if self.card_list[i].index_Y > card.index_Y and self.card_list[i].index_Y <= MoveCardY then - self.card_list[i].index_Y = self.card_list[i].index_Y - 1 - + if self.card_list[i].index_Y > card.index_Y and self.card_list[i].index_Y <= MoveCardY then + self.card_list[i].index_Y = self.card_list[i].index_Y - 1 end end end end - card.index_X =MoveCardPos - card.index_Y =MoveCardY - for i=#self.card_list,1,-1 do - if MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY-1) then - table.insert(self.card_list,(i+1),card) + card.index_X = MoveCardPos + card.index_Y = MoveCardY + for i = #self.card_list, 1, -1 do + if MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY - 1) then + table.insert(self.card_list, (i + 1), card) break - elseif MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY+1) then - table.insert(self.card_list,i,card) + elseif MoveCardPos == self.card_list[i].index_X and self.card_list[i].index_Y == (MoveCardY + 1) then + table.insert(self.card_list, i, card) break end end @@ -251,176 +245,162 @@ function M:__OnDragEnd(context) isChangeCard = false self._area_handcard_list:AddChild(button) end - - end + end self:UpdateHandCardsPos() - if isChangeCard ==true then + if isChangeCard == true then self:SendChangeCard() end end end -function M:UpdateOutCardList(outcard,isShow,isMopai,seat) - if(isShow == nil) then - isShow = false +function M:UpdateOutCardList(outcard, isShow, isMopai, seat) + if (isShow == nil) then + isShow = false end - if(isMopai == nil) then - isMopai = false + if (isMopai == nil) then + isMopai = false end - self._area_outcard_list:RemoveChildren(0,-1,true) - local outcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard") - - if outcard==0 then - outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" + self._area_outcard_list:RemoveChildren(0, -1, true) + local outcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard") + + if outcard == 0 then + outcards:GetChild("icon").icon = "ui://Main_RunBeard/202_1_300" else - outcards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/203_",outcard) + outcards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", outcard) end - outcards.x,outcards.y = 0,0 - local show_di_bg = outcards:GetChild("show_di_bg") + outcards.x, outcards.y = 0, 0 + local show_di_bg = outcards:GetChild("show_di_bg") --show_di_bg.visible = true - if(isShow)then - if outcard == 0 then - show_di_bg.visible = false - end - if(seat ~= nil and outcards~=nil)then - if(isMopai)then - if outcard ~= 0 then - outcards:GetTransition("mopai"..seat):Play(function( ) - -- show_di_bg.visible = true - - end) - end + if (isShow) then + if outcard == 0 then + show_di_bg.visible = false + end + if (seat ~= nil and outcards ~= nil) then + if (isMopai) then + if outcard ~= 0 then + outcards:GetTransition("mopai" .. seat):Play(function() + -- show_di_bg.visible = true + end) + end else - show_di_bg.visible = false - outcards:GetTransition("cpai"..seat):Play() + show_di_bg.visible = false + outcards:GetTransition("cpai" .. seat):Play() end - else - --show_di_bg.visible = true - end + else + --show_di_bg.visible = true + end else - show_di_bg.visible = false + show_di_bg.visible = false end self._area_outcard_list:AddChild(outcards) end --弃牌 -function M:UpdateQiPai( qi_list,isplay) - self._area_qipai_list:RemoveChildren(0,-1,true) - for i=1,#qi_list do - local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai") - qicards:GetChild("icon").icon =self:getCardItem("ui://Main_RunBeard/202_",qi_list[i]) - if(isplay)then - if(i == #qi_list) then - qicards:GetTransition("t0"):Play() +function M:UpdateQiPai(qi_list, isplay) + self._area_qipai_list:RemoveChildren(0, -1, true) + for i = 1, #qi_list do + local qicards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai") + qicards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/202_", qi_list[i]) + if (isplay) then + if (i == #qi_list) then + qicards:GetTransition("t0"):Play() end - end - self._area_qipai_list:AddChild(qicards) - end + end + self._area_qipai_list:AddChild(qicards) + end end --摸牌动画 -function M:PlayingOutCardAnima( card) +function M:PlayingOutCardAnima(card) coroutine.start(function() - coroutine.wait(0.1) + coroutine.wait(0.1) self:ClearOutCard() end) end -function M:UpdateFzList( fz_list ,ispaly) - self._area_fz_list:RemoveChildren(0,-1,true) - for i = 1,#fz_list do - local fzitem=nil +function M:UpdateFzList(fz_list, ispaly) + self._area_fz_list:RemoveChildren(0, -1, true) + for i = 1, #fz_list do + local fzitem = nil if fz_list[i].type ~= RB_FZType.Kan then - fzitem =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/ComponentNew") - if(ispaly == false)then - fzitem:RemoveChildren(0,-1,true) + fzitem = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/ComponentNew") + if (ispaly == false) then + fzitem:RemoveChildren(0, -1, true) end end if fz_list[i].type == RB_FZType.Chi or fz_list[i].type == RB_FZType.Bi then - - local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") - fzcards:GetChild("card_"..1).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].active_card) + local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") + fzcards:GetChild("card_" .. 1).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].active_card) fzcards:GetController("c2").selectedIndex = 1 - fzcards:GetChild("card_"..2).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].opcard[1]) - fzcards:GetChild("card_"..3).icon = self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].opcard[2]) - fzcards.x,fzcards.y = 0,0 - self:playAnim(fzitem,fzcards,#fz_list,i,ispaly) - + fzcards:GetChild("card_" .. 2).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[1]) + fzcards:GetChild("card_" .. 3).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[2]) + fzcards.x, fzcards.y = 0, 0 + self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) elseif fz_list[i].type == RB_FZType.Peng then - - local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") - for j=1,3 do - fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card) + local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") + for j = 1, 3 do + fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card) end - fzcards.x,fzcards.y = 0,0 - self:playAnim(fzitem,fzcards,#fz_list,i,ispaly) - + fzcards.x, fzcards.y = 0, 0 + self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) elseif fz_list[i].type == RB_FZType.Wei then - - local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") - fzcards:GetController("c1").selectedIndex=1 - for j=1,3 do - fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card) + local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") + fzcards:GetController("c1").selectedIndex = 1 + for j = 1, 3 do + fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card) end - fzcards.x,fzcards.y = 0,0 - self:playAnim(fzitem,fzcards,#fz_list,i,ispaly) + fzcards.x, fzcards.y = 0, 0 + self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) elseif fz_list[i].type == RB_FZType.ChouWei then - local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") - for j=1,2 do - fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300" + local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") + for j = 1, 2 do + fzcards:GetChild("card_" .. j).icon = "ui://Main_RunBeard/202_1_300" end - fzcards:GetChild("card_"..3).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card) - fzcards.x,fzcards.y = 0,0 - self:playAnim(fzitem,fzcards,#fz_list,i,ispaly) - + fzcards:GetChild("card_" .. 3).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card) + fzcards.x, fzcards.y = 0, 0 + self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) elseif fz_list[i].type == RB_FZType.Pao then - - local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4") - for j=1,4 do - fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card) + local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4") + for j = 1, 4 do + fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card) end - fzcards.x,fzcards.y = 0,0 - self:playAnim(fzitem,fzcards,#fz_list,i,ispaly) - + fzcards.x, fzcards.y = 0, 0 + self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) elseif fz_list[i].type == RB_FZType.Ti then - - local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4") - for j=1,4 do - if j==4 then - fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card) + local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_4") + for j = 1, 4 do + if j == 4 then + fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card) else - fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300" + fzcards:GetChild("card_" .. j).icon = "ui://Main_RunBeard/202_1_300" end end - fzcards.x,fzcards.y = 0,0 - self:playAnim(fzitem,fzcards,#fz_list,i,ispaly) - + fzcards.x, fzcards.y = 0, 0 + self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) end end end - -function M:playAnim( fzitem,fzcards, size,i,ispaly ) - if(ispaly == nil)then - ispaly =false - end - if(ispaly and i == size)then - local faArray= fzitem:GetChild("chiwei") - if(faArray~=nil)then - faArray:AddChild(fzcards) - else - fzitem:AddChild(fzcards) - end - else - fzitem:AddChild(fzcards) - end - self._area_fz_list:AddChild(fzitem) +function M:playAnim(fzitem, fzcards, size, i, ispaly) + if (ispaly == nil) then + ispaly = false + end + if (ispaly and i == size) then + local faArray = fzitem:GetChild("chiwei") + if (faArray ~= nil) then + faArray:AddChild(fzcards) + else + fzitem:AddChild(fzcards) + end + else + fzitem:AddChild(fzcards) + end + self._area_fz_list:AddChild(fzitem) end - - --出牌提示动画 - function M:ChuPaiTiShi() - if DataManager.CurrenRoom ==nil or DataManager.CurrenRoom.self_player ==nil then +--出牌提示动画 +function M:ChuPaiTiShi() + if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then return end local chu_player = DataManager.CurrenRoom.self_player @@ -431,32 +411,31 @@ end selfplayeTable.paoCount = chu_player.paoCount selfplayeTable.hu_xi = chu_player.hu_xi local player = membe_deep_clone(selfplayeTable) - local mark_ting= {} - for i=1,#DataManager.CurrenRoom.self_player.handcard_list do - local card = DataManager.CurrenRoom.self_player.handcard_list[i] + local mark_ting = {} + for i = 1, #DataManager.CurrenRoom.self_player.handcard_list do + local card = DataManager.CurrenRoom.self_player.handcard_list[i] list_remove(player.handcard_list, card) local _player = membe_deep_clone(player) - local tingList = CardCheck.tingPai(_player,DataManager.CurrenRoom) + local tingList = CardCheck.tingPai(_player, DataManager.CurrenRoom) local isKan = false - for j=1,#player.fz_list do + for j = 1, #player.fz_list do if card == player.fz_list[j].card and player.fz_list[j].type == RB_FZType.Kan then - isKan =true + isKan = true end end if #tingList > 0 and isKan == false then - - mark_ting[#mark_ting+1] = card + mark_ting[#mark_ting + 1] = card end table.insert(player.handcard_list, card) - table.sort( player.handcard_list, ViewUtil.HandCardSort) + table.sort(player.handcard_list, ViewUtil.HandCardSort) end -- print("ChuPaiTiShi",#mark_ting,vardump(player)) - if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then - self._view :GetController("chupai").selectedIndex =1 - if #mark_ting>0 then - for i=1,#mark_ting do - for k=1,#self.card_list do - local card_view= self.card_list[k] + if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then + self._view:GetController("chupai").selectedIndex = 1 + if #mark_ting > 0 then + for i = 1, #mark_ting do + for k = 1, #self.card_list do + local card_view = self.card_list[k] if card_view.card_item == mark_ting[i] then card_view.btn_card:GetController("mark_ting").selectedIndex = 1 end @@ -464,13 +443,12 @@ end end end else - self._view :GetController("chupai").selectedIndex =0 - for k=1,#self.card_list do - local card_view= self.card_list[k] + self._view:GetController("chupai").selectedIndex = 0 + for k = 1, #self.card_list do + local card_view = self.card_list[k] card_view.btn_card:GetController("mark_ting").selectedIndex = 0 - end end end -return M \ No newline at end of file +return M diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index 36627a6b..b1555bd9 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -905,7 +905,9 @@ function M:_ChiView(tip_list, tip_hu, callback) end list_choose:ResizeToFit(#tip_list) _pop_tip_choice:GetChild('di1').width = list_choose.width + 110 - _pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width) / 2, -100) + -- _pop_tip_choice.xy = Vector2((self._view.width - _pop_tip_choice.width) / 2, -100) + _pop_tip_choice.width = self._view.width + _pop_tip_choice.xy = Vector2(0, -100) self._view:AddChild(_pop_tip_choice) self._pop_tip_choice = _pop_tip_choice end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua index 5ad67010..73e27d2c 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerCardInfoView.lua @@ -173,7 +173,9 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat) self._area_outcard_list:RemoveChildren(0, -1, true) local outcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard") - + outcards.onClick:Set(function() + outcards.alpha = 1.1 - outcards.alpha + end) if outcard == 0 then -- outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" else @@ -198,12 +200,14 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat) seat = 3 end if (isMopai) then + print("摸牌动作1====="..seat) if outcard ~= 0 then outcards:GetTransition("mopai" .. seat):Play(function() -- show_di_bg.visible = true end) end else + print("出牌动作1----"..seat) show_di_bg.visible = false outcards:GetTransition("cpai" .. seat):Play() end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index d5081e3b..c9d16498 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -266,7 +266,9 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat) end self._area_outcard_list:RemoveChildren(0, -1, true) local outcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard") - + outcards.onClick:Set(function() + outcards.alpha = 1.3 - outcards.alpha + end) if outcard == 0 then --outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300" else @@ -280,6 +282,7 @@ function M:UpdateOutCardList(outcard, isShow, isMopai, seat) show_di_bg.visible = false end if (seat ~= nil and outcards ~= nil) then + print("摸牌动作2=====" .. seat) if (isMopai) then if outcard ~= 0 then outcards:GetTransition("mopai" .. seat):Play(function() diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua index e76ec9d2..111b5902 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerCardInfoView.lua @@ -244,6 +244,7 @@ function M:PlayingOutCardAnima(card, seat) self._area_outcard_list:AddChild(outcards) end outcards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card) + print("弃牌动作0000==" .. seat) outcards:GetTransition("qipai" .. seat):Play() end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua index 3f3e6694..755b849c 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -530,11 +530,11 @@ function M:UpdateOutLine() elseif self:getCardSize() == 1.6 then self._data_outLinePos = 90 - (152 * 3) elseif self:getCardSize() == 1.8 then - self._data_outLinePos = 90 - (170 * 3) + self._data_outLinePos = 135 - (170 * 3) elseif self:getCardSize() == 2 then - self._data_outLinePos = 110 - (195 * 3) + self._data_outLinePos = 160 - (195 * 3) end - self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 60 + self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 80 end function M:UpdateIsOnClick(isOut) @@ -795,7 +795,7 @@ end --计算手牌位置 function M:GetHandCardPos(cards_view, cards) local x, y = 0, 0 - local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) -- 牌的宽度 + local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) + 4 -- 牌的宽度 local middle_x = self._area_handcard_list.width / 2 local start_x = middle_x - (cards / 2 * (card_width)) @@ -804,19 +804,19 @@ function M:GetHandCardPos(cards_view, cards) -- local card_height = self.card_hight -- y = 90 - card_height * 0.66 * cards_view.index_Y if self:getCardSize() == 1.3 then - y = 90 - (119 * cards_view.index_Y) + y = 100 - (119 * cards_view.index_Y) elseif self:getCardSize() == 1.2 then - y = 90 - (110 * cards_view.index_Y) + y = 100 - (110 * cards_view.index_Y) elseif self:getCardSize() == 0.8 then y = 100 - (85 * cards_view.index_Y) elseif self:getCardSize() == 1.5 then - y = 90 - (137 * cards_view.index_Y) + y = 100 - (137 * cards_view.index_Y) elseif self:getCardSize() == 1.6 then - y = 90 - (147 * cards_view.index_Y) + y = 100 - (147 * cards_view.index_Y) elseif self:getCardSize() == 1.8 then - y = 90 - (164 * cards_view.index_Y) + y = 105 - (162 * cards_view.index_Y) elseif self:getCardSize() == 2 then - y = 90 - (182 * cards_view.index_Y) + y = 105 - (180 * cards_view.index_Y) end return Vector2.New(x, y) end @@ -939,6 +939,7 @@ function M:PlayingOutCardAnima(card, seat) self._area_outcard_list:AddChild(outcards) end outcards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card) + print("弃牌动作000.。==" .. seat) outcards:GetTransition("qipai" .. seat):Play() end diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index 46ae3d50..0b25ce50 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -18,9 +18,6 @@ "n43_n1ry": { "hidden": true }, - "n45_n1ry": { - "collapsed": true - }, "n51_fmkv": { "collapsed": true }, diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index c7a79388..71e05843 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -1,11 +1,18 @@ { "objectStatus": { + "n131_ckvb": { + "hidden": true, + "collapsed": true + }, + "n122_ckvb": { + "locked": true + }, + "n121_ckvb": { + "locked": true + }, "n166_ukp7": { "hidden": true }, - "n185_yffn": { - "collapsed": true - }, "n115_rnez": { "hidden": true }, @@ -21,10 +28,8 @@ "n179_yffn": { "collapsed": true }, - "n131_ckvb": { - "collapsed": true, - "locked": true, - "hidden": true + "n185_yffn": { + "collapsed": true }, "n87_q50p": { "hidden": true diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info new file mode 100644 index 00000000..599ad124 --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq5a.info @@ -0,0 +1,7 @@ +{ + "objectStatus": { + "n45_j34t": { + "collapsed": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info new file mode 100644 index 00000000..11c58e46 --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n75_o49p": { + "hidden": true + }, + "n50_m25s": { + "hidden": true + }, + "n94_o0c1": { + "hidden": true + }, + "n74_o49p": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info new file mode 100644 index 00000000..36abe8ca --- /dev/null +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n71_o49p": { + "hidden": true + }, + "n73_o49p": { + "hidden": true + }, + "n95_o0c1": { + "hidden": true + }, + "n53_m25s": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info index 0519d129..a49104f2 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info @@ -1,7 +1,20 @@ { "objectStatus": { "n183_yfzf": { - "locked": true + "locked": true, + "collapsed": true + }, + "n154_r1mo": { + "collapsed": true + }, + "n150_8th3": { + "collapsed": true + }, + "n36_k3io": { + "collapsed": true + }, + "n163_o49p": { + "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info index ad079af9..47b4f96a 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq9n.info @@ -2,9 +2,6 @@ "objectStatus": { "n76_oqog": { "collapsed": true - }, - "n77_oqog": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 5ab926dc..248f9c02 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,25 +2,27 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://v0j9abjygq7ms2", - "ui://v0j9abjygq7m8f", - "ui://8wph7p8nyffnmr", - "ui://2d9xdj6zl0lzb", - "ui://v0j9abjygq7mgo", - "ui://lx6k641gajzhoe", - "ui://d1qrzqprc4r116", - "ui://8wph7p8nyffn1q", - "ui://8wph7p8nyffnmy", - "ui://27vd145byffnjo" + "ui://lkq9ne9speuq8b", + "ui://lkq9ne9speuq6p", + "ui://lkq9ne9speuq6e", + "ui://lkq9ne9speuq6r", + "ui://lkq9ne9speuq6g", + "ui://lkq9ne9speuq5a" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://d1qrzqprc4r116", + "doc.activeDoc": "ui://lkq9ne9speuq5a", "libview.twoColumn": false, "libview.expandedNodes": [ - "d1qrzqpr", - "/" + "lkq9ne9s", + "/", + "lkq9ne9s", + "/component/", + "lkq9ne9s", + "/component/Main/", + "lkq9ne9s", + "/component/Main/component/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/component/Component/btn_emoji.xml b/wb_new_ui/assets/Common/component/Component/btn_emoji.xml index 61949dc5..f05e9423 100644 --- a/wb_new_ui/assets/Common/component/Component/btn_emoji.xml +++ b/wb_new_ui/assets/Common/component/Component/btn_emoji.xml @@ -1,8 +1,11 @@ - - + + - + + + + diff --git a/wb_new_ui/assets/Common/component/playerDetail.xml b/wb_new_ui/assets/Common/component/playerDetail.xml index fe0028ad..8bd8d0b0 100644 --- a/wb_new_ui/assets/Common/component/playerDetail.xml +++ b/wb_new_ui/assets/Common/component/playerDetail.xml @@ -1,32 +1,32 @@ - + - +