diff --git a/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua b/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua index 9d707f7a..361dd3f3 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua @@ -5,8 +5,8 @@ local RunBeard_ResultView = {} local M = RunBeard_ResultView function RunBeard_ResultView.new(blur_view, index) - setmetatable(M, {__index = ResultView}) - local self = setmetatable({}, {__index = M}) + setmetatable(M, { __index = ResultView }) + local self = setmetatable({}, { __index = M }) self.class = 'RunBeard_ResultView' self._currenIndex = 0 if index ~= 1 then @@ -15,7 +15,7 @@ function RunBeard_ResultView.new(blur_view, index) self._close_zone = false self:init('ui://Extend_Poker_HeChi/clearing') - self.xiPaiCtr=self._view:GetController("xipai") + self.xiPaiCtr = self._view:GetController("xipai") return self end @@ -40,27 +40,27 @@ function M:InitData(over, room, result, total_result, callback) self._view:GetChild('tex_roomnum').text = room.room_id self._view:GetChild('tex_data').text = os.date('%Y-%m-%d %H:%M', os.time()) - local xpconfig=DataManager.CurrenRoom.room_config.config.xi_pai - if xpconfig then - self.xiPaiCtr.selectedIndex=1 - else - self.xiPaiCtr.selectedIndex=0 - end - - local xipai=self._view:GetChild("btn_xipai") - xipai.touchable=true - xipai.onClick:Add(function() - local xiPaiCallBack=function () - xipai.touchable=false - self.xiPaiCtr.selectedIndex=0 - ViewUtil.ErrorTip(1000000,"申请洗牌成功") - end - local _gamectr = ControllerManager.GetController(GameController) - _gamectr:SendXiPaiAction(xiPaiCallBack) - end) - if result and result.xipai_score then - xipai.text="洗牌 积分x"..result.xipai_score - end + local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai + if xpconfig then + self.xiPaiCtr.selectedIndex = 1 + else + self.xiPaiCtr.selectedIndex = 0 + end + + local xipai = self._view:GetChild("btn_xipai") + xipai.touchable = true + xipai.onClick:Add(function() + local xiPaiCallBack = function() + xipai.touchable = false + self.xiPaiCtr.selectedIndex = 0 + ViewUtil.ErrorTip(1000000, "申请洗牌成功") + end + local _gamectr = ControllerManager.GetController(GameController) + _gamectr:SendXiPaiAction(xiPaiCallBack) + end) + if result and result.xipai_score then + xipai.text = "洗牌 积分x" .. result.xipai_score + end if result ~= nil and result.liuju == true then _icon.icon = 'ui://Main_RunBeard/liuju' @@ -83,7 +83,7 @@ function M:InitData(over, room, result, total_result, callback) self:AddClearItem(room, result, nil, over) return else - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 _btnCtr.selectedIndex = 1 _sdkCtr.selectedIndex = 1 btn_result.onClick:Add( @@ -153,7 +153,7 @@ function M:InitData(over, room, result, total_result, callback) _icon.icon = 'ui://Main_RunBeard/jiesuan' over = 2 _overCtr.selectedIndex = 3 - self.xiPaiCtr.selectedIndex=0 + self.xiPaiCtr.selectedIndex = 0 btn_close.onClick:Add( function() ViewManager.ChangeView(ViewManager.View_Lobby) @@ -189,6 +189,7 @@ end function M:GetPos(room, seat) return ViewUtil.GetPos(room.self_player.seat, seat, room.room_config.people_num) end + function M:FillLiuJuItemData(room, data) local qipai_list = self._view:GetChild('qipai_listl') local _dipaiC = self._view:GetController('qipai') @@ -268,12 +269,14 @@ function M:FillItemData(room, data, item) local info_list = data.info_list local Yes_win = false local win_data = {} + for i = 1, #info_list do if info_list[i].is_win == true then Yes_win = true win_data = info_list[i] end end + if win_data.seat == room.self_player.seat then self._view:GetChild('show_win').visible = true self._view:GetChild('show_low').visible = false @@ -282,6 +285,14 @@ function M:FillItemData(room, data, item) self._view:GetChild('show_low').visible = true end + if data.fanxing_card and #data.fanxing_card > 0 then + self._view:GetChild('text_fangxing').text = '翻醒:' .. data.fanxing_score + for i = 1, #data.fanxing_card do + local fangc = self._view:GetChild('list_fangxing'):AddItemFromPool() + print("lingmeng 817",self:getCardItem('ui://Main_RunBeard/201_', data.fanxing_card[i])) + fangc:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', data.fanxing_card[i]) + end + end if Yes_win == true then local isWin_Card = true local p = room:GetPlayerBySeat(win_data.seat) @@ -368,8 +379,8 @@ function M:FillItemData(room, data, item) cards:GetChild('card_type').text = '顺' if win_data.cardList[i].card1 == win_data.cardList[i].card2 and - win_data.cardList[i].card1 == win_data.cardList[i].card3 - then + win_data.cardList[i].card1 == win_data.cardList[i].card3 + then cards:GetChild('card_type').text = '碰' end cards:GetChild('card_huxi').text = win_data.cardList[i].hu_xi @@ -740,6 +751,7 @@ function M:LoadHead(p, room) end end end + function M:getCardItem(card_1, card_2) local _room = DataManager.CurrenRoom if _room ~= nil and _room.change_card_display ~= nil then diff --git a/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info b/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info index 1629cbbb..f816c2a2 100644 --- a/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info +++ b/wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info @@ -1,6 +1,11 @@ { "objectStatus": { - "n146_udgc": { + "n166_ozsy": { + "hidden": true, + "collapsed": true + }, + "n149_udgc": { + "hidden": true, "collapsed": true }, "n153_udgc": { @@ -8,20 +13,6 @@ }, "n152_udgc": { "hidden": true - }, - "n149_udgc": { - "hidden": true, - "collapsed": true - }, - "n143_udgc": { - "collapsed": true - }, - "n140_udgc": { - "collapsed": true - }, - "n166_ozsy": { - "hidden": true, - "collapsed": 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 new file mode 100644 index 00000000..e4815c40 --- /dev/null +++ b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info @@ -0,0 +1,16 @@ +{ + "objectStatus": { + "n67_w06x": { + "hidden": true + }, + "n48_j5c2": { + "hidden": true + }, + "n40_n1ry": { + "hidden": true + }, + "n47_lsou": { + "hidden": true + } + } +} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 58730a7d..cd8f6eb8 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,53 +2,26 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://v0j9abjygq7mgo", - "ui://lx6k641gajzhoe", - "ui://27vd145bvg2c4", - "ui://27vd145b93q2c0", - "ui://8wph7p8nyffnmy", - "ui://hrxsdiixla4e2c", - "ui://v0j9abjygq7med", - "ui://4skil1l6piv91ny", - "ui://x3mp2cn6xvhr3r", - "ui://fnuxqeflnrnod", - "ui://egnzysm7ffp36a", - "ui://v0j9abjygq7mct", - "ui://1utjt0r2ufu92i", - "ui://ppu1wv76j4mf9j", - "ui://ypulwxjhl9mn14", - "ui://442j0uepygxga", - "ui://8wph7p8nyffnhr", - "ui://9n9stu2eprgzee", - "ui://niy3ldiwl9mn14", - "ui://m7iejg4610snh5j", - "ui://m7iejg46h46p7ish", - "ui://m7iejg46hwww2f", - "ui://8wph7p8nyffnnp", - "ui://8wph7p8nyffnc", - "ui://8wph7p8nyffnj", - "ui://8wph7p8nyffn2", - "ui://27vd145bst2l7ijp", - "ui://v0j9abjygq7m8f" + "ui://m7iejg46kwi0hkb", + "ui://2d9xdj6z75efcz", + "ui://h30s8vmela4eb", + "ui://7ij0e6i2sv5gk", + "ui://7ij0e6i2sv5gh" ], "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://8wph7p8nyffnnp", + "doc.activeDoc": "ui://7ij0e6i2sv5gk", "libview.twoColumn": false, "libview.expandedNodes": [ - "8wph7p8n", + "7ij0e6i2", "/", - "8wph7p8n", + "lkq9ne9s", + "/", + "lkq9ne9s", "/images/", - "8wph7p8n", - "/images/EPRFNMui/", - "8wph7p8n", - "/images/head/", - "v0j9abjy", - "/", - "v0j9abjy", - "/Main_style_2/" + "lkq9ne9s", + "/images/cards/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/cards/FangXingCard.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/cards/FangXingCard.xml new file mode 100644 index 00000000..4a6d5a61 --- /dev/null +++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/cards/FangXingCard.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml index 5b4d7b7a..623b8e2f 100644 --- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml @@ -24,10 +24,10 @@