diff --git a/fk101/lua_probject/base_project/Game/View/ResultView.lua b/fk101/lua_probject/base_project/Game/View/ResultView.lua index ca22f6ed..1dd1651f 100644 --- a/fk101/lua_probject/base_project/Game/View/ResultView.lua +++ b/fk101/lua_probject/base_project/Game/View/ResultView.lua @@ -313,8 +313,8 @@ function M:InitBigResult(room, fontsize) local item = player_list:AddItemFromPool() item:GetChild('txt_name').text = player_info.nick - local head = item:GetChild('head'):GetChild('n4') - ImageLoad.Load(player_info.head_url, head) + local head = item:GetChild('head') + ImageLoad.Load(player_info.head_url, head._iconObject) if player_info.entrust ~= nil and player_info.entrust == true then item:GetController('entrust').selectedIndex = 1 diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua index 93083b03..243b0bb7 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua @@ -181,7 +181,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 @@ -228,7 +230,7 @@ end function M:UpdateQiPai( qi_list,ispaly,seat) self._area_qipai_list:RemoveChildren(0,-1,true) for i=1,#qi_list do - local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai") + local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipais") qicards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/202_",qi_list[i]) if(ispaly)then if(i == #qi_list) then diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua index 245cf0d6..1ed74449 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua @@ -39,13 +39,12 @@ function M:__OnDragEnd(context) self.outcard_button = nil end local button = context.sender - + local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) 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) - if (button.y < -380 and _room.curren_outcard_seat == _room.self_player.seat) then + if (button.y < self._data_outLinePos - button.height * 0.66 and _room.curren_outcard_seat == _room.self_player.seat) then button.touchable = false self.outcard_button = card self:UpdateIsOnClick(false) @@ -80,8 +79,8 @@ function M:__OnDragEnd(context) 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 xy.x < self.card_list[minmark].btn_card.x and #CountCards < 10 and xy.y > self._data_outLinePos then + list_remove(self.card_list, card) local num = 0 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 @@ -106,8 +105,8 @@ function M:__OnDragEnd(context) 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 xy.x > (self.card_list[maxmark].btn_card.x + button.width) and #CountCards < 10 and xy.y > self._data_outLinePos then + list_remove(self.card_list, card) local num = 0 for i=1,#self.card_list do if card.index_X == self.card_list[i].index_X then @@ -134,10 +133,9 @@ function M:__OnDragEnd(context) local MoveCardY = 0 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 xy.x > card_view.old_postion.x and xy.x < (card_view.old_postion.x + (button.width * 2)) and xy.y > self._data_outLinePos then + if card ~= card_view and #CountCards[i] < 4 and card.index_X ~= card_view.index_X then MoveCardPos = i MoveCardY = #CountCards[i]+1 MoveCard = true @@ -147,40 +145,43 @@ function M:__OnDragEnd(context) 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 + -- print("lingmeng end", button.y, MoveCard, button.y > self._data_outLinePos, + -- button.x + button.width / 2 > card.old_postion.x and + -- button.x + button.width / 2 < (card.old_postion.x + button.width) and button.y > self._data_outLinePos) + if xy.x > card.old_postion.x and xy.x < (card.old_postion.x + (button.width * 2)) and button.y > self._data_outLinePos 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 xy.y > _cv.btn_card.y and xy.y < (_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 i < card.index_Y then + MoveCardindex = -1 + MoveCardPos = card.index_X + MoveCardY = _cv.index_Y + MoveCard = true + list_remove(self.card_list, card) + --向上移動 + elseif i > card.index_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 * 2) then + MoveCardindex = -1 + MoveCardPos = card.index_X + MoveCardY = _cv.index_Y + MoveCard = true + list_remove(self.card_list, card) end end end @@ -269,7 +270,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 diff --git a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua index 8f55bc57..707b48db 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua @@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) local typeface = _data['game_cardsize'] local _gamectr = self._gamectr if typeface == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif typeface == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif typeface == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end else self._room.change_card_size = change_card_size @@ -300,11 +300,11 @@ end -- 设置 更新 手牌大小 function M:UpdateCardSize(index) if index == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif index == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif index == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end local info = self._player_card_info[1] info:UpdateCardSize() diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua index 94aeb287..2e891831 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua @@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) local typeface = _data['game_cardsize'] local _gamectr = self._gamectr if typeface == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif typeface == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif typeface == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end else self._room.change_card_size = change_card_size @@ -299,11 +299,11 @@ end -- 设置 更新 手牌大小 function M:UpdateCardSize(index) if index == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif index == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif index == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end local info = self._player_card_info[1] info:UpdateCardSize() diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua index 9b22561d..21e8868f 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua @@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) local typeface = _data['game_cardsize'] local _gamectr = self._gamectr if typeface == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif typeface == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif typeface == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end else self._room.change_card_size = change_card_size @@ -299,11 +299,11 @@ end -- 设置 更新 手牌大小 function M:UpdateCardSize(index) if index == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif index == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif index == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end local info = self._player_card_info[1] info:UpdateCardSize() diff --git a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua index 8f55bc57..707b48db 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua @@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) local typeface = _data['game_cardsize'] local _gamectr = self._gamectr if typeface == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif typeface == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif typeface == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end else self._room.change_card_size = change_card_size @@ -300,11 +300,11 @@ end -- 设置 更新 手牌大小 function M:UpdateCardSize(index) if index == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif index == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif index == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end local info = self._player_card_info[1] info:UpdateCardSize() diff --git a/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua b/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua index 27fe63a2..dfc30ed7 100644 --- a/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua +++ b/fk101/lua_probject/main_project/main/zipai/ZPMainView.lua @@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) local typeface = _data['game_cardsize'] local _gamectr = self._gamectr if typeface == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif typeface == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif typeface == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end else self._room.change_card_size = change_card_size @@ -254,11 +254,11 @@ end -- 设置 更新 手牌大小 function M:UpdateCardSize(index) if index == 0 then - self._room.change_card_size = 1.2 + self._room.change_card_size = 2 elseif index == 1 then - self._room.change_card_size = 1 + self._room.change_card_size = 1.8 elseif index == 2 then - self._room.change_card_size = 0.8 + self._room.change_card_size = 1.8 end local info = self._player_card_info[1] info:UpdateCardSize() diff --git a/fk101/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua b/fk101/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua index 61ff49ec..2fb28d8b 100644 --- a/fk101/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua +++ b/fk101/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua @@ -62,11 +62,13 @@ function M:init() self._area_outcard_list = view:GetChild('area_outcard_list') self._area_fz_list = view:GetChild('area_fz_list') self._area_qipai_list = view:GetChild('windcard_list') + self._view_outLine = view:GetChild('n38') self._mask_liangpai = view:GetChild('mask_liangpai') UIPackage.AddPackage('base/main_zipai/ui/Main_RunBeard') self.ctr_piao = self._view:GetController('piao') self.ctr_piao_value = self._view:GetController('piaovalue') - self:BtnEvent() + self:UpdateOutLine() + self:BtnEvent() end @@ -459,6 +461,17 @@ function M:UpdateCardSize() self._area_handcard_list:AddChild(card_view.btn_card) card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3) end + self:UpdateOutLine() + self:UpdateHandCardsPos() +end + +function M:UpdateOutLine() + if self:getCardSize() == 1.8 then + self._data_outLinePos = 135 - (170 * 3) + elseif self:getCardSize() == 2 then + self._data_outLinePos = 160 - (195 * 3) + end + self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 80 end function M:UpdateIsOnClick(isOut) @@ -729,6 +742,10 @@ function M:GetHandCardPos(cards_view, cards) y = 70 - (100 * cards_view.index_Y) elseif self:getCardSize() == 0.8 then y = 100 - (65 * cards_view.index_Y) + elseif self:getCardSize() == 1.8 then + y = 105 - (162 * cards_view.index_Y) + elseif self:getCardSize() == 2 then + y = 105 - (180 * cards_view.index_Y) end return Vector2.New(x, y) end @@ -856,7 +873,7 @@ function M:getCardSize() if self._room.change_card_size ~= nil then return self._room.change_card_size else - return 1 + return 1.6 end end diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes index 51849c74..8d790170 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ diff --git a/fk101/wb_new_ui/.objs/metas/35sf1c1f/r05e8u.info b/fk101/wb_new_ui/.objs/metas/35sf1c1f/r05e8u.info index 0d96c546..ebad36e5 100644 --- a/fk101/wb_new_ui/.objs/metas/35sf1c1f/r05e8u.info +++ b/fk101/wb_new_ui/.objs/metas/35sf1c1f/r05e8u.info @@ -1,12 +1,18 @@ { "objectStatus": { + "n183_yfzf": { + "collapsed": true + }, "n193_syh3": { + "locked": true, "hidden": true }, "n206_ib2w": { + "locked": true, "hidden": true }, "n198_h5b1": { + "locked": true, "hidden": true } } diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 63162ac5..fcd36a41 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 283, + "libview.firstColumnWidth": 413, "expanded_nodes": [ "27vd145b", "/", diff --git a/fk101/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/result_zipai_head.xml b/fk101/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/result_zipai_head.xml index f46a7893..5619bb2f 100644 --- a/fk101/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/result_zipai_head.xml +++ b/fk101/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/result_zipai_head.xml @@ -1,11 +1,12 @@ - + - + +