diff --git a/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua b/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua index 8aaf92a0..05e331ff 100644 --- a/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua @@ -67,6 +67,10 @@ function M:InitView(url) if (room.playing or room.curren_round > 0) or room.status == 1 then self:ReloadRoom() end + local text_playName = self._view:GetChild('text_playName') + if text_playName then + text_playName.text = "长沙麻将" + end end diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua index 1946b2d0..198fee76 100644 --- a/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/hechi/EXMainView.lua @@ -77,6 +77,10 @@ function M:InitView(url) if room.playing or room.curren_round > 0 then self:ReloadRoom() end + local text_playName = self._view:GetChild('text_playName') + if text_playName then + text_playName.text = "河池麻将" + end end function M:__BuGang(card1,card2, callback) diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXMainView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXMainView.lua index b1300b7b..ea99e011 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXMainView.lua @@ -68,9 +68,9 @@ function M:setBtn() local btn_rule = rightpanel:GetChild('btn_log') local gcm_chat = self._view:GetChild('gcm_chat') local _btn_chat = gcm_chat:GetChild('n1') - _btn_chat:GetChild('icon').icon = 'ui://Main_RunBeard/chat_img' + -- _btn_chat:GetChild('icon').icon = 'ui://Main_RunBeard/chat_img' local btn_record = gcm_chat:GetChild('btn_record') - btn_record:GetChild('icon').icon = 'ui://Main_RunBeard/yuyin_img' + --btn_record:GetChild('icon').icon = 'ui://Main_RunBeard/yuyin_img' if btn_rule ~= nil then btn_rule.onClick:Set( diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua index be8a9390..95416886 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/changdepaohuzi/EXPlayBackView.lua @@ -98,8 +98,60 @@ function M:InitView(url) self._cmdmap[Record_Event.Evt_Win] = self.CmdWin self._cmdmap[Record_Event.Evt_ChangePaiXing] = self.CmdChangePaiXing self._cmdmap[Record_Event.Evt_result] = self.onResult + + local btn_safe = self._view:GetChild('btn_safe') + self.safe_arrow1 = btn_safe:GetChild("arrow1") + self.safe_arrow2 = btn_safe:GetChild("arrow2") + btn_safe.onClick:Set( + function() + self:BtnsSafe() + end + ) + local safe_close = self._view:GetChild('safe_close') + safe_close.onClick:Set( + function() + self:BtnsSafe() + end + ) + self:BtnsSafe() + end +function M:BtnsSafe() + local btn_temp1 = self._view:GetChild("btn_back_lobby") + local btn_temp2 = self._view:GetChild("Btn_jiesan_lobby") + local btn_temp3 = self._view:GetChild("btn_leave_lobby") + local btn_temp4 = self._view:GetChild("btn_setting") + local safe_close = self._view:GetChild('safe_close') + local btn_rule = self._view:GetChild('btn_rule') + local gcm_chat = self._view:GetChild('gcm_chat') + + btn_temp1.visible = not btn_temp1.visible + btn_temp2.visible = not btn_temp2.visible + btn_temp3.visible = not btn_temp3.visible + btn_temp4.visible = not btn_temp4.visible + safe_close.visible = not safe_close.visible + btn_rule.visible = not btn_rule.visible + gcm_chat.visible = not gcm_chat.visible + + local safe = self._view:GetChild("safe_bg") + safe.visible = not safe.visible + + if safe.visible then + self.safe_arrow1.visible = false + self.safe_arrow2.visible = true + else + 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:NewPlayerPokerInfoView(view, index) if index == 1 then return PlayerSelfCardInfoView.new(view, self) diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua index 243b0bb7..ec1f1bf2 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua @@ -12,8 +12,17 @@ function M.new(view,mainView) return self end - - +--牌位置 +function M:GetHandCardPos(cards_view, cards) + local x, y = 0, 0 + local card_width = 75 -- 改小间距，让牌更紧凑 + local middle_x = self._area_handcard_list.width / 2 + local start_x = middle_x - (cards / 2 * card_width) + x = start_x + (card_width) * (cards_view.index_X - 1) + y = 0 - (75 * cards_view.index_Y) + return Vector2.New(x, y) +end +--对方 function M:UpdateFzList( fz_list ,ispaly,seat) self._area_fz_list:RemoveChildren(0,-1,true) for i = 1,#fz_list do @@ -80,7 +89,7 @@ function M:UpdateFzList( fz_list ,ispaly,seat) else for j=1,4 do if j==4 then - fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card) + fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300" else fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300" end @@ -181,9 +190,7 @@ 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 @@ -230,7 +237,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/Qipais") + local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai") qicards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/202_",qi_list[i]) if(ispaly)then if(i == #qi_list) then diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua index 4a441833..00a45cfb 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua @@ -40,13 +40,13 @@ 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 - card.btn_card.height = card.btn_card.width/95*119 - if (button.y < self._data_outLinePos - self.card_hight * 0.66 and _room.curren_outcard_seat == _room.self_player.seat) then + -- 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 button.touchable = false self.outcard_button = card self:UpdateIsOnClick(false) @@ -81,7 +81,7 @@ function M:__OnDragEnd(context) maxmark =#self.card_list-1 end end - if xy.x < self.card_list[minmark].btn_card.x and #CountCards < 10 and xy.y > self._data_outLinePos - self.card_hight * 0.66 then + 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 @@ -107,7 +107,7 @@ function M:__OnDragEnd(context) card.index_Y =1 table.insert(self.card_list,1,card) isChangeCard = true - elseif xy.x > (self.card_list[maxmark].btn_card.x + self.card_width) and #CountCards < 10 and xy.y > self._data_outLinePos - self.card_hight * 0.66 then + 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 @@ -136,7 +136,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 + self.card_width) and xy.y > self._data_outLinePos - self.card_hight * 0.66 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 @@ -148,37 +148,34 @@ function M:__OnDragEnd(context) end local MoveCardindex = 0 -- 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 + self.card_width) and button.y > self._data_outLinePos - self.card_hight * 0.66 then + 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 xy.y > _cv.btn_card.y and xy.y < (_cv.btn_card.y + self.card_hight) 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 i < card.index_Y 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 i > card.index_Y then + 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 + self.card_hight / 2 < _cv.btn_card.y then + 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 + self.card_hight / 2 > (_cv.btn_card.y + button.width * 2) then + 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 @@ -270,13 +267,11 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat) if(isMopai == nil) then isMopai = false 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" + 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) end @@ -330,11 +325,11 @@ function M:PlayingOutCardAnima( card) 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 @@ -346,11 +341,11 @@ function M:UpdateFzList( fz_list ,ispaly) 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:GetController("c3").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) elseif fz_list[i].type == RB_FZType.Peng then local fzcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") @@ -361,11 +356,15 @@ function M:UpdateFzList( fz_list ,ispaly) 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 + if j == 3 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" + end + end fzcards.x,fzcards.y = 0,0 self:playAnim(fzitem,fzcards,#fz_list,i,ispaly) diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua index 478660f8..0dfdf799 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua +++ b/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.03 + self._room.change_card_size = 1.2 elseif typeface == 1 then self._room.change_card_size = 1 elseif typeface == 2 then - self._room.change_card_size = 1 + self._room.change_card_size = 0.8 end else self._room.change_card_size = change_card_size @@ -178,6 +178,56 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu) self:showBackBtnView() self:InitXiPai() self:InitXiPai1() + + local btn_safe = self._view:GetChild('btn_safe') + self.safe_arrow1 = btn_safe:GetChild("arrow1") + self.safe_arrow2 = btn_safe:GetChild("arrow2") + btn_safe.onClick:Set( + function() + self:BtnsSafe() + end + ) + local safe_close = self._view:GetChild('safe_close') + safe_close.onClick:Set( + function() + self:BtnsSafe() + end + ) + self:BtnsSafe() +end + +-- zlx 20260208 +function M:BtnsSafe() + local btn_temp1 = self._view:GetChild("btn_back_lobby") + local btn_temp2 = self._view:GetChild("Btn_jiesan_lobby") + local btn_temp3 = self._view:GetChild("btn_leave_lobby") + local btn_temp4 = self._view:GetChild("btn_setting") + local safe_close = self._view:GetChild('safe_close') + local btn_rule = self._view:GetChild('btn_rule') + local gcm_chat = self._view:GetChild('gcm_chat') + + btn_temp1.visible = not btn_temp1.visible + btn_temp2.visible = not btn_temp2.visible + btn_temp3.visible = not btn_temp3.visible + btn_temp4.visible = not btn_temp4.visible + safe_close.visible = not safe_close.visible + btn_rule.visible = not btn_rule.visible + gcm_chat.visible = not gcm_chat.visible + + local safe = self._view:GetChild("safe_bg") + safe.visible = not safe.visible + + if safe.visible then + self.safe_arrow1.visible = false + self.safe_arrow2.visible = true + else + 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() @@ -301,11 +351,11 @@ end -- 设置 更新 手牌大小 function M:UpdateCardSize(index) if index == 0 then - self._room.change_card_size = 1.03 + self._room.change_card_size = 1.2 elseif index == 1 then self._room.change_card_size = 1 elseif index == 2 then - self._room.change_card_size = 1 + self._room.change_card_size = 0.8 end local info = self._player_card_info[1] info:UpdateCardSize() diff --git a/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPSettingView.lua b/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPSettingView.lua index f6ccb824..11edc36f 100644 --- a/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPSettingView.lua +++ b/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPSettingView.lua @@ -1,5 +1,6 @@ local SettingView = require('Game.View.SettingView') local ZPTableBG = import('.ZPTableBG') +local TableBG = require("Game.Data.TableBG") local ZPSettingView = { -- 修改牌字体 @@ -27,11 +28,11 @@ function ZPSettingView.new(blur_view, index, open_social,cardIndex) self.cd_time = 0 self._btn_dismiss_room_enable = false self._close_destroy = true - self.bigSize = 1.03 + self.bigSize = 1.2 self.mediumSize = 1 - self.smallSize = 1 + self.smallSize = 0.8 self._full = true - self._anim_pop = 2 + self._anim_pop = 0 self._open_social = open_social self._cardType=cardIndex self:init('ui://Main_RunBeard/New_SettingWindow') @@ -51,6 +52,26 @@ function M:init(url) -- local btn_music = view:GetChild('btn_music') -- local btn_sound = view:GetChild('btn_sound') + local _btn_dismiss_room = view:GetChild('btn_dismiss_room') + self._btn_dismiss_room = _btn_dismiss_room + if _btn_dismiss_room then + _btn_dismiss_room.onClick:Add( + function() + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:AskDismissRoom() + self:Destroy() + end + ) + end + + self._view:GetChild("btn_close22").onClick:Set(function( ... ) + local bg_id = self._view:GetController("bg").selectedIndex + 1 + if self._bg ~= bg_id then + self._bg = bg_id + TableBG.SaveTableBG(self._game_id, self._bg) + end + self:Destroy() + end) -- btn_music.selected = (GameApplication.Instance.MusicValue < 5 and false or true) slider_sound.value = GameApplication.Instance.SoundValue slider_music.value = GameApplication.Instance.MusicValue @@ -84,7 +105,7 @@ function M:init(url) elseif room.change_card_size == self.mediumSize then size.selectedIndex = 1 elseif room.change_card_size == self.smallSize then - size.selectedIndex = 1 + size.selectedIndex = 2 end else room.change_card_size = 0 @@ -94,14 +115,14 @@ function M:init(url) if room.change_card_display ~= nil then local _str = string.sub(room.change_card_display, 1, 1) local n = tonumber(_str) - if n == 6 then + if n == 1 then c1.selectedIndex = 1 - elseif n == 1 then + elseif n == 2 then c1.selectedIndex = 0 elseif n == 8 then c1.selectedIndex = 3 else - c1.selectedIndex = 0 + c1.selectedIndex = 2 end end if self._open_social then @@ -245,16 +266,16 @@ function M:UpdateIndex() local _str = string.sub(room.change_card_display, 1, 1) local n = tonumber(_str) if n == 7 then - n = 6 + n = 2 end - if n == 6 then + if n == 1 then c1.selectedIndex = 1 - elseif n == 1 then + elseif n == 2 then c1.selectedIndex = 0 elseif n == 8 then c1.selectedIndex = 3 else - c1.selectedIndex = 0 + c1.selectedIndex = 2 end end end @@ -267,7 +288,7 @@ function M:UpdateCardSizeIndex() elseif room.change_card_size == self.mediumSize then size.selectedIndex = 1 elseif room.change_card_size == self.smallSize then - size.selectedIndex = 1 + size.selectedIndex = 2 end else size.selectedIndex = 0 diff --git a/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua index 834e58f5..23d5c12b 100644 --- a/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua @@ -475,7 +475,10 @@ function M:UpdateOutLine() elseif self:getCardSize() == 1 then self._data_outLinePos = 147 - (197 * 3) end - self._view_outLine.y = self._data_outLinePos - 80 + if self._data_outLinePos and self._view_outLine then + self._view_outLine.y = self._data_outLinePos - 80 + end + end function M:UpdateIsOnClick(isOut) diff --git a/wb_new_ui/.objs/fonts.json b/wb_new_ui/.objs/fonts.json index be18de50..c6ac34df 100644 --- a/wb_new_ui/.objs/fonts.json +++ b/wb_new_ui/.objs/fonts.json @@ -23,7 +23,13 @@ ui://27vd145bvbut7ir5 ui://27vd145byffn7iqf ui://27vd145bh46p7iwa ui://27vd145bh46p7iwm -ui://3qr8nmi47q1m2h +ui://8nwpfk27remn1q +ui://8nwpfk27remn2h +ui://8nwpfk27remn4j +ui://8nwpfk27remn44 +ui://8nwpfk27remn8o +ui://8nwpfk27remn84 +ui://8nwpfk27remn2 ui://hrxsdiixla4ep ui://hrxsdiixla4e3n ui://hrxsdiixla4e38 @@ -31,8 +37,9 @@ ui://hrxsdiixla4e4h ui://hrxsdiixla4e1c ui://fnuxqeflkllg1u ui://fnuxqeflkllg1v -ui://egnzysm7ffp38o -ui://egnzysm7ffp35q +ui://8onu6pxjremn2g +ui://8onu6pxjremn95 +ui://8onu6pxjremn2l ui://1utjt0r2ufu98l ui://1utjt0r2ufu98k ui://ppu1wv7699we4s @@ -50,16 +57,15 @@ ui://8wph7p8nyffng ui://8wph7p8nyffn1e ui://8wph7p8nyffn7w ui://8wph7p8nyffn89 -ui://9n9stu2enaueci9 -ui://9n9stu2enauecht +ui://8lbrl8ivremn2 ui://h30s8vmela4e6 -ui://eyxz924gffp34g +ui://889ll7cbremn2x +ui://889ll7cbremn13 ui://4wmd3o8gvlhjde ui://mtk9dj10m1i32x ui://mtk9dj10m1i313 ui://z3z0ysurvlhj7t ui://7ij0e6i2sv5g3 -ui://96mvx2mlvlhjcsv ui://boq0ohepvlhjd0 ui://v0j9abjygq7m7 ui://v0j9abjygq7mw diff --git a/wb_new_ui/.objs/metas/8onu6pxj/remn35.info b/wb_new_ui/.objs/metas/8onu6pxj/remn35.info new file mode 100644 index 00000000..0fe7265f --- /dev/null +++ b/wb_new_ui/.objs/metas/8onu6pxj/remn35.info @@ -0,0 +1,37 @@ +{ + "objectStatus": { + "n31_n1ry": { + "hidden": true + }, + "n73_p9qe": { + "hidden": true + }, + "n33_n1ry": { + "hidden": true + }, + "n16_pt1r": { + "hidden": true + }, + "n15_pt1r": { + "hidden": true + }, + "n32_n1ry": { + "hidden": true + }, + "n14_pt1r": { + "hidden": true + }, + "n51_fmkv": { + "collapsed": true + }, + "n55_rx2e": { + "collapsed": true + }, + "n46_n1ry": { + "hidden": true + }, + "n17_pt1r": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8onu6pxj/remn3m.info b/wb_new_ui/.objs/metas/8onu6pxj/remn3m.info new file mode 100644 index 00000000..851e55fe --- /dev/null +++ b/wb_new_ui/.objs/metas/8onu6pxj/remn3m.info @@ -0,0 +1,28 @@ +{ + "objectStatus": { + "n29_tjnv": { + "hidden": true + }, + "n28_tjnv": { + "hidden": true + }, + "n6_tjnv": { + "hidden": true + }, + "n5_tjnv": { + "hidden": true + }, + "n15_tjnv": { + "hidden": true + }, + "n34_aen8": { + "hidden": true + }, + "n27_tjnv": { + "hidden": true + }, + "n45_mj9f": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/8onu6pxj/remn3z.info b/wb_new_ui/.objs/metas/8onu6pxj/remn3z.info new file mode 100644 index 00000000..9a0e6cd4 --- /dev/null +++ b/wb_new_ui/.objs/metas/8onu6pxj/remn3z.info @@ -0,0 +1,13 @@ +{ + "objectStatus": { + "n8_tjnv": { + "hidden": true + }, + "n22_aen8": { + "hidden": true + }, + "n7_tjnv": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info index 10a7c119..3b81d650 100644 --- a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info +++ b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info @@ -30,18 +30,9 @@ "n15_pt1r": { "hidden": true }, - "n58_fnpw": { - "collapsed": true - }, - "n44_n1ry": { - "collapsed": true - }, "n32_n1ry": { "hidden": true }, - "n19_pt1r": { - "collapsed": true - }, "n68_w06x": { "hidden": true }, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 5f707803..8ae26e55 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,81 +2,18 @@ "libview.firstColumnWidth": 384, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://v0j9abjygq7mgo", - "ui://hrxsdiixla4e2c", - "ui://s63l0suw6cpqv", - "ui://fnuxqeflnrnod", - "ui://egnzysm7ffp36a", - "ui://8wph7p8nyffnhr", + "ui://8onu6pxjremn35", + "ui://8onu6pxjremn3m", + "ui://8onu6pxjremn3v", + "ui://8onu6pxjremn3r", + "ui://8onu6pxjremn42", "ui://mzvoz9udm1i335", - "ui://lkq9ne9speuqc", - "ui://m7iejg46l679hws", - "ui://m7iejg46kwi0hmc", - "ui://m7iejg46kwi0hme", - "ui://mzvoz9udm1i382", - "ui://mzvoz9udm1i32b", - "ui://mzvoz9udm1i33m", - "ui://m7iejg4610snh5j", - "ui://m7iejg46h46p7ish", - "ui://mzvoz9udm1i32i", - "ui://h30s8vmela4eb", - "ui://mzvoz9udm1i34z", - "ui://mzvoz9udm1i35m", - "ui://mzvoz9udm1i35j", - "ui://mzvoz9udm1i358", - "ui://mzvoz9udm1i35f", - "ui://mzvoz9udm1i35b", - "ui://mtk9dj10m1i32v", - "ui://z3z0ysurygxgd", - "ui://8wph7p8nyffnmy", - "ui://8wph7p8nyffn8s", - "ui://v0j9abjygq7med", - "ui://27vd145b7jqkcdl", - "ui://v0j9abjygq7m8f", - "ui://lkq9ne9ssyh3rk", - "ui://mzvoz9udm1i33c", - "ui://1utjt0r2ufu92i", - "ui://ppu1wv76j4mf9j", - "ui://ypulwxjhl9mn14", - "ui://1utjt0r2ufu92t", - "ui://mzvoz9udm1i32j", - "ui://442j0uepygxga", - "ui://4skil1l6piv91ny", - "ui://niy3ldiwl9mn14", - "ui://9n9stu2eprgzee", - "ui://v0j9abjygq7mgp", - "ui://lkq9ne9speuqc6", - "ui://lkq9ne9speuq8b", - "ui://lkq9ne9speuq5a", - "ui://lkq9ne9speuq6e", - "ui://hrxsdiixla4e69", - "ui://lkq9ne9speuq2q", - "ui://lkq9ne9speuq3", - "ui://lkq9ne9speuq2", - "ui://v6yvqp7wcyprwq", - "ui://v0j9abjygq7mej", - "ui://lkq9ne9speuq9d", - "ui://lkq9ne9speuq6p", - "ui://lkq9ne9speuq8r", - "ui://lkq9ne9speuq8w", - "ui://lkq9ne9ssyh3rj", - "ui://lkq9ne9so0c1ru", - "ui://lkq9ne9speuqao", - "ui://lkq9ne9sszpgtz", - "ui://lkq9ne9speuqap", - "ui://lkq9ne9speuqaa", - "ui://8wph7p8nyffnmr", - "ui://2d9xdj6zl0lzb", - "ui://lkq9ne9speuqbv", - "ui://yzaioi79wyal8n", - "ui://v6yvqp7wwyal8n", - "ui://9n9stu2eprgzgj", - "ui://lx6k641gajzhoe" + "ui://mzvoz9udm1i33m" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://lkq9ne9speuq3", + "doc.activeDoc": "ui://8onu6pxjremn35", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -87,14 +24,12 @@ "/font/font_gameTableName/", "27vd145b", "/images/", - "egnzysm7", + "8onu6pxj", "/", - "egnzysm7", + "8onu6pxj", "/component/", - "egnzysm7", - "/component/clearing/", - "egnzysm7", - "/component/clearing/image/", + "8onu6pxj", + "/component/epcwhzHECHIMui/", "1utjt0r2", "/", "1utjt0r2", @@ -125,6 +60,16 @@ "/images/", "2d9xdj6z", "/images/LobbyMui/", + "v0j9abjy", + "/", + "v0j9abjy", + "/images/", + "v0j9abjy", + "/images/cards/", + "v0j9abjy", + "/images/cards/1/", + "v0j9abjy", + "/images/cards/2/", "lkq9ne9s", "/", "lkq9ne9s", @@ -132,16 +77,6 @@ "lkq9ne9s", "/component/", "lkq9ne9s", - "/component/HuTip/", - "lkq9ne9s", - "/component/Main/", - "lkq9ne9s", - "/component/Main/component/", - "lkq9ne9s", - "/component/cards/", - "lkq9ne9s", - "/component/chi_peng_effect/", - "lkq9ne9s", "/image/", "lkq9ne9s", "/images/", diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/30-常.png b/wb_new_ui/assets/Common/font/font_gameTableName/30-常.png new file mode 100644 index 00000000..876c5d1c Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/30-常.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/31-德.png b/wb_new_ui/assets/Common/font/font_gameTableName/31-德.png new file mode 100644 index 00000000..e7098f71 Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/31-德.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/32-长.png b/wb_new_ui/assets/Common/font/font_gameTableName/32-长.png new file mode 100644 index 00000000..f810ecd0 Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/32-长.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/33-沙.png b/wb_new_ui/assets/Common/font/font_gameTableName/33-沙.png new file mode 100644 index 00000000..0db29b1a Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/33-沙.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt b/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt index f672c095..85e676eb 100644 --- a/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt +++ b/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt @@ -15,7 +15,7 @@ char id=50 img=kra57j83 xoffset=0 yoffset=0 xadvance=0 char id=32602 img=kra57j7l xoffset=0 yoffset=0 xadvance=0 char id=25226 img=kra57j7k xoffset=0 yoffset=0 xadvance=0 char id=32467 img=kra57j7j xoffset=0 yoffset=0 xadvance=0 -char id=46 img=kra57j7i xoffset=0 yoffset=0 xadvance=0 +char id=32 img=kra57j7i xoffset=0 yoffset=0 xadvance=0 char id=27827 img=kra57j7h xoffset=0 yoffset=0 xadvance=0 char id=27744 img=kra57j7g xoffset=0 yoffset=0 xadvance=0 char id=32993 img=kra57j7f xoffset=0 yoffset=0 xadvance=0 @@ -29,3 +29,7 @@ char id=54 img=kra57j7z xoffset=0 yoffset=0 xadvance=0 char id=55 img=kra57j7y xoffset=0 yoffset=0 xadvance=0 char id=56 img=kra57j7x xoffset=0 yoffset=0 xadvance=0 char id=57 img=kra57j7w xoffset=0 yoffset=0 xadvance=0 +char id=24120 img=svh87j8d xoffset=0 yoffset=0 xadvance=0 +char id=24503 img=svh87j8c xoffset=0 yoffset=0 xadvance=0 +char id=38271 img=svh87j8e xoffset=0 yoffset=0 xadvance=0 +char id=27801 img=svh87j8f xoffset=0 yoffset=0 xadvance=0 diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 20f2d2f6..fe1eb3d3 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1649,6 +1649,10 @@ + + + + diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/big_zipai_result_item.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/big_zipai_result_item.xml index a11af19b..7ebff2d5 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/big_zipai_result_item.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/big_zipai_result_item.xml @@ -1,28 +1,31 @@ - - + + - - + + - - - - - + + + + + - - + + - - + + + + + - - + + @@ -30,23 +33,23 @@ - + - + - + - + - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/btn_result_close.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/btn_result_close.xml index 4936a546..8c640446 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/btn_result_close.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/btn_result_close.xml @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml index 6b988ef0..6f4115f7 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/card_item.xml @@ -1,23 +1,23 @@ - + - - - + + + - + - - - - - + + + + + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml index 87f69df3..ca75505d 100644 --- a/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/clearing.xml @@ -1,18 +1,20 @@ - - - - - - - + + + + + + + - + - + + + @@ -20,7 +22,7 @@ - +