diff --git a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua index 78bc8899..044a708b 100644 --- a/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua +++ b/fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPPlayerSelfCardInfoView.lua @@ -57,8 +57,8 @@ function M:init() self._isDrg = false self.card_list = {} -- 牌的btn code type pos 等等 self.cards_count = 0 -- 牌的总列数 - self.card_width = 99 - self.card_hight = 121 + self.card_width = 172 + self.card_hight = 223 self.outcard_button = nil self._room = DataManager.CurrenRoom self._area_handcard_list = view:GetChild('area_handcard_list') @@ -267,8 +267,8 @@ function M:InitHandCard(isPlayAni) 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() + self.card_width = 172 * self:getCardSize() + self.card_hight = 223 * self:getCardSize() local x, y = 500, (j * 75) + 500 btn_card:SetXY(x, y) @@ -337,8 +337,8 @@ function M:InitHandCard(isPlayAni) 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() + self.card_width = 172 * self:getCardSize() + self.card_hight = 223 * self:getCardSize() btn_card:GetController('cardnum').selectedIndex=currentCardNum-1 local cardNums=currentCardNum-1 if cardNums>0 then @@ -469,8 +469,8 @@ function M:UpdateHandCards(list) 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 = 87 * self:getCardSize() - self.card_hight = 110 * self:getCardSize() + self.card_width = 172 * self:getCardSize() + self.card_hight = 223 * self:getCardSize() local card_view = NewCardView(btn_card, card_code, list[i].index_X, list[i].index_Y) --存牌堆 self.card_list[#self.card_list + 1] = card_view @@ -631,8 +631,8 @@ function M:UpdateCardSize() 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() - self.card_hight = 121 * self:getCardSize() + self.card_width = 172 * self:getCardSize() + self.card_hight = 223 * self:getCardSize() self._area_handcard_list:AddChild(card_view.btn_card) card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3) end diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 255a95e1..92cedced 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -49,9 +49,65 @@ "ui://4skil1l6ms5spy", "ui://4skil1l6r6qo1kc", "ui://5cdldr01qaqf9c", + "ui://5cdldr01qaqf61", + "ui://5cdldr01qaqfb", + "ui://5cdldr01qaqf62", + "ui://5cdldr01qaqf7o", + "ui://5cdldr01qaqfo", + "ui://yzaioi79lvh412c", + "ui://yzaioi79cyprwq", + "ui://5cdldr01qaqfbb", + "ui://5cdldr01qaqfc", + "ui://4skil1l6bw4gev", + "ui://3z9lj55vjokmis", + "ui://3z9lj55vjokmce", + "ui://3z9lj55vjokm7g", + "ui://3z9lj55vjokm3", + "ui://3op8sm5eu86s2", + "ui://fnuxqeflnrnoa", + "ui://kplym8mus9wx2", + "ui://425x67nrs9wx2", + "ui://s63l0suw6cpqm", + "ui://visk5g30gq7m9", + "ui://visk5g30gq7m1v", + "ui://xul2z8cts9wx2", + "ui://b50sd5s6s9wx2", + "ui://y8prev1ms9wx2", + "ui://c7j2rnvqtpf08b", + "ui://c7j2rnvqtpf066", + "ui://c7j2rnvqtpf0o", + "ui://c7j2rnvqtpf0k", + "ui://c7j2rnvqtpf00", + "ui://bx1t0boos9wx2", + "ui://4skil1l6piv91oc", + "ui://4skil1l6by4o1i4", + "ui://5cdldr01qaqf60", + "ui://5cdldr01qaqf7s", + "ui://5cdldr01qaqf34", "ui://5cdldr01qaqfa4", "ui://5cdldr01qaqfaw", "ui://yzaioi79f55qwa", + "ui://yzaioi79oynr1ag", + "ui://yzaioi79f55qw5", + "ui://yzaioi79f55qvw", + "ui://yzaioi79lr5d31", + "ui://27vd145bycze3n", + "ui://5cdldr01qaqf3f", + "ui://yzaioi79f55qvx", + "ui://yzaioi79f55qvy", + "ui://27vd145bko559b", + "ui://c7j2rnvqtpf059", + "ui://c7j2rnvqtpf07n", + "ui://c7j2rnvqtpf05a", + "ui://3z9lj55vjokmj5", + "ui://3z9lj55vjokmj1", + "ui://4skil1l6bw4ghh", + "ui://5cdldr01qaqfbk", + "ui://5cdldr01qaqfbi", + "ui://yzaioi79wyal87", + "ui://yzaioi79wyal85", + "ui://yzaioi79f55qw7", + "ui://3n2top74kpmgp5", "ui://yzaioi79f55qva", "ui://yzaioi79f55qvp", "ui://yzaioi79f55qvt", @@ -76,13 +132,35 @@ "test.device": "Xiaomi 9", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://yzaioi79f55qwa", + "doc.activeDoc": "ui://27vd145bycze3n", "libview.twoColumn": false, "libview.expandedNodes": [ + "27vd145b", + "/", + "27vd145b", + "/buttons/", + "27vd145b", + "/conMui/", + "3n2top74", + "/", + "5cdldr01", + "/", + "5cdldr01", + "/component/", + "5cdldr01", + "/component/Main/", + "5cdldr01", + "/component/Main/images/", + "5cdldr01", + "/component/game/", "yzaioi79", "/", "yzaioi79", - "/component/" + "/component/", + "yzaioi79", + "/component/Main/", + "yzaioi79", + "/component/Main/component/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml index 4f9c2d35..75d28103 100644 --- a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml +++ b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml @@ -4,12 +4,12 @@ - + -