diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua
index ea896c9f..b4493b41 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua
@@ -95,9 +95,9 @@ function M:OnRenderItem(index, obj)
-- end
-- end
- hpStr = "[color=#08a805]积分设置:[/color]" .. "[color=#2365bb]" .. str .. "[/color]"
+ hpStr = "[color=#19C42C]积分设置:[/color]" .. "[color=#A47B42]" .. str .. "[/color]"
else
- hpStr = "[color=#08a805]积分设置:[/color]" .. "积分关闭"
+ hpStr = "[color=#19C42C]积分设置:[/color]" .. "积分关闭"
end
--obj:GetChild("tex_fag_info").text = "积分关闭"
local gameStr
@@ -115,7 +115,7 @@ function M:OnRenderItem(index, obj)
exconfig:FillRoomConfig(r, data)
gameStr = string.gsub(r.room_config:GetDes(), "\r", "")
- gameStr = "[color=#08a805]玩法说明:[/color]" .. "[color=#2365bb]" .. gameStr .. "[/color]"
+ gameStr = "[color=#19C42C]玩法说明:[/color]" .. "[color=#A47B42]" .. gameStr .. "[/color]"
end
obj:GetChild("com_gameinfo"):GetChild("tex_room_info").text = hpStr .. "\n" .. gameStr
diff --git a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua
index 09a54ceb..4d76f4b5 100644
--- a/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua
+++ b/lua_probject/extend_project/extend/majiang/hechi/EXClearingView.lua
@@ -238,7 +238,7 @@ function M:FillItemData(room, data, item, active_player, niao)
local fz_card = p.fz_list
local fz_card_list = item:GetChild("fz_card_list")
- fz_card_list.width = 157 * #fz_card * 1.3
+ fz_card_list.width = 163 * #fz_card * 1.3
fz_card_list:RemoveChildrenToPool()
for i=1,#fz_card do
@@ -253,7 +253,7 @@ function M:FillItemData(room, data, item, active_player, niao)
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_3")
for j = 1,3 do
local card = item:GetChild("card_" .. j)
- card.icon = "ui://Main_Majiang/" .. self:GetPrefix().."202_"..fz_card[i].opcard[j]
+ card.icon = "ui://Main_Majiang/202_"..fz_card[i].opcard[j]
end
elseif fz_card[i].type == FZType.Gang or fz_card[i].type == FZType.Gang_An or fz_card[i].type == FZType.Gang_Peng then
local item = fz_card_list:AddItemFromPool("ui://Main_Majiang/clearing_fz_4")
@@ -313,6 +313,21 @@ function M:FillItemData(room, data, item, active_player, niao)
end
end
str1=str1.." +"..huadd.."分"
+
+ -- 鸟牌总数量
+ if niao and #niao > 0 then
+ local zhongNiaoCount = 0
+ for i, v in ipairs(niao) do
+ -- 假设 v.score 为 1 表示中鸟（具体值请根据服务器协议确认，有时可能是 >0）
+ if v.score > 0 then
+ zhongNiaoCount = zhongNiaoCount + 1
+ end
+ end
+
+ if zhongNiaoCount > 0 then
+ str1 = str1 .. "x" .. zhongNiaoCount
+ end
+ end
end
else
@@ -444,11 +459,9 @@ function M:FillItemData(room, data, item, active_player, niao)
end
end
- --鸟牌总数量
- if data["zhong_jiang"] and data["zhong_jiang"] > 0 then
- str1 = str1 .. "x" .. data["zhong_jiang"]
- end
+
+
item:GetChild("score3").text=str1
item:GetChild("score4").text=str1
local paixingCtr=item:GetController("detail")
diff --git a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua
index 973ce45f..6db62aec 100644
--- a/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua
+++ b/lua_probject/extend_project/extend/poker/runfast/EXGameInfo.lua
@@ -23,7 +23,7 @@ function M:FillData(view, index)
self._config = UIPackage.CreateObjectFromURL("ui://Info_Poker_RunFastNew/Label_Detail_Play")
local com_editSetting = self._config:GetChild("com_editSetting")
-
+
com_editSetting:GetController("cGps").selectedIndex = 2
local ctr_round = self._config:GetController("round")
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info b/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info
index d21cd228..6216e0a6 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info
@@ -1,6 +1,6 @@
{
"objectStatus": {
- "n74_g24i": {
+ "n69_hz87": {
"hidden": true
},
"n71_g24i": {
@@ -18,6 +18,9 @@
"n60_ovii": {
"hidden": true
},
+ "n74_g24i": {
+ "hidden": true
+ },
"n24": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info
index d12f64db..5cc9d6c4 100644
--- a/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info
+++ b/wb_new_ui/.objs/metas/2d9xdj6z/xbqujn.info
@@ -1,14 +1,17 @@
{
"objectStatus": {
+ "n8_naup": {
+ "hidden": true,
+ "collapsed": true
+ },
"n14_naup": {
"hidden": true
},
"n13_naup": {
"hidden": true
},
- "n8_naup": {
- "hidden": true,
- "collapsed": true
+ "n28_hz87": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info b/wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/cv577iqb.info
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info b/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info
new file mode 100644
index 00000000..89943a94
--- /dev/null
+++ b/wb_new_ui/.objs/metas/m7iejg46/cvc87i5y.info
@@ -0,0 +1,37 @@
+{
+ "objectStatus": {
+ "n86_omkm": {
+ "hidden": true
+ },
+ "n81_omkm": {
+ "hidden": true
+ },
+ "n79_omkm": {
+ "hidden": true
+ },
+ "n27_fk7k": {
+ "hidden": true
+ },
+ "n82_omkm": {
+ "hidden": true
+ },
+ "n83_omkm": {
+ "hidden": true
+ },
+ "n80_omkm": {
+ "hidden": true
+ },
+ "n78_omkm": {
+ "hidden": true
+ },
+ "n84_omkm": {
+ "hidden": true
+ },
+ "n87_omkm": {
+ "hidden": true
+ },
+ "n85_omkm": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info
index 4171dcf4..d0847d49 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info
@@ -5,8 +5,16 @@
},
"n79_ovii": {
"hidden": true
+ },
+ "n97_hz87": {
+ "hidden": true
+ },
+ "n98_hz87": {
+ "hidden": true
+ },
+ "n95_hz87": {
+ "hidden": true
}
},
- "adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info
index bc096e5b..ca753cd8 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/imp57ihp.info
@@ -1,6 +1,9 @@
{
"objectStatus": {
- "n197_imp5": {
+ "n206_hz87": {
+ "hidden": true
+ },
+ "n203_hz87": {
"collapsed": true
}
}
diff --git a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info
index e5ec0083..e643b110 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/jgh8hwv.info
@@ -1,4 +1,18 @@
{
+ "objectStatus": {
+ "n181_b8zx": {
+ "hidden": true
+ },
+ "n220_yvb2": {
+ "hidden": true
+ },
+ "n218_yvb2": {
+ "hidden": true
+ },
+ "n184_b5ny": {
+ "hidden": true
+ }
+ },
"adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info
index b757f528..523438b1 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kk3uhro.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n52_hz87": {
+ "hidden": true
+ },
"n35_p747": {
"hidden": true
},
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info
index e79cf842..f73f39e5 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk1.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n13_vyn3": {
+ "hidden": true
+ },
"n6_y6xi": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info
index 7c8a615b..73aee11a 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/kwi0hk4.info
@@ -1,6 +1,6 @@
{
"objectStatus": {
- "n17_rpaz": {
+ "n24_nk4v": {
"collapsed": true
},
"n16_rpaz": {
diff --git a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info
index 690dbfcd..cd9021eb 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/r0qx7i6u.info
@@ -6,9 +6,6 @@
"n62_r0qx": {
"hidden": true
},
- "n47_sbng": {
- "collapsed": true
- },
"n33_p747": {
"hidden": true
}
diff --git a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info
index e6f1e907..51bdb2c0 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/tqi8hwa.info
@@ -2,6 +2,9 @@
"objectStatus": {
"n68_tqi8": {
"hidden": true
+ },
+ "n87_hz87": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info
index 04eb3948..57157cfd 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/yvb27ik0.info
@@ -1,10 +1,19 @@
{
"objectStatus": {
- "n87_csp4": {
+ "n91_hz87": {
+ "hidden": true
+ },
+ "n89_hz87": {
"hidden": true
},
"n79_ovii": {
"hidden": true
+ },
+ "n90_hz87": {
+ "hidden": true
+ },
+ "n87_csp4": {
+ "hidden": true
}
}
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
index 905f684a..f693b976 100644
--- a/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
+++ b/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
@@ -1,7 +1,7 @@
{
"objectStatus": {
- "n46_tqi8": {
- "collapsed": true
+ "n33_rpaz": {
+ "hidden": true
},
"n142_ufim": {
"hidden": true
@@ -9,34 +9,30 @@
"n91_task": {
"hidden": true
},
- "n51_jd7v": {
+ "n151_cv57": {
"hidden": true
},
"n86_t1hq": {
"hidden": true
},
- "n33_rpaz": {
- "hidden": true
- },
- "n112_csp4": {
- "hidden": true
- },
- "n86_t1hq": {
- "hidden": true
- },
- "n89_t1hq": {
- "collapsed": true
- },
- "n69_jd7v": {
+ "n113_csp4": {
"hidden": true
},
"n85_t1hq": {
"hidden": true
},
- "n113_csp4": {
+ "n35_rpaz": {
+ "hidden": true
+ },
+ "n51_jd7v": {
+ "hidden": true
+ },
+ "n69_jd7v": {
+ "hidden": true
+ },
+ "n112_csp4": {
"hidden": true
}
},
- "adaptiveTest": true,
"fitScreen": "FitSize"
}
\ No newline at end of file
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index d6e54632..8b237405 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -2,85 +2,23 @@
"libview.firstColumnWidth": 384,
"libview.iconScale": 0,
"doc.openedDocs": [
- "ui://m7iejg46kwi0hma",
- "ui://m7iejg46m16m7igb",
- "ui://v0j9abjygq7med",
- "ui://v0j9abjygq7ms2",
- "ui://lkq9ne9speuq8b",
- "ui://v0j9abjygq7mdj",
- "ui://v0j9abjygq7m8f",
- "ui://hrxsdiixla4e24",
- "ui://v0j9abjygq7men",
- "ui://m7iejg46imp57ih3",
- "ui://27vd145bcvc87i5t",
- "ui://m7iejg46ilon7ibl",
- "ui://m7iejg46imp57igy",
- "ui://m7iejg46ozazhxs",
- "ui://m7iejg46tt6k7ika",
- "ui://m7iejg46gls1hif",
- "ui://m7iejg46imp57ih1",
- "ui://27vd145bvg2c4",
- "ui://m7iejg46csp47i42",
- "ui://27vd145bst2l7ijp",
- "ui://27vd145bofsx1e",
- "ui://m7iejg46imp57ih5",
- "ui://27vd145bmljn7ijt",
- "ui://m7iejg46imp57ih4",
- "ui://27vd145bcv577inp",
- "ui://v0j9abjygq7m8u",
- "ui://v0j9abjygq7m8r",
- "ui://v0j9abjygq7m8k",
- "ui://v0j9abjygq7m8i",
- "ui://4skil1l6r6qo1kc",
- "ui://v0j9abjygq7mcu",
- "ui://v0j9abjygq7md3",
+ "ui://m7iejg46yvb27ik0",
+ "ui://m7iejg46hsbhhjn",
"ui://m7iejg4610snh5j",
- "ui://m7iejg46r0qx7i6v",
- "ui://m7iejg4610xl7i1w",
- "ui://m7iejg46ilon7ia2",
- "ui://m7iejg46l7wn7i83",
- "ui://m7iejg46r0qx7i6u",
- "ui://27vd145bc6bub0",
- "ui://m7iejg46eany7ie3",
- "ui://m7iejg46eany7ie2",
- "ui://m7iejg46r0qx7i70",
- "ui://m7iejg46eany7ie1",
- "ui://27vd145beeqmch0",
- "ui://m7iejg46nk4vhwj",
- "ui://m7iejg46lf2qhju",
- "ui://m7iejg46lqkg7iry",
- "ui://27vd145bh1uu3f",
- "ui://27vd145bh1uu3i",
- "ui://m7iejg46ivn3hxh",
- "ui://m7iejg46h22dp7isu",
- "ui://m7iejg46csp47i3z",
- "ui://m7iejg46jiu8hef",
- "ui://m7iejg46lnhahsf",
- "ui://m7iejg46lnhahsh",
- "ui://m7iejg46h46p7ish",
- "ui://m7iejg46h22dp7isv",
- "ui://m7iejg46hwww2f",
- "ui://l0ds4ys6h1uu26",
- "ui://z1qthxavlrfi0",
- "ui://2d9xdj6zfn7fao",
- "ui://m7iejg46ruljhmp",
- "ui://2d9xdj6zlumrgj",
- "ui://2d9xdj6zlwcl5m",
- "ui://v0j9abjygq7mct",
+ "ui://m7iejg46imp57ih3",
"ui://v0j9abjygq7md1",
- "ui://4skil1l6piv91o5",
- "ui://m7iejg46imp57igi",
- "ui://m7iejg46n5sxha2",
- "ui://m7iejg46ilon7ias",
- "ui://m7iejg46ilon7ibc",
+ "ui://v0j9abjygq7med",
+ "ui://v0j9abjygq7mcu",
"ui://27vd145bik9v7ijw",
- "ui://m7iejg46gltdhc9",
- "ui://27vd145bcv577io8"
+ "ui://v0j9abjygq7mct",
+ "ui://4skil1l6piv91o5",
+ "ui://m7iejg46t1hqhy5",
+ "ui://m7iejg46t1hqhxw"
],
"test.device": "iPhone XR",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://m7iejg46tt6k7ika",
+ "doc.activeDoc": "ui://v0j9abjygq7med",
"libview.twoColumn": false,
"libview.expandedNodes": [
"27vd145b",
@@ -130,7 +68,15 @@
"m7iejg46",
"/images/main/",
"m7iejg46",
- "/mgr/"
+ "/mgr/",
+ "m7iejg46",
+ "/mgr/component/",
+ "m7iejg46",
+ "/mgr/component/game/",
+ "m7iejg46",
+ "/mgr/imgs/",
+ "m7iejg46",
+ "/mgr/imgs/member/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/wb_new_ui/assets/Common/buttons/Btn_Common.xml b/wb_new_ui/assets/Common/buttons/Btn_Common.xml
index 9bc3a007..7a737321 100644
--- a/wb_new_ui/assets/Common/buttons/Btn_Common.xml
+++ b/wb_new_ui/assets/Common/buttons/Btn_Common.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/SettingWindow1.xml b/wb_new_ui/assets/Lobby/SettingWindow1.xml
index 5d81902a..b7cb0f6e 100644
--- a/wb_new_ui/assets/Lobby/SettingWindow1.xml
+++ b/wb_new_ui/assets/Lobby/SettingWindow1.xml
@@ -1,33 +1,33 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml b/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
index cecd140f..2833644d 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
@@ -1,48 +1,48 @@
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
index 8fa5c5a3..6d0c4b57 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml
@@ -29,14 +29,18 @@
-
-
+
+
@@ -103,7 +107,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_fz_3.xml b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_fz_3.xml
index 5eb10dda..b5ca8eaf 100644
--- a/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_fz_3.xml
+++ b/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_fz_3.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index fb6c800e..9a10a386 100644
--- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -1,6 +1,6 @@
-
+
@@ -44,7 +44,7 @@
-
+
@@ -63,7 +63,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml b/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
index 711f593e..2cca81d2 100644
--- a/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
+++ b/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
@@ -1,15 +1,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -49,7 +49,7 @@
-
+
@@ -58,14 +58,14 @@
-
+
-
+
@@ -74,50 +74,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -127,7 +127,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml b/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml
index d9c9b9c8..4986a4bd 100644
--- a/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml
+++ b/wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml
@@ -1,33 +1,44 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
+
+
-
-
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml b/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
index ec38b535..f0165f84 100644
--- a/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
@@ -1,59 +1,59 @@
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/Win_Takelog.xml b/wb_new_ui/assets/NewGroup/Win_Takelog.xml
index f1ea32b9..c7de5ca2 100644
--- a/wb_new_ui/assets/NewGroup/Win_Takelog.xml
+++ b/wb_new_ui/assets/NewGroup/Win_Takelog.xml
@@ -1,36 +1,45 @@
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/component/Btn/Btn_back1.xml b/wb_new_ui/assets/NewGroup/component/Btn/Btn_back1.xml
index 6194ad11..ebd1a312 100644
--- a/wb_new_ui/assets/NewGroup/component/Btn/Btn_back1.xml
+++ b/wb_new_ui/assets/NewGroup/component/Btn/Btn_back1.xml
@@ -1,7 +1,7 @@
-
+
-
+
diff --git a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h_old.xml b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h_old.xml
index a6ebbd6b..8f7f41ea 100644
--- a/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h_old.xml
+++ b/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h_old.xml
@@ -1,24 +1,27 @@
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
index 58956023..a3dceb78 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
@@ -1,12 +1,19 @@
-
+
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
index daf547ff..d4c7f626 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
@@ -1,154 +1,154 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
index 8da93076..f36e4c27 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
@@ -1,39 +1,39 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml
index 0c46f3b8..98e5cb29 100644
--- a/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStatAlone.xml
@@ -1,49 +1,56 @@
-
+
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
+
+
+
-
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/btn_create_game.xml b/wb_new_ui/assets/NewGroup/mgr/btn_create_game.xml
index 9fde6b25..64d09fdc 100644
--- a/wb_new_ui/assets/NewGroup/mgr/btn_create_game.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/btn_create_game.xml
@@ -1,8 +1,8 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/fagpack/item_take.xml b/wb_new_ui/assets/NewGroup/mgr/component/fagpack/item_take.xml
index 6670cc5d..143fa734 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/fagpack/item_take.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/fagpack/item_take.xml
@@ -1,10 +1,10 @@
-
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/game/game_info.xml b/wb_new_ui/assets/NewGroup/mgr/component/game/game_info.xml
index c2eae633..da75ea65 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/game/game_info.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/game/game_info.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/game/item_mng_game.xml b/wb_new_ui/assets/NewGroup/mgr/component/game/item_mng_game.xml
index e3d43df8..e0f39969 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/game/item_mng_game.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/game/item_mng_game.xml
@@ -1,53 +1,54 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
index 1c8870e2..b6a3d214 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/item_member1.xml
@@ -1,83 +1,83 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_mng_partner1.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_mng_partner1.xml
index 1d406438..0b5e681e 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_mng_partner1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_mng_partner1.xml
@@ -1,52 +1,52 @@
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml
index 7c8075e8..96ecfb73 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/member/partner/item_partner_stat.xml
@@ -1,55 +1,55 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 41adf726..7d801c72 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1418,7 +1418,7 @@
-
+
@@ -1466,6 +1466,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 0fe59eda..58cfe3c3 100644
Binary files a/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index bbc1c51a..77f5171e 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 5a5be9ee..3500509d 100644
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png
index 2c8038d5..5a3bce6b 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png
index 50b5ef4c..437499ee 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png
index eba96d49..aa1f3b03 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png
index 7e7568d3..d9c96db2 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png
index d657db87..d18da217 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png
new file mode 100644
index 00000000..d5c34c83
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png.meta b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png.meta
new file mode 100644
index 00000000..8b110adb
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwe.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 1dc339c84b381ab48a84ced5eadf8321
+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/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png
new file mode 100644
index 00000000..6fccd9f2
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png.meta b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png.meta
new file mode 100644
index 00000000..52f03d84
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwm.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 3cfc351edf8850546bd6a8b90fbfdebc
+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/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png
new file mode 100644
index 00000000..56bf2fc7
Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png differ
diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png.meta b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png.meta
new file mode 100644
index 00000000..5d9bf8bf
--- /dev/null
+++ b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_wqjdp7iwr.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 10cfbafa98651294ea7edde86636de1e
+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/newgroup/ui/NewGroup_fui.bytes b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
index 838404a5..8614cba4 100644
Binary files a/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ
diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
index 4f4dac17..ad8f23e5 100644
--- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
+++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset
@@ -38,6 +38,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}