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 0aeb7e6d..641f8413 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua @@ -90,7 +90,7 @@ 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.4 + self._room.change_card_size = 1.3 elseif typeface == 1 then self._room.change_card_size = 1.2 elseif typeface == 2 then @@ -303,7 +303,7 @@ end function M:UpdateCardSize(index) print("lingmeng UpdateCardSize") if index == 0 then - self._room.change_card_size = 1.4 + self._room.change_card_size = 1.3 elseif index == 1 then self._room.change_card_size = 1.2 elseif index == 2 then 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 df3917be..0295d853 100644 --- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua @@ -215,7 +215,6 @@ function M:InitHandCard(isPlayAni, index) btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code) btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - btn_card:GetChild('n9'):SetScale(self:getCardSize(), self:getCardSize()) self.card_width = btn_card.width * self:getCardSize() self.card_hight = btn_card.height * self:getCardSize() local x, y = 500, (j * 85) - 500 @@ -266,7 +265,6 @@ function M:InitHandCard(isPlayAni, index) btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code) btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - btn_card:GetChild('n9'):SetScale(self:getCardSize(), self:getCardSize()) self.card_width = btn_card.width * self:getCardSize() self.card_hight = btn_card.height * self:getCardSize() self._area_handcard_list:AddChild(btn_card) @@ -770,20 +768,23 @@ end --计算手牌位置 function M:GetHandCardPos(cards_view, cards) local x, y = 0, 0 - local card_width = self.card_width - 5 -- 牌的宽度 + print("lingmeng change_card_display", card_width) + local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) -- 牌的宽度 + print("lingmeng change_card_display", self.card_width, self._room.change_card_display == "8_", card_width) + 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) - local card_height = self.card_hight - y = 90 - card_height * 0.66 * cards_view.index_Y - -- if self:getCardSize() == 1.4 then - -- y = 90 - (85 * cards_view.index_Y) - -- elseif self:getCardSize() == 1.2 then - -- y = 90 - (110 * cards_view.index_Y) - -- elseif self:getCardSize() == 0.8 then - -- y = 100 - (65 * cards_view.index_Y) - -- end + -- local card_height = self.card_hight + -- y = 90 - card_height * 0.66 * cards_view.index_Y + if self:getCardSize() == 1.3 then + y = 90 - (119 * cards_view.index_Y) + elseif self:getCardSize() == 1.2 then + y = 90 - (110 * cards_view.index_Y) + elseif self:getCardSize() == 0.8 then + y = 100 - (65 * cards_view.index_Y) + end return Vector2.New(x, y) end diff --git a/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml b/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml index 6ee89d96..2a237b5b 100644 --- a/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml +++ b/wb_new_ui/assets/Main_RunBeard/component/setting/New_SettingWindow.xml @@ -3,7 +3,7 @@ - + @@ -12,25 +12,25 @@ - +