diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/hugj7i61.info b/fk101/wb_new_ui/.objs/metas/27vd145b/hugj7i61.info
index 1110c26..98495ec 100644
--- a/fk101/wb_new_ui/.objs/metas/27vd145b/hugj7i61.info
+++ b/fk101/wb_new_ui/.objs/metas/27vd145b/hugj7i61.info
@@ -2,6 +2,12 @@
"objectStatus": {
"n0_l8gg": {
"hidden": true
+ },
+ "n12_i2p6": {
+ "hidden": true
+ },
+ "n13_i2p6": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/l8gg53.info b/fk101/wb_new_ui/.objs/metas/27vd145b/l8gg53.info
index c5ba6be..6e6d7a0 100644
--- a/fk101/wb_new_ui/.objs/metas/27vd145b/l8gg53.info
+++ b/fk101/wb_new_ui/.objs/metas/27vd145b/l8gg53.info
@@ -3,7 +3,10 @@
"n10_i2p6": {
"hidden": true
},
- "n0_l8gg": {
+ "n13_i2p6": {
+ "hidden": true
+ },
+ "n5_xyf8": {
"hidden": true
},
"n4_xyf8": {
@@ -12,7 +15,7 @@
"n12_i2p6": {
"hidden": true
},
- "n5_xyf8": {
+ "n0_l8gg": {
"hidden": true
}
}
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index e2db0ad..6658006 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -10,6 +10,22 @@
"doc.openedDocs": [
"ui://m7iejg4610snh5j",
"ui://2d9xdj6zfn7fao",
+ "ui://b8jloj2qbs5ncig",
+ "ui://qpsoxvaibs5ncif",
+ "ui://awernf6xbazqbq",
+ "ui://9n9stu2ebs5n1w",
+ "ui://442j0uepdrya3m",
+ "ui://27vd145bl8gg53",
+ "ui://27vd145bhugj7i61",
+ "ui://bx1t0boobs5n7hzi",
+ "ui://c7j2rnvqtpf070",
+ "ui://y8prev1mbs5n2a",
+ "ui://b50sd5s6bs5n2b",
+ "ui://xul2z8ctbs5n2a",
+ "ui://visk5g30gq7m67",
+ "ui://425x67nrbs5n2b",
+ "ui://s63l0suwdrya2e",
+ "ui://niy3ldiwj4ci2d",
"ui://fnuxqeflkllg1x",
"ui://egnzysm7ffp3b2",
"ui://v2hilfzbgq7me6",
@@ -37,12 +53,16 @@
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://2d9xdj6zfn7fao",
+ "doc.activeDoc": "ui://s63l0suwdrya2e",
"libview.twoColumn": false,
"libview.expandedNodes": [
"27vd145b",
"/",
"27vd145b",
+ "/component/",
+ "27vd145b",
+ "/component/rule/",
+ "27vd145b",
"/font/",
"27vd145b",
"/font/images/",
@@ -97,11 +117,7 @@
"qpsoxvai",
"/component/Result/",
"2d9xdj6z",
- "/",
- "2d9xdj6z",
- "/component/",
- "2d9xdj6z",
- "/images/"
+ "/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_close(1).xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_close(1).xml
index 965adec..10c8a04 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_close(1).xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_close(1).xml
@@ -3,7 +3,7 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/component/rule/9bg_03.png b/fk101/wb_new_ui/assets/Common/component/rule/9bg_03.png
index 6452b00..de973c9 100644
Binary files a/fk101/wb_new_ui/assets/Common/component/rule/9bg_03.png and b/fk101/wb_new_ui/assets/Common/component/rule/9bg_03.png differ
diff --git a/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml b/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml
index 1d1520c..412856b 100644
--- a/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml
+++ b/fk101/wb_new_ui/assets/Common/component/rule/Component4.xml
@@ -2,9 +2,9 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml b/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml
index d3e4cd1..2820bd2 100644
--- a/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml
+++ b/fk101/wb_new_ui/assets/Common/component/rule/GameRule.xml
@@ -6,14 +6,14 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/component/rule/GameRule1.xml b/fk101/wb_new_ui/assets/Common/component/rule/GameRule1.xml
index 97c203e..15d0197 100644
--- a/fk101/wb_new_ui/assets/Common/component/rule/GameRule1.xml
+++ b/fk101/wb_new_ui/assets/Common/component/rule/GameRule1.xml
@@ -4,18 +4,18 @@
-
-
+
+
-
-
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/component/rule/buttom_guanbi.png b/fk101/wb_new_ui/assets/Common/component/rule/buttom_guanbi.png
index 54e8341..a88ac6d 100644
Binary files a/fk101/wb_new_ui/assets/Common/component/rule/buttom_guanbi.png and b/fk101/wb_new_ui/assets/Common/component/rule/buttom_guanbi.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png
index 05a014c..f281835 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png
index 32b6d0e..4c3a22d 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png
index a3bfe66..edb331f 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png
index 761c313..54272b8 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png
new file mode 100644
index 0000000..36b9c80
Binary files /dev/null and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png.meta b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png.meta
new file mode 100644
index 0000000..ed11242
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: a076023144759ed4d94ccb70935c4391
+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/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 2f170f3..c03f437 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index 2e5ecf2..d8058ef 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg1.png b/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg1.png
deleted file mode 100644
index 1c77b2e..0000000
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg1.png and /dev/null differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg2.png b/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg2.png
deleted file mode 100644
index 81553e7..0000000
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg2.png and /dev/null differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg3.png b/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg3.png
deleted file mode 100644
index 7512b64..0000000
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/runbeard/bg/bg3.png and /dev/null differ