diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index e552e0f9..7b7ae944 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -2,14 +2,13 @@
"libview.firstColumnWidth": 367,
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://m7iejg46ruljhmp",
- "ui://2d9xdj6zngxlckb",
- "ui://27vd145bko559b"
+ "ui://m7iejg46l7wn7i83",
+ "ui://m7iejg4610xl7i1w"
],
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://27vd145bko559b",
+ "doc.activeDoc": "ui://m7iejg46l7wn7i83",
"libview.twoColumn": false,
"libview.expandedNodes": [
"27vd145b",
@@ -23,12 +22,12 @@
"27vd145b",
"/font/",
"27vd145b",
+ "/font/fontTitle/",
+ "27vd145b",
"/font/images/",
"27vd145b",
"/font/images/btn_keyboard/",
"27vd145b",
- "/font/images/win/",
- "27vd145b",
"/images/",
"27vd145b",
"/images/btn_keyboard/",
@@ -50,6 +49,10 @@
"/component/user_info/",
"2d9xdj6z",
"/component/user_info/edit/",
+ "2d9xdj6z",
+ "/images/",
+ "2d9xdj6z",
+ "/images/new/",
"v0j9abjy",
"/",
"v0j9abjy",
@@ -63,17 +66,7 @@
"lx6k641g",
"/image/",
"m7iejg46",
- "/",
- "m7iejg46",
- "/component/",
- "m7iejg46",
- "/component/Lst_info/",
- "m7iejg46",
- "/component/nav/",
- "m7iejg46",
- "/images/",
- "m7iejg46",
- "/mgr/"
+ "/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png
index da07a77f..ef58122f 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png
index 2c6e631b..151c8781 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png
index c954482a..f6a707e2 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png
index f08504ad..6ef022d5 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png
index 08f58517..202b8dab 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png
index cf31c0fe..33e0e45e 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png
index 1d7ef28d..75c3b29b 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png
index 58b4e405..a82e9212 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png
index bf8b98ce..91179a0c 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png
index fb13a7f6..774cf5e9 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png
index 3cc4fbed..26f4e62c 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png
index bb0de685..abd2fea5 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png
index 57640deb..bcaa6619 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png differ
diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png
index 35cf2343..09bf8100 100644
Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png differ
diff --git a/wb_new_ui/assets/Common/font/images/setting/off.png b/wb_new_ui/assets/Common/font/images/setting/off.png
index d31aed9b..c1b776ef 100644
Binary files a/wb_new_ui/assets/Common/font/images/setting/off.png and b/wb_new_ui/assets/Common/font/images/setting/off.png differ
diff --git a/wb_new_ui/assets/Common/font/images/setting/on.png b/wb_new_ui/assets/Common/font/images/setting/on.png
index 925f51a7..8462ab49 100644
Binary files a/wb_new_ui/assets/Common/font/images/setting/on.png and b/wb_new_ui/assets/Common/font/images/setting/on.png differ
diff --git a/wb_new_ui/assets/Lobby/SettingWindow1.xml b/wb_new_ui/assets/Lobby/SettingWindow1.xml
index a757bae2..269a20d3 100644
--- a/wb_new_ui/assets/Lobby/SettingWindow1.xml
+++ b/wb_new_ui/assets/Lobby/SettingWindow1.xml
@@ -2,7 +2,7 @@
-
+
@@ -24,10 +24,10 @@
-
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/images/Group 22.png b/wb_new_ui/assets/Lobby/images/Group 22.png
index ec2984bc..39d05940 100644
Binary files a/wb_new_ui/assets/Lobby/images/Group 22.png and b/wb_new_ui/assets/Lobby/images/Group 22.png differ
diff --git a/wb_new_ui/assets/Lobby/images/Group 586.png b/wb_new_ui/assets/Lobby/images/Group 586.png
index 75aa5254..cdbfd9fd 100644
Binary files a/wb_new_ui/assets/Lobby/images/Group 586.png and b/wb_new_ui/assets/Lobby/images/Group 586.png differ
diff --git a/wb_new_ui/assets/Lobby/images/new/shezhi.png b/wb_new_ui/assets/Lobby/images/new/shezhi.png
index ff3d9d7a..88d2cf8a 100644
Binary files a/wb_new_ui/assets/Lobby/images/new/shezhi.png and b/wb_new_ui/assets/Lobby/images/new/shezhi.png differ
diff --git a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
index f110905e..0a4299c7 100644
--- a/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
+++ b/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
@@ -1,64 +1,62 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_TakeHp.xml b/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
index 91f92bb5..85e6ee2c 100644
--- a/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
+++ b/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
@@ -1,66 +1,65 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml b/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
index 704bbbb0..86818f66 100644
--- a/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
+++ b/wb_new_ui/assets/NewGroup/component/Lst_info/Win_roomInfo.xml
@@ -1,6 +1,6 @@
-
+
@@ -23,8 +23,8 @@
-
-
+
+
@@ -37,16 +37,16 @@
-
-
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 08ff4b27..beb48f76 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1341,6 +1341,7 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/win_fagInput_input.png b/wb_new_ui/assets/NewGroup/win_fagInput_input.png
new file mode 100644
index 00000000..2e051b31
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/win_fagInput_input.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png
new file mode 100644
index 00000000..d5133455
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png.meta
new file mode 100644
index 00000000..c9ce3975
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_5.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 39431a3ed519f404fb8a49182223a1e2
+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: