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 @@
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
@@ -42,17 +42,11 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -69,28 +63,28 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_201(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_201(1).png
deleted file mode 100644
index 8985d55f..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_201(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_202(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_202(1).png
deleted file mode 100644
index 4227d82a..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_202(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_203(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_203(1).png
deleted file mode 100644
index 42a17cff..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_203(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_204(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_204(1).png
deleted file mode 100644
index cab3be82..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_204(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_205(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_205(1).png
deleted file mode 100644
index cd5bbf80..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_205(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_206(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_206(1).png
deleted file mode 100644
index c59f76ea..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_206(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_207(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_207(1).png
deleted file mode 100644
index 0eea1f19..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_207(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_208(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_208(1).png
deleted file mode 100644
index 67288a5f..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_208(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_209(1).png b/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_209(1).png
deleted file mode 100644
index 279071a8..00000000
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/203_8_209(1).png and /dev/null differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_101.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_101.png
new file mode 100644
index 00000000..a9f68809
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_101.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_102.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_102.png
new file mode 100644
index 00000000..92fd25a0
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_102.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_103.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_103.png
new file mode 100644
index 00000000..8bc465f2
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_103.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_104.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_104.png
new file mode 100644
index 00000000..e17efcb0
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_104.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_105.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_105.png
new file mode 100644
index 00000000..c115cce3
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_105.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_106.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_106.png
new file mode 100644
index 00000000..c05d126a
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_106.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_107.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_107.png
new file mode 100644
index 00000000..1219b161
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_107.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_108.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_108.png
new file mode 100644
index 00000000..c84a6b04
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_108.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_109.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_109.png
new file mode 100644
index 00000000..78c70755
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_109.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_201.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_201.png
index a9f68809..42a17cff 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_201.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_201.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_202.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_202.png
index 92fd25a0..cab3be82 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_202.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_202.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_203.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_203.png
index 8bc465f2..cd5bbf80 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_203.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_203.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_204.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_204.png
index e17efcb0..c59f76ea 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_204.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_204.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_205.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_205.png
index c115cce3..0eea1f19 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_205.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_205.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_206.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_206.png
index c05d126a..67288a5f 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_206.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_206.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_207.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_207.png
index 1219b161..279071a8 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_207.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_207.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_208.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_208.png
index c84a6b04..8985d55f 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_208.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_208.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_209.png b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_209.png
index 78c70755..4227d82a 100644
Binary files a/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_209.png and b/wb_new_ui/assets/Main_RunBeard/images/cards8/204_8_209.png differ
diff --git a/wb_new_ui/assets/Main_RunBeard/package.xml b/wb_new_ui/assets/Main_RunBeard/package.xml
index e1187554..63608c1f 100644
--- a/wb_new_ui/assets/Main_RunBeard/package.xml
+++ b/wb_new_ui/assets/Main_RunBeard/package.xml
@@ -898,26 +898,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file