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 bde21037..220a2385 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua
@@ -53,24 +53,19 @@ function M:FillData(cards)
local lst_card = self._view:GetChild("tingpai")
lst_card:RemoveChildrenToPool()
local num = #cards
- local n0 = self._view:GetChild("n0")
- if #cards < 4 then
- n0.width = (#cards * 76) * 3 + 150
- else
- n0.width = (1 * 76) * 3 + 200
- end
- local numC = #cards / 4
- if numC ~= math.floor(numC) then
- numC = math.floor(numC) + 1
- end
-
- n0.height = numC * 130
- print("00000=======111==" .. numC)
-
if num > 0 then
- if num > 4 and num < 28 then
- self._view.width = 191 + ((num > 4 and 6 or num) - 3) * 38
- self._view.height = 69 + (math.ceil(num / 5) - 1) * 56
+ if num <= 4 and num >= 1 then
+ self._view.width = 191 + (num - 1) * 80
+ self._view.height = 120
+ elseif num > 4 and num <= 8 then
+ self._view.width = 480
+ self._view.height = 220
+ elseif num > 8 and num <= 12 then
+ self._view.width = 480
+ self._view.height = 330
+ elseif num >= 12 and num <= 16 then
+ self._view.width = 480
+ self._view.height = 440
end
for i = 1, num do
local item = lst_card:AddItemFromPool()
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index eb2e84b7..cc2050bf 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -4,21 +4,17 @@
"doc.openedDocs": [
"ui://lkq9ne9speuq8b",
"ui://lkq9ne9speuq5a",
+ "ui://lkq9ne9speuqc6",
+ "ui://lkq9ne9speuqao",
"ui://lkq9ne9speuq5b",
"ui://1utjt0r2ufu92i",
"ui://1utjt0r2ufu92s",
- "ui://1utjt0r2ufu930",
- "ui://lkq9ne9speuq2q",
- "ui://lkq9ne9speuq9m",
- "ui://lkq9ne9speuq9n",
- "ui://lkq9ne9speuq9g",
- "ui://lkq9ne9speuqcu",
- "ui://lkq9ne9speuqt"
+ "ui://1utjt0r2ufu930"
],
"test.device": "Huawei Mate20",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://lkq9ne9speuq9g",
+ "doc.activeDoc": "ui://lkq9ne9speuq5a",
"libview.twoColumn": false,
"libview.expandedNodes": [
"27vd145b",
diff --git a/wb_new_ui/assets/Common/images/Frame 1179.png b/wb_new_ui/assets/Common/images/Frame 1179.png
new file mode 100644
index 00000000..7e0aad16
Binary files /dev/null and b/wb_new_ui/assets/Common/images/Frame 1179.png differ
diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml
index 7c40a4e4..16f38e69 100644
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@@ -1560,6 +1560,7 @@
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml b/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
index cdeabca1..841a018c 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
@@ -1,11 +1,10 @@
-
+
-
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
index a727642e..f717b608 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@@ -1,6 +1,6 @@
-
+
@@ -43,8 +43,8 @@
-
-
+
+
@@ -118,21 +118,21 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
index 93d4200e..b8f99398 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
@@ -51,13 +51,13 @@
-
+
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
index 39127028..f953f0ec 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/main_2_safe_bg.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/main_2_safe_bg.xml
index c2e56da4..c35a6410 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/main_2_safe_bg.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/main_2_safe_bg.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/option/safe.png b/wb_new_ui/assets/Main_RunBeard/component/option/safe.png
new file mode 100644
index 00000000..4939c8ce
Binary files /dev/null and b/wb_new_ui/assets/Main_RunBeard/component/option/safe.png differ
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 4d737bce..ea1abb8d 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
@@ -1,5 +1,5 @@
-
+
@@ -8,8 +8,8 @@
-
-
+
+
@@ -34,32 +34,32 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
@@ -86,24 +86,24 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml b/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml
index 9a2f048e..7f4c3d23 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml
@@ -38,35 +38,35 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -103,10 +103,10 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Main_RunBeard/package.xml b/wb_new_ui/assets/Main_RunBeard/package.xml
index d5da7ee0..0cb4b12f 100644
--- a/wb_new_ui/assets/Main_RunBeard/package.xml
+++ b/wb_new_ui/assets/Main_RunBeard/package.xml
@@ -1006,6 +1006,7 @@
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png
index ba81b07b..bab91023 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png
index 47a52d6c..2aae845c 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png
index 3ac65c32..689ed32c 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png
index cfa16f1b..95de8fa0 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png
new file mode 100644
index 00000000..a640eb5b
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta
new file mode 100644
index 00000000..1105ae8f
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: a473b8b9bceb6c14c83f60d05c2ab2b2
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index 1e2ffd6c..c1c78e93 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ