diff --git a/lua_probject/base_project/Game/IExtendConfig.lua b/lua_probject/base_project/Game/IExtendConfig.lua index ae078071..1d41937f 100644 --- a/lua_probject/base_project/Game/IExtendConfig.lua +++ b/lua_probject/base_project/Game/IExtendConfig.lua @@ -31,8 +31,8 @@ function M:FillPlayerData(info, player) NewPlayer = room:NewPlayer() end - --printlog("111111111111111111111111111111111111111111") - --pt(info) + -- printlog("111111111111111111111111111111111111111111") + -- pt(info) for i = 1,#playerList do local _jp = playerList[i] diff --git a/lua_probject/base_project/Game/View/playerDetailView.lua b/lua_probject/base_project/Game/View/playerDetailView.lua index 48bccece..809716f3 100644 --- a/lua_probject/base_project/Game/View/playerDetailView.lua +++ b/lua_probject/base_project/Game/View/playerDetailView.lua @@ -34,7 +34,7 @@ function playerDetailView:Refalsh(player) ImageLoad.Load(player.self_user.head_url, self.loader_icon) self.cMissile.selectedIndex = 1 - if self.player.self_user.account_id == DataManager.SelfUser.account_id or self.flag_witness then + if self.player.self_user.account_id == DataManager.SelfUser.account_id or self.flag_witness then self.cMissile.selectedIndex = 0 end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index b43f887e..c4d0f0d1 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -81,6 +81,7 @@ function M:InitView(url) end function M:InitPlayerInfoView() + print("什么鬼") self._player_info = {} local _player_info = self._player_info for i = 1, self._room.room_config.people_num do @@ -778,8 +779,8 @@ function M:__FangziTip(tip, _uid, fptype) else self._view:AddChild(_chipeng_tip) _chipeng_tip:Center() - _chipeng_tip.x = _chipeng_tip.x + 200 - _chipeng_tip.y = _chipeng_tip.y - 50 + _chipeng_tip.x = _chipeng_tip.x + 600 + _chipeng_tip.y = _chipeng_tip.y - 200 end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua index 06b6dd2a..dc18bff3 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/PlayerSelfCardInfoView.lua @@ -133,7 +133,7 @@ function M:__OnDragEnd(context) for i = 1, #CountCards do local card_view = CountCards[i][1] if card_view ~= nil then - if xy.x > card_view.old_postion.x and xy.x < (card_view.old_postion.x + button.width) and xy.y > self._data_outLinePos 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 @@ -148,7 +148,7 @@ function M:__OnDragEnd(context) -- 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) and button.y > self._data_outLinePos then + 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] @@ -175,7 +175,7 @@ function M:__OnDragEnd(context) 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 + 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 @@ -401,40 +401,40 @@ end function M:playAnim(fzitem, fzcards, size, i, ispaly, flag_pengPao) -- print("lingmeng playAnim", fzitem, fzcards, size, i, ispaly, flag_pengPao) - -- if (ispaly == nil) then - -- ispaly = false - -- end - -- if (ispaly and i == size and not flag_pengPao) then - -- local fristCard = self.card_list[1].btn_card - -- print("lingmeng btn_card", self.card_list[1].index_X) - -- -- self._area_handcard_list:AddChild(fzcards) - -- fzcards:SetPivot(0.5, 0.5) - -- fzcards.rotation = 180 - -- fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) - -- --[[ - -- fzcards:TweenMove( - -- self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - - -- self._area_handcard_list.xy, 0.2) - -- fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) - -- --]] - -- fzcards:RemoveFromParent() - -- fzcards.xy = Vector2.zero - -- fzcards.rotation = 0 - -- fzcards:SetScale(1, 1) - -- fzitem:AddChild(fzcards) - -- self._area_fz_list:AddChildAt(fzitem, 0) - -- --[[ - -- coroutine.start( - -- function() - -- coroutine.wait(0.21) - - -- end - -- ) - -- --]] - -- else - -- fzitem:AddChild(fzcards) - -- self._area_fz_list:AddChildAt(fzitem, 0) - -- end + if (ispaly == nil) then + ispaly = false + end + if (ispaly and i == size and not flag_pengPao) then + local fristCard = self.card_list[1].btn_card + print("lingmeng btn_card", self.card_list[1].index_X) + -- self._area_handcard_list:AddChild(fzcards) + fzcards:SetPivot(0.5, 0.5) + fzcards.rotation = 180 + fzcards.xy = fristCard.xy - Vector2.New(fzcards.width, fzcards.height) + --[[ + fzcards:TweenMove( + self._area_fz_list.xy + Vector2.New(fzcards.width, 0) * self._area_fz_list.numItems - + self._area_handcard_list.xy, 0.2) + fzcards:TweenScale(Vector2.New(0.5, 0.5), 0.2) + --]] + fzcards:RemoveFromParent() + fzcards.xy = Vector2.zero + fzcards.rotation = 0 + fzcards:SetScale(1, 1) + fzitem:AddChild(fzcards) + self._area_fz_list:AddChildAt(fzitem, 0) + --[[ + coroutine.start( + function() + coroutine.wait(0.21) + + end + ) + --]] + else + fzitem:AddChild(fzcards) + self._area_fz_list:AddChildAt(fzitem, 0) + end end --出牌提示动画 diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua index d605fdaf..7b54ee59 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua @@ -92,9 +92,9 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) if typeface == 0 then self._room.change_card_size = 2 elseif typeface == 1 then - self._room.change_card_size = 1.5 + self._room.change_card_size = 1.8 elseif typeface == 2 then - self._room.change_card_size = 1.5 + self._room.change_card_size = 1.8 end else self._room.change_card_size = change_card_size @@ -160,8 +160,8 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) self._ctr_action = self._view:GetController('action') if _room.banker_seat == _room.self_player.seat and readyNum > 1 and readyNum == _room.room_config.people_num then elseif not _room.self_player.ready then - local round = DataManager.CurrenRoom.room_config.config.times or 1 - local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai + -- local round = DataManager.CurrenRoom.room_config.config.times or 1 + -- local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai --[[if xpconfig then if round>1 then self._ctr_action.selectedIndex = 1 @@ -219,6 +219,10 @@ function M:BtnsSafe() self.safe_arrow1.visible = true self.safe_arrow2.visible = false end + local text_playName = self._view:GetChild('text_playName') + if text_playName then + text_playName.text = "放炮罚" + end end function M:InitXiPai() @@ -339,9 +343,9 @@ function M:UpdateCardSize(index) if index == 0 then self._room.change_card_size = 2 elseif index == 1 then - self._room.change_card_size = 1.5 + self._room.change_card_size = 1.8 elseif index == 2 then - self._room.change_card_size = 1.5 + self._room.change_card_size = 1.8 end local info = self._player_card_info[1] info:UpdateCardSize() 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 1811f1b1..78fc87ec 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -171,12 +171,12 @@ function M:ShowHuTip(card) end function M:SetNotPutCard() - local tempNotPutList = DataManager.CurrenRoom.self_player.currentNotPutCardList - if tempNotPutList and #tempNotPutList > 0 then - for i = 1, #tempNotPutList do - self:UpdateKan(tempNotPutList[i]) - end - end + -- local tempNotPutList = DataManager.CurrenRoom.self_player.currentNotPutCardList + -- if tempNotPutList and #tempNotPutList > 0 then + -- for i = 1, #tempNotPutList do + -- self:UpdateKan(tempNotPutList[i]) + -- end + -- end end --手牌 @@ -522,6 +522,10 @@ function M:UpdateOutLine() self._data_outLinePos = 100 - (93 * 3) elseif self:getCardSize() == 1.5 then self._data_outLinePos = 90 - (143 * 3) + elseif self:getCardSize() == 1.6 then + self._data_outLinePos = 90 - (152 * 3) + elseif self:getCardSize() == 1.8 then + self._data_outLinePos = 90 - (170 * 3) elseif self:getCardSize() == 2 then self._data_outLinePos = 110 - (155 * 3) end @@ -802,6 +806,10 @@ function M:GetHandCardPos(cards_view, cards) y = 100 - (85 * cards_view.index_Y) elseif self:getCardSize() == 1.5 then y = 90 - (137 * cards_view.index_Y) + elseif self:getCardSize() == 1.6 then + y = 90 - (147 * cards_view.index_Y) + elseif self:getCardSize() == 1.8 then + y = 90 - (164 * cards_view.index_Y) elseif self:getCardSize() == 2 then y = 90 - (182 * cards_view.index_Y) end @@ -943,7 +951,7 @@ function M:getCardSize() if self._room.change_card_size ~= nil then return self._room.change_card_size else - return 1.2 + return 1.6 end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua index 0dcb13b8..5704d672 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua @@ -28,8 +28,8 @@ function ZPSettingView.new(blur_view, index, open_social, cardIndex) self._btn_dismiss_room_enable = false self._close_destroy = true self.bigSize = 1.4 - self.mediumSize = 1.2 - self.smallSize = 1.2 + self.mediumSize = 1.6 + self.smallSize = 1.6 self._full = true self._anim_pop = 2 self._close_zone = true diff --git a/lua_probject/extend_project/extend/zipai/fulushou/main/ZPChiView.lua b/lua_probject/extend_project/extend/zipai/fulushou/main/ZPChiView.lua index a1db6123..b11cb5de 100644 --- a/lua_probject/extend_project/extend/zipai/fulushou/main/ZPChiView.lua +++ b/lua_probject/extend_project/extend/zipai/fulushou/main/ZPChiView.lua @@ -1,7 +1,7 @@ local M = {} function M.InitChiView(gamectr, view, cardInfo) - local self = setmetatable({}, {__index = M}) + local self = setmetatable({}, { __index = M }) self._room = DataManager.CurrenRoom self.class = "ChiView" self._gamectr = gamectr @@ -21,7 +21,7 @@ function M:ShowView(tiplist, tip_hu, callback, cardInfo) _pop_tip_choice:Dispose() end) - -- --list 去重复的 + -- --list 去重复的 if #tiplist == 1 then _pop_tip_choice:GetController("bipai").selectedIndex = 3 end @@ -36,89 +36,88 @@ function M:ShowView(tiplist, tip_hu, callback, cardInfo) end end end - + list_choose:RemoveChildrenToPool() for i = 1, #tip_list do - if tip_list[i].weight ~=4 then - local item_choose = list_choose:AddItemFromPool() - self:SetIcon(item_choose, 2, tip_list[i].OpCard[1]) - self:SetIcon(item_choose, 3, tip_list[i].OpCard[2]) - self:SetIcon(item_choose, 1, tip_list[i].card) - - item_choose.onClick:Add(function() - for k=1,list_choose.numChildren do - list_choose:GetChildAt(k-1):GetController("zhong") .selectedIndex = 0 - end - item_choose:GetController("zhong").selectedIndex = 1 - if tip_list[i].bi_list ==nil then - callback(tip_list[i].id) - self:CloseTip() - else - self.bilist={} - self._chiid = tip_list[i].id - self:CheckRatioCard(tip_list[i].bi_list,1,tip_list[i].card) - - end - end) - end + if tip_list[i].weight ~= 4 then + local item_choose = list_choose:AddItemFromPool() + self:SetIcon(item_choose, 2, tip_list[i].OpCard[1]) + self:SetIcon(item_choose, 3, tip_list[i].OpCard[2]) + self:SetIcon(item_choose, 1, tip_list[i].card) + + item_choose.onClick:Add(function() + for k = 1, list_choose.numChildren do + list_choose:GetChildAt(k - 1):GetController("zhong").selectedIndex = 0 + end + item_choose:GetController("zhong").selectedIndex = 1 + if tip_list[i].bi_list == nil then + callback(tip_list[i].id) + self:CloseTip() + else + self.bilist = {} + self._chiid = tip_list[i].id + self:CheckRatioCard(tip_list[i].bi_list, 1, tip_list[i].card) + end + end) + end end list_choose:ResizeToFit(#tip_list) - _pop_tip_choice:GetChild("di1").width = list_choose.width+110 - _pop_tip_choice.xy = Vector2((self._mainView.width - _pop_tip_choice.width)/2, -100) + _pop_tip_choice:GetChild("di1").width = list_choose.width + 110 + _pop_tip_choice.xy = Vector2((self._mainView.width - _pop_tip_choice.width) / 2, -100) self._mainView:AddChild(_pop_tip_choice) self._pop_tip_choice = _pop_tip_choice - end - --比牌显示 - function M:CheckRatioCard(_tiplist,index,chicard,_biid) - if _biid ~=nil then - self.bilist={} - self.bilist[#self.bilist+1] = _biid - end - self._pop_tip_choice:GetController("bipai").selectedIndex = index - local Bilist_choose = self._pop_tip_choice:GetChild("Bi_Lst_choose"..index) - Bilist_choose:RemoveChildrenToPool() - for i = 1, #_tiplist do - local item = UIPackage.CreateObjectFromURL("ui://Main_RunBeardMaJiang/Comp_choose") - local item_choose = Bilist_choose:AddChild(item) - self:SetIcon(item_choose, 2, _tiplist[i].opcard[1]) - self:SetIcon(item_choose, 3, _tiplist[i].opcard[2]) - self:SetIcon(item_choose, 1, chicard) - item_choose:GetController("zhong") .selectedIndex = 0 - item_choose.onClick:Add(function() - for k=1,Bilist_choose.numChildren do - Bilist_choose:GetChildAt(k-1):GetController("zhong") .selectedIndex = 0 - end - item_choose:GetController("zhong") .selectedIndex = 1 - if _tiplist[i].bi_list ==nil then - if tip_hu then - local guo_msg = MsgWindow.new(self._root_view, "确定取消胡吗？", MsgWindow.MsgMode.OkAndCancel) - guo_msg.onOk:Add(function() - self.bilist[#self.bilist+1] = i-1 - self._gamectr:SendAction(self._chiid,self.bilist) - guo_msg:Close() - self:CloseTip() - self._cardInfo:UpdateIsOnClick(false) - end) - guo_msg:Show() - else - self.bilist[#self.bilist+1] = i-1 - self._gamectr:SendAction(self._chiid,self.bilist) - self:CloseTip() - self._cardInfo:UpdateIsOnClick(false) - end - else - self:CheckRatioCard(_tiplist[i].bi_list,2,chicard,i-1) - end - end) - end - Bilist_choose:ResizeToFit(#_tiplist) - self._pop_tip_choice:GetChild("di"..index+1).width = Bilist_choose.width+110 - - end +end +--比牌显示 +function M:CheckRatioCard(_tiplist, index, chicard, _biid) + if _biid ~= nil then + self.bilist = {} + self.bilist[#self.bilist + 1] = _biid + end + self._pop_tip_choice:GetController("bipai").selectedIndex = index + local Bilist_choose = self._pop_tip_choice:GetChild("Bi_Lst_choose" .. index) + Bilist_choose:RemoveChildrenToPool() + for i = 1, #_tiplist do + local item = UIPackage.CreateObjectFromURL("ui://Main_RunBeardMaJiang/Comp_choose") + local item_choose = Bilist_choose:AddChild(item) + self:SetIcon(item_choose, 2, _tiplist[i].opcard[1]) + self:SetIcon(item_choose, 3, _tiplist[i].opcard[2]) + self:SetIcon(item_choose, 1, chicard) + item_choose:GetController("zhong").selectedIndex = 0 + item_choose.onClick:Add(function() + for k = 1, Bilist_choose.numChildren do + Bilist_choose:GetChildAt(k - 1):GetController("zhong").selectedIndex = 0 + end + item_choose:GetController("zhong").selectedIndex = 1 + if _tiplist[i].bi_list == nil then + if tip_hu then + local guo_msg = MsgWindow.new(self._root_view, "确定取消胡吗？", MsgWindow.MsgMode.OkAndCancel) + guo_msg.onOk:Add(function() + self.bilist[#self.bilist + 1] = i - 1 + self._gamectr:SendAction(self._chiid, self.bilist) + guo_msg:Close() + self:CloseTip() + self._cardInfo:UpdateIsOnClick(false) + end) + guo_msg:Show() + else + self.bilist[#self.bilist + 1] = i - 1 + self._gamectr:SendAction(self._chiid, self.bilist) + self:CloseTip() + self._cardInfo:UpdateIsOnClick(false) + end + else + self:CheckRatioCard(_tiplist[i].bi_list, 2, chicard, i - 1) + end + end) + end + Bilist_choose:ResizeToFit(#_tiplist) + self._pop_tip_choice:GetChild("di" .. index + 1).width = Bilist_choose.width + 110 +end function M:SetIcon(item, index, card) - item:GetChild("card" .. index).icon = UIPackage.GetItemURL("Main_RunBeardMaJiang", CommonFun:GetCardItem("201_", card)) + item:GetChild("card" .. index).icon = UIPackage.GetItemURL("Main_RunBeardMaJiang", + CommonFun:GetCardItem("201_", card)) end function M:CloseTip() diff --git a/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua index 78bc8899..c00af4b1 100644 --- a/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua @@ -19,18 +19,18 @@ local CardView = { index_Y = 0, -- 原始位置 old_postion = Vector2.zero, - --相同牌数量 - sameNum=0 + --相同牌数量 + sameNum = 0 } -local function NewCardView(card, cardItem, index_X, index_Y,num) +local function NewCardView(card, cardItem, index_X, index_Y, num) local self = {} - setmetatable(self, {__index = CardView}) + setmetatable(self, { __index = CardView }) self.btn_card = card self.card_item = cardItem self.index_X = index_X self.index_Y = index_Y - self.sameNum=num + self.sameNum = num return self end @@ -45,7 +45,7 @@ local PlayerSelfCardInfoView = { local M = PlayerSelfCardInfoView function M.new(view, mainView) local self = {} - setmetatable(self, {__index = M}) + setmetatable(self, { __index = M }) self._view = view self._mainView = mainView self:init() @@ -55,7 +55,7 @@ end function M:init() local view = self._view self._isDrg = false - self.card_list = {} -- 牌的btn code type pos 等等 + self.card_list = {} -- 牌的btn code type pos 等等 self.cards_count = 0 -- 牌的总列数 self.card_width = 99 self.card_hight = 121 @@ -67,93 +67,89 @@ function M:init() self._area_qipai_list = view:GetChild('windcard_list') self._mask_liangpai = view:GetChild('mask_liangpai') UIPackage.AddPackage('base/main_zipaimajiang/ui/Main_RunBeardMaJiang') - self.ctr_piao = self._view:GetController('piao') + self.ctr_piao = self._view:GetController('piao') self.ctr_piao_value = self._view:GetController('piaovalue') - self:BtnEvent() + self:BtnEvent() end - function M:ShowPiao(piao) - self:UpdateIsOnClick(true) - self:IsShowAllPiao(true) + self:UpdateIsOnClick(true) + self:IsShowAllPiao(true) self.ctr_piao.selectedIndex = piao - if piao ==3 then - local tconfig=DataManager.CurrenRoom.room_config.config - if tconfig.piao1==false then - self:IsEnablePiao(1,false) - end - if tconfig.piao2==false then - self:IsEnablePiao(2,false) - end - if tconfig.piao3==false then - self:IsEnablePiao(3,false) - end - if tconfig.piao4==false then - self:IsEnablePiao(8,false) - end - end + if piao == 3 then + local tconfig = DataManager.CurrenRoom.room_config.config + if tconfig.piao1 == false then + self:IsEnablePiao(1, false) + end + if tconfig.piao2 == false then + self:IsEnablePiao(2, false) + end + if tconfig.piao3 == false then + self:IsEnablePiao(3, false) + end + if tconfig.piao4 == false then + self:IsEnablePiao(8, false) + end + end end -function M:ShowSpecialPiao(piao,lastPiao) - self:UpdateIsOnClick(true) - self:IsShowAllPiao(true) +function M:ShowSpecialPiao(piao, lastPiao) + self:UpdateIsOnClick(true) + self:IsShowAllPiao(true) self.ctr_piao.selectedIndex = piao - for k,v in pairs(self.PiaoList) do - if k0 then - self._mainView._hu_tip:FillData(tempV) - else - self._mainView._hu_tip:FillData({}) - end - end - - else - - end - - + + + if card then + if DataManager.CurrenRoom.self_player.CardTingList then + local tempV = DataManager.CurrenRoom.self_player.CardTingList[card] + if tempV and #tempV > 0 then + self._mainView._hu_tip:FillData(tempV) + else + self._mainView._hu_tip:FillData({}) + end + end + else + + end end - function M:SetNotPutCard() - local tempNotPutList=DataManager.CurrenRoom.self_player.currentNotPutCardList - if tempNotPutList and #tempNotPutList>0 then - for i=1,#tempNotPutList do - self:UpdateKan(tempNotPutList[i]) - end - end + local tempNotPutList = DataManager.CurrenRoom.self_player.currentNotPutCardList + if tempNotPutList and #tempNotPutList > 0 then + for i = 1, #tempNotPutList do + self:UpdateKan(tempNotPutList[i]) + end + end end --手牌 function M:InitHandCard(isPlayAni) - self:HidePiao() + self:HidePiao() if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then return end @@ -239,8 +232,8 @@ function M:InitHandCard(isPlayAni) local _room = DataManager.CurrenRoom --得到排序好的 list local pokerList = PendulumRule.GetHandCard(_room.self_player.handcard_list) - --printlog("计算牌型mySelf==>>>") - --pt(pokerList) + --printlog("计算牌型mySelf==>>>") + --pt(pokerList) if pokerList == nil or #pokerList == 0 then return end @@ -251,118 +244,113 @@ function M:InitHandCard(isPlayAni) if isPlayAni == true then self.cor_init_poker = coroutine.start( - function() - self._mainView._popEvent = false - if self._mainView._rightPanelView._settingView ~= nil then - self._mainView._rightPanelView._settingView:SetBtnUpdateCardEnable(false) - end - - for i = 1, #pokerList do - local pokerListNum = 0 - for j = #pokerList[i],1,-1 do - for k=1,#pokerList[i][j] do - local currentCardNum=#pokerList[i][j] - local card_code = pokerList[i][j][k] - local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeardMaJiang/Btn_Card') - btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code) - btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) - btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - self.card_width = 95 * self:getCardSize() - self.card_hight = 121 * self:getCardSize() - local x, y = 500, (j * 75) + 500 - btn_card:SetXY(x, y) - - btn_card:GetController('cardnum').selectedIndex=currentCardNum-1 - local cardNums=currentCardNum-1 - if cardNums>0 then - for n=1,cardNums do - local tempCardBtn=btn_card:GetChild('icon'..n) - tempCardBtn.icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code) - tempCardBtn:SetScale(self:getCardSize(), self:getCardSize()) - - end - end - - self._area_handcard_list:AddChild(btn_card) - self._area_handcard_list:SetChildIndex(btn_card, j) - btn_card.sortingOrder=j - local card_view = NewCardView(btn_card, card_code, i, j,currentCardNum) - --存牌堆 - self.card_list[#self.card_list + 1] = card_view - btn_card.data = card_view - btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin)) - btn_card.onTouchMove:Set(handler(self, self.onTouchMove)) - btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd)) - btn_card.onClick:Set(self.__OnClickHandCard,self) - end - - end - - for j = 1, #self.card_list, -1 do - coroutine.wait(0.005) - if pokerListNum == #pokerList[i] then - break - end - pokerListNum = pokerListNum + 1 - local card_view = self.card_list[j] - card_view.btn_card:RemoveFromParent() - self._area_handcard_list:AddChild(card_view.btn_card) - card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, self.cards_count), 0.08) + function() + self._mainView._popEvent = false + if self._mainView._rightPanelView._settingView ~= nil then + self._mainView._rightPanelView._settingView:SetBtnUpdateCardEnable(false) end - - end - self:UpdateHandCardsPos() - - -------------------- - self._mainView._popEvent = true - self:UpdateIsOnClick(true) - if self._mainView._rightPanelView._settingView ~= nil then - coroutine.start( - function() - coroutine.wait(1) - self._mainView._rightPanelView._settingView:SetBtnUpdateCardEnable(true) + + for i = 1, #pokerList do + local pokerListNum = 0 + for j = #pokerList[i], 1, -1 do + for k = 1, #pokerList[i][j] do + local currentCardNum = #pokerList[i][j] + local card_code = pokerList[i][j][k] + local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeardMaJiang/Btn_Card') + btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', + card_code) + btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) + btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) + self.card_width = 95 * self:getCardSize() + self.card_hight = 121 * self:getCardSize() + local x, y = 500, (j * 75) + 500 + btn_card:SetXY(x, y) + + btn_card:GetController('cardnum').selectedIndex = currentCardNum - 1 + local cardNums = currentCardNum - 1 + if cardNums > 0 then + for n = 1, cardNums do + local tempCardBtn = btn_card:GetChild('icon' .. n) + tempCardBtn.icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code) + tempCardBtn:SetScale(self:getCardSize(), self:getCardSize()) + end + end + + self._area_handcard_list:AddChild(btn_card) + self._area_handcard_list:SetChildIndex(btn_card, j) + btn_card.sortingOrder = j + local card_view = NewCardView(btn_card, card_code, i, j, currentCardNum) + --存牌堆 + self.card_list[#self.card_list + 1] = card_view + btn_card.data = card_view + btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin)) + btn_card.onTouchMove:Set(handler(self, self.onTouchMove)) + btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd)) + btn_card.onClick:Set(self.__OnClickHandCard, self) + end end - ) + + for j = 1, #self.card_list, -1 do + coroutine.wait(0.005) + if pokerListNum == #pokerList[i] then + break + end + pokerListNum = pokerListNum + 1 + local card_view = self.card_list[j] + card_view.btn_card:RemoveFromParent() + self._area_handcard_list:AddChild(card_view.btn_card) + card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, self.cards_count), 0.08) + end + end + self:UpdateHandCardsPos() + + -------------------- + self._mainView._popEvent = true + self:UpdateIsOnClick(true) + if self._mainView._rightPanelView._settingView ~= nil then + coroutine.start( + function() + coroutine.wait(1) + self._mainView._rightPanelView._settingView:SetBtnUpdateCardEnable(true) + end + ) + end end - end - ) + ) else - - for i = 1, #pokerList do - for j = #pokerList[i],1,-1 do - for k=1,#pokerList[i][j] do - local currentCardNum=#pokerList[i][j] - local card_code = pokerList[i][j][k] - local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeardMaJiang/Btn_Card') - btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code) - btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) - btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - self.card_width = 95 * self:getCardSize() - self.card_hight = 121 * self:getCardSize() - btn_card:GetController('cardnum').selectedIndex=currentCardNum-1 - local cardNums=currentCardNum-1 - if cardNums>0 then - for n=1,cardNums do - local tempCardBtn=btn_card:GetChild('icon'..n) - tempCardBtn.icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code) - tempCardBtn:SetScale(self:getCardSize(), self:getCardSize()) - - end - end - - self._area_handcard_list:AddChild(btn_card) - self._area_handcard_list:SetChildIndex(btn_card,j) - btn_card.sortingOrder=j - local card_view = NewCardView(btn_card, card_code, i, j,currentCardNum) - --存牌堆 - self.card_list[#self.card_list + 1] = card_view - btn_card.data = card_view - btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin)) - btn_card.onTouchMove:Set(handler(self, self.onTouchMove)) - btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd)) - btn_card.onClick:Set(self.__OnClickHandCard,self) - end - + for i = 1, #pokerList do + for j = #pokerList[i], 1, -1 do + for k = 1, #pokerList[i][j] do + local currentCardNum = #pokerList[i][j] + local card_code = pokerList[i][j][k] + local btn_card = UIPackage.CreateObjectFromURL('ui://Main_RunBeardMaJiang/Btn_Card') + btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code) + btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) + btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) + self.card_width = 95 * self:getCardSize() + self.card_hight = 121 * self:getCardSize() + btn_card:GetController('cardnum').selectedIndex = currentCardNum - 1 + local cardNums = currentCardNum - 1 + if cardNums > 0 then + for n = 1, cardNums do + local tempCardBtn = btn_card:GetChild('icon' .. n) + tempCardBtn.icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_code) + tempCardBtn:SetScale(self:getCardSize(), self:getCardSize()) + end + end + + self._area_handcard_list:AddChild(btn_card) + self._area_handcard_list:SetChildIndex(btn_card, j) + btn_card.sortingOrder = j + local card_view = NewCardView(btn_card, card_code, i, j, currentCardNum) + --存牌堆 + self.card_list[#self.card_list + 1] = card_view + btn_card.data = card_view + btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin)) + btn_card.onTouchMove:Set(handler(self, self.onTouchMove)) + btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd)) + btn_card.onClick:Set(self.__OnClickHandCard, self) + end end --存牌堆 for j = 1, #self.card_list do @@ -370,88 +358,73 @@ function M:InitHandCard(isPlayAni) card_view.btn_card.xy = self:GetHandCardPos(card_view, self.cards_count) end end - - self:UpdateHandCardsPos() - - - + + self:UpdateHandCardsPos() end - - self:SetNotPutCard() + + self:SetNotPutCard() end - - function M:__OnClickHandCard(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 - - - - if (Utils.IsDoubleClick(context) and _room.curren_outcard_seat == _room.self_player.seat) then - - local OutCardCallBackFunc=function () - button.touchable = false - self.outcard_button = card - self:UpdateIsOnClick(false) - self._mainView:OutCard(card.card_item) - end - - local tingpaiList=DataManager.CurrenRoom.self_player.tingPaiList - local isHasTing=CheckDictionaryFromContent(card.card_item,DataManager.CurrenRoom.self_player.tingPaiList) - --printlog("是否包含有====》》》》",isHasTing) - --pt(tingpaiList) - if isHasTing==nil then isHasTing=false end - - if isHasTing==false and tingpaiList and #tingpaiList>0 then - local spCallBackFunc=function (isOP) - if isOP then - OutCardCallBackFunc() - else - local isChangeCard = false - self.outcard_button = nil - card.btn_card:GetController('cardnum').selectedIndex=card.sameNum-1 - card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeardMaJiang/201_",card.card_item) - self._area_handcard_list:AddChild(button) - if card.btn_card.sortingOrder then - card.btn_card.sortingOrder = card.order or 1 - end - - if #self.card_list == 1 then - isChangeCard = false - self:UpdateHandCardsPos() - return - end - card.btn_card.xy=card.startPos - end - end - local SPView=SanPaiInfoView.new(spCallBackFunc) - - else - OutCardCallBackFunc() - end - - - + + + if (Utils.IsDoubleClick(context) and _room.curren_outcard_seat == _room.self_player.seat) then + local OutCardCallBackFunc = function() + button.touchable = false + self.outcard_button = card + self:UpdateIsOnClick(false) + self._mainView:OutCard(card.card_item) + end + + local tingpaiList = DataManager.CurrenRoom.self_player.tingPaiList + local isHasTing = CheckDictionaryFromContent(card.card_item, DataManager.CurrenRoom.self_player.tingPaiList) + --printlog("是否包含有====》》》》",isHasTing) + --pt(tingpaiList) + if isHasTing == nil then isHasTing = false end + + if isHasTing == false and tingpaiList and #tingpaiList > 0 then + local spCallBackFunc = function(isOP) + if isOP then + OutCardCallBackFunc() + else + local isChangeCard = false + self.outcard_button = nil + card.btn_card:GetController('cardnum').selectedIndex = card.sameNum - 1 + card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeardMaJiang/201_", + card.card_item) + self._area_handcard_list:AddChild(button) + if card.btn_card.sortingOrder then + card.btn_card.sortingOrder = card.order or 1 + end + + if #self.card_list == 1 then + isChangeCard = false + self:UpdateHandCardsPos() + return + end + card.btn_card.xy = card.startPos + end + end + local SPView = SanPaiInfoView.new(spCallBackFunc) + else + OutCardCallBackFunc() + end end - - end - - - --更新手牌 function M:UpdateHandCards(list) self.card_list = {} @@ -492,7 +465,7 @@ function M:UpdateHandCards(list) end end end - self:SetNotPutCard() + self:SetNotPutCard() end -- -- @@ -505,8 +478,8 @@ function M:onTouchBegin(context) if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then self:ShowHuTip(card.card_item) end - card.startPos=card.btn_card.xy - printlog("拖动开始位置===>>>",card.startPos) + card.startPos = card.btn_card.xy + printlog("拖动开始位置===>>>", card.startPos) card.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/203_', card.card_item) -- card.btn_card.sortingOrder = 100 local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) @@ -532,6 +505,7 @@ function M:ChuPaiTiShi() self._view:GetController('chupai').selectedIndex = 0 end end + -- 删手牌 function M:DeleteHandCard(carditem) local card = nil @@ -574,6 +548,7 @@ function M:DeleteHandCard(carditem) end --self:UpdateHandCardsPos() end + --更新手牌的坎 function M:UpdateKan(card) for i = 1, #self.card_list do @@ -613,11 +588,13 @@ function M:UpdateCardDisplay() for i = #self.card_list, 1, -1 do local card_view = self.card_list[i] card_view.btn_card:RemoveFromParent() - card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_view.card_item) + card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_view + .card_item) self._area_handcard_list:AddChild(card_view.btn_card) card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3) end end + --更新手牌大小 function M:UpdateCardSize() local CountCards = {} @@ -628,7 +605,8 @@ function M:UpdateCardSize() for i = #self.card_list, 1, -1 do local card_view = self.card_list[i] card_view.btn_card:RemoveFromParent() - card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_view.card_item) + card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/201_', card_view + .card_item) card_view.btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) card_view.btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) self.card_width = 99 * self:getCardSize() @@ -671,11 +649,9 @@ function M:__OnDragEnd(context) self:UpdateHandCardsPos() return end - - printlog("拖动结束位置为===>>>",card.startPos) - card.btn_card.xy=card.startPos - - + + printlog("拖动结束位置为===>>>", card.startPos) + card.btn_card.xy = card.startPos end end @@ -702,17 +678,17 @@ function M:GetHandCardPos(cards_view, cards) if self:getCardSize() == 1.2 then --y = 90 - (85 * cards_view.index_Y) - y = (115 * cards_view.index_Y)-450 + y = (115 * cards_view.index_Y) - 450 elseif self:getCardSize() == 1 then - y = (115 * cards_view.index_Y)-450 - --printlog("Y坐标==>>>",y) + y = (115 * cards_view.index_Y) - 450 + --printlog("Y坐标==>>>",y) elseif self:getCardSize() == 0.8 then - -- y = 100 - (65 * cards_view.index_Y) - y = (115 * cards_view.index_Y)-450 + -- y = 100 - (65 * cards_view.index_Y) + y = (115 * cards_view.index_Y) - 450 + end + if cards_view.index_Y > 1 then + --y=y-15 end - if cards_view.index_Y>1 then - --y=y-15 - end return Vector2.New(x, y) end @@ -727,10 +703,13 @@ function M:UpdateFzList1(fz_list) end if fz_list[i].type == RB_FZTypeFLS.Chi or fz_list[i].type == RB_FZTypeFLS.Bi then local fzcards = UIPackage.CreateObjectFromURL('ui://Main_RunBeardMaJiang/Fz_0_3') - fzcards:GetChild('card_' .. 1).icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', fz_list[i].active_card) + fzcards:GetChild('card_' .. 1).icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', + fz_list[i].active_card) fzcards:GetController('c2').selectedIndex = 1 - fzcards:GetChild('card_' .. 2).icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', fz_list[i].opcard[1]) - fzcards:GetChild('card_' .. 3).icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', fz_list[i].opcard[2]) + fzcards:GetChild('card_' .. 2).icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', fz_list[i].opcard + [1]) + fzcards:GetChild('card_' .. 3).icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', fz_list[i].opcard + [2]) fzcards.x, fzcards.y = 0, 0 fzitem:AddChildAt(fzcards, 0) self._area_fz_list:AddChild(fzitem) @@ -760,7 +739,7 @@ function M:UpdateFzList1(fz_list) fzcards.x, fzcards.y = 0, 0 fzitem:AddChildAt(fzcards, 0) self._area_fz_list:AddChild(fzitem) - elseif fz_list[i].type == RB_FZTypeFLS.Zhao or fz_list[i].type == RB_FZTypeFLS.SZhao or fz_list[i].type == RB_FZTypeFLS.Gang or fz_list[i].type == RB_FZTypeFLS.SGang then + elseif fz_list[i].type == RB_FZTypeFLS.Zhao or fz_list[i].type == RB_FZTypeFLS.SZhao or fz_list[i].type == RB_FZTypeFLS.Gang or fz_list[i].type == RB_FZTypeFLS.SGang then local fzcards = UIPackage.CreateObjectFromURL('ui://Main_RunBeardMaJiang/Fz_0_4') for j = 1, 4 do fzcards:GetChild('card_' .. j).icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', fz_list[i].card) @@ -768,7 +747,7 @@ function M:UpdateFzList1(fz_list) fzcards.x, fzcards.y = 0, 0 fzitem:AddChildAt(fzcards, 0) self._area_fz_list:AddChild(fzitem) - --[[elseif fz_list[i].type == RB_FZTypeFLS.Gang or fz_list[i].type == RB_FZTypeFLS.SGang then + --[[elseif fz_list[i].type == RB_FZTypeFLS.Gang or fz_list[i].type == RB_FZTypeFLS.SGang then local fzcards = UIPackage.CreateObjectFromURL('ui://Main_RunBeardMaJiang/Fz_0_4') for j = 1, 4 do if j == 4 then @@ -787,6 +766,7 @@ end function M:ClearOutCard() self._area_outcard_list:RemoveChildren(0, -1, true) end + --出牌 function M:UpdateOutCardList(outcard) self._area_outcard_list:RemoveChildren(0, -1, true) @@ -813,7 +793,8 @@ end --摸牌动画 function M:PlayingOutCardAnima(card) if (self._area_outcard_list ~= nil and self._area_outcard_list.numChildren > 0) then - self._area_outcard_list:GetChildAt(0):GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', card) + self._area_outcard_list:GetChildAt(0):GetChild('icon').icon = self:getCardItem('ui://Main_RunBeardMaJiang/202_', + card) self._view:GetTransition('t0'):Play() end coroutine.start( @@ -831,12 +812,13 @@ function M:getCardItem(card_1, card_2) else return card_1 .. '2_' .. card_2 end--]] - return card_1 .. '1_' .. card_2 + return card_1 .. '1_' .. card_2 end + --得到设置的牌大小 function M:getCardSize() if self._room.change_card_size ~= nil then - return 1.2--self._room.change_card_size + return 1.2 --self._room.change_card_size else return 1.2 end diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png index 7a8cce42..83b76b2d 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png index e921c960..15f2dbf8 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png index 4416f295..bc07b6f1 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png index cef6e1ef..0fd687a2 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes index 2e44dcf8..da942a5e 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png index 743eac91..264250a7 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png index c1042649..97e3cd5a 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png index 96794687..998d2e45 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png index 17776330..24dfac85 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png index 4077b487..c1441f57 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png index 21dde2c5..64132595 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png index 8df0760c..cab171e9 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png index 70b3e020..7e76fd6b 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes index 962bf44c..cd113553 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info index 17ce7d71..d04551a1 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -1,16 +1,10 @@ { "objectStatus": { - "n84_rbpg": { - "hidden": true - }, - "n51_fmkv": { - "collapsed": true - }, "n85_rbpg": { "hidden": true }, - "n19_pt1r": { - "collapsed": true + "n84_rbpg": { + "hidden": true }, "n4_fux2": { "hidden": true diff --git a/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info b/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info deleted file mode 100644 index 816f7036..00000000 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92u.info +++ /dev/null @@ -1,7 +0,0 @@ -{ - "objectStatus": { - "n19_of6w": { - "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 deleted file mode 100644 index 9e26dfee..00000000 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6e.info +++ /dev/null @@ -1 +0,0 @@ -{} \ 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 deleted file mode 100644 index bcd1c68f..00000000 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq6r.info +++ /dev/null @@ -1,7 +0,0 @@ -{ - "objectStatus": { - "n57_r1mo": { - "collapsed": 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 deleted file mode 100644 index 9e26dfee..00000000 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info deleted file mode 100644 index 18662af8..00000000 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info +++ /dev/null @@ -1,10 +0,0 @@ -{ - "objectStatus": { - "n76_ra9v": { - "collapsed": true - }, - "n77_ra9v": { - "collapsed": true - } - } -} \ No newline at end of file diff --git a/wb_new_ui/assets/Chat/component/Btn_biaoqing.xml b/wb_new_ui/assets/Chat/component/Btn_biaoqing.xml index 78e80bb2..5dbf2ce1 100644 --- a/wb_new_ui/assets/Chat/component/Btn_biaoqing.xml +++ b/wb_new_ui/assets/Chat/component/Btn_biaoqing.xml @@ -1,11 +1,11 @@ - - + + - +