diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua index c4d0f0d1..12e9fd9e 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua @@ -81,7 +81,6 @@ 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 @@ -779,8 +778,8 @@ function M:__FangziTip(tip, _uid, fptype) else self._view:AddChild(_chipeng_tip) _chipeng_tip:Center() - _chipeng_tip.x = _chipeng_tip.x + 600 - _chipeng_tip.y = _chipeng_tip.y - 200 + _chipeng_tip.x = _chipeng_tip.x + 450 + _chipeng_tip.y = _chipeng_tip.y - 100 end end diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua index 7e60d4a5..f847d2d5 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua @@ -6,12 +6,12 @@ local HuTipView = { local M = HuTipView function M.new(main_view) - local self = {} - self.class = "HuTipView" - setmetatable(self,{__index = HuTipView}) - self._main_view = main_view - self:init() - return self + local self = {} + self.class = "HuTipView" + setmetatable(self, { __index = HuTipView }) + self._main_view = main_view + self:init() + return self end local function SetObjEnabled(obj, enabled) @@ -22,8 +22,9 @@ function M:OnTouchBegin(context) self._view_start_pos = Vector2(self._view.x, self._view.y) self._touch_start_pos = self._main_view._view:GlobalToLocal(Vector2(context.inputEvent.x, context.inputEvent.y)) end + function M:OnTouchMove(context) - local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x,context.inputEvent.y)) + local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) local dist = Vector2(xy.x - self._touch_start_pos.x, xy.y - self._touch_start_pos.y) local posx = self._view_start_pos.x + dist.x local posy = self._view_start_pos.y + dist.y @@ -41,16 +42,20 @@ function M:init() local m_height = self._main_view._view.height self._view.x = 0.115 * m_width --- 0.5 * width --self._view.x = 0 + -- self._view.y = 0.65 * m_height self._view.y = 0.65 * m_height SetObjEnabled(self._view, false) self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin)) self._view.onTouchMove:Add(handler(self, self.OnTouchMove)) end -function M:FillData(cards) +function M:FillData(cards) local lst_card = self._view:GetChild("tingpai") lst_card:RemoveChildrenToPool() local num = #cards + local n0 = self._view:GetChild("n0") + n0.height = 130 + n0.width = 76 * #cards + 150 if num > 0 then if num > 4 and num < 28 then self._view.width = 191 + ((num > 4 and 6 or num) - 3) * 38 @@ -66,4 +71,4 @@ function M:FillData(cards) end end -return M \ No newline at end of file +return M 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 78fc87ec..525b8d58 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,15 @@ 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 + if DataManager.CurrenRoom.self_player == nil then + return + 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 --手牌 @@ -529,7 +532,7 @@ function M:UpdateOutLine() elseif self:getCardSize() == 2 then self._data_outLinePos = 110 - (155 * 3) end - self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 220 + self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 60 end function M:UpdateIsOnClick(isOut) 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 d04551a1..72d03a3e 100644 --- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info +++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info @@ -6,6 +6,9 @@ "n84_rbpg": { "hidden": true }, + "n55_rx2e": { + "collapsed": true + }, "n4_fux2": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info index 6cbc974a..1aae7ef5 100644 --- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info +++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info @@ -3,13 +3,10 @@ "n87_q50p": { "hidden": true }, - "n155_diqo": { - "collapsed": true - }, "n166_ukp7": { "hidden": true }, - "n179_yffn": { + "n155_diqo": { "collapsed": true }, "n131_ckvb": { diff --git a/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info index 73691f8b..50d750f6 100644 --- a/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info +++ b/wb_new_ui/.objs/metas/v0j9abjy/gq7med.info @@ -3,9 +3,6 @@ "n40_ona1": { "hidden": true }, - "n79_uwvl": { - "collapsed": true - }, "n22_xtwh": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index b731cb97..ec15b8d3 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,21 +2,64 @@ "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg4610snh5j", - "ui://m7iejg46h46p7ish", - "ui://m7iejg4610i2p7isr", - "ui://m7iejg4610i2p7iss", - "ui://v0j9abjygq7m8f", - "ui://8wph7p8nyffnmy" + "ui://lkq9ne9speuq8b", + "ui://1utjt0r2ufu92i", + "ui://1utjt0r2ufu930", + "ui://lkq9ne9speuq6p", + "ui://lkq9ne9speuq5a", + "ui://lkq9ne9speuq2q", + "ui://lkq9ne9speuq9m", + "ui://lkq9ne9speuq9k", + "ui://lkq9ne9speuqt" ], "test.device": "Huawei Mate20", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://8wph7p8nyffnmy", + "doc.activeDoc": "ui://lkq9ne9speuq5a", "libview.twoColumn": false, "libview.expandedNodes": [ - "8wph7p8n", - "/" + "27vd145b", + "/", + "27vd145b", + "/images/", + "1utjt0r2", + "/", + "1utjt0r2", + "/component/", + "1utjt0r2", + "/component/clearing/", + "1utjt0r2", + "/component/clearing/image/", + "lkq9ne9s", + "/", + "lkq9ne9s", + "/component/", + "lkq9ne9s", + "/component/HuTip/", + "lkq9ne9s", + "/component/Main/", + "lkq9ne9s", + "/component/Main/component/", + "lkq9ne9s", + "/component/Main/images/", + "lkq9ne9s", + "/component/cards/", + "lkq9ne9s", + "/component/images/", + "lkq9ne9s", + "/component/niao/", + "yzaioi79", + "/", + "yzaioi79", + "/component/", + "yzaioi79", + "/component/HuTip/", + "m7iejg46", + "/", + "m7iejg46", + "/component/", + "m7iejg46", + "/images/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 9d1a42b9..7c40a4e4 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1559,6 +1559,7 @@ + diff --git a/wb_new_ui/assets/Common/屏幕截图 2026-03-11 203420.png b/wb_new_ui/assets/Common/屏幕截图 2026-03-11 203420.png new file mode 100644 index 00000000..0da7b8f6 Binary files /dev/null and b/wb_new_ui/assets/Common/屏幕截图 2026-03-11 203420.png differ diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shengli_zipai.png b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shengli_zipai.png index d4aa2b30..81ef8da2 100644 Binary files a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shengli_zipai.png and b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shengli_zipai.png differ diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shibai_zipai.png b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shibai_zipai.png index e2d9a94e..81ef8da2 100644 Binary files a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shibai_zipai.png and b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shibai_zipai.png differ diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/result_zipai_main.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/result_zipai_main.xml index 02c54b61..2c8235ce 100644 --- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/result_zipai_main.xml +++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/result_zipai_main.xml @@ -1,7 +1,7 @@ - - + + @@ -15,7 +15,7 @@ - + @@ -27,29 +27,29 @@ - + - + - + - - - - - + + + + + - + - - - - + + + + @@ -58,27 +58,27 @@ - + - - + + -