diff --git a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
index a7bb03ef..1c124f94 100644
--- a/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua
@@ -1035,13 +1035,13 @@ function M:InitView(url)
-- end
-- )
- pt(self.curGroup)
+
self._view:GetChild('tex_id').text = "ID:" .. self.curGroup.id
self._view:GetChild('tex_name').text = self.curGroup.name
self._view:GetChild('tex_tableNum').text = string.format("进行:%d桌", self.curGroup.room_num)
-- self._view:GetChild('tex_hp').text = DataManager.SelfUser.diamo
- print("lingmenginitgroup", self.curGroup.id, self.curGroup.name)
+
-- self._view:GetChild('tex_p_name').text = ViewUtil.stringEllipsis(DataManager.SelfUser.nick_name)
@@ -1065,6 +1065,22 @@ function M:InitView(url)
-- )
-- self._view:GetChild('player_diamond').text = self.curGroup.diamo
+ local btn_refreshbg = self._view:GetChild("btn_refreshbg").onClick:Set(function ()
+ if self._view:GetController("bgchange").selectedIndex==0 then
+ Utils.SaveLocalFile( DataManager.SelfUser.account_id.."bgflag",2)
+ self._view:GetController("bgchange").selectedIndex = 1
+ else
+ Utils.SaveLocalFile( DataManager.SelfUser.account_id.."bgflag",1)
+ self._view:GetController("bgchange").selectedIndex = 0
+ end
+ end)
+
+ if Utils.LoadLocalFile(DataManager.SelfUser.account_id.."bgflag") == "2" then
+ self._view:GetController("bgchange").selectedIndex = 1
+ else
+ self._view:GetController("bgchange").selectedIndex = 0
+ end
+
self._view:GetController('alliance').selectedIndex = self.curGroup.type == 2 and 1 or 0
self.ctr_newmail = self._view:GetController('new_mail')
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua
index f0865ca8..7a049228 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPSettingView.lua
@@ -253,7 +253,7 @@ function M:UpdateIndex()
elseif n == 8 then
c1.selectedIndex = 3
else
- c1.selectedIndex = 2
+ c1.selectedIndex = 0
end
end
end
diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json
index e1826a7e..f95ad6dd 100644
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@@ -10,6 +10,11 @@
"doc.openedDocs": [
"ui://2d9xdj6zfn7fao",
"ui://m7iejg4610snh5j",
+ "ui://m7iejg46lf2qhju",
+ "ui://m7iejg46ivn3hxh",
+ "ui://27vd145bh1uu3i",
+ "ui://27vd145bh1uu3f",
+ "ui://m7iejg46nunk7iiz",
"ui://m7iejg46kwi0hma",
"ui://m7iejg46gltdhc9",
"ui://m7iejg46irlqi02",
@@ -22,6 +27,9 @@
"ui://m7iejg46ilon7i9m",
"ui://0khx14are0py2",
"ui://m7iejg46ilon7ia2",
+ "ui://v6yvqp7waen81b0",
+ "ui://v6yvqp7waen81bf",
+ "ui://m7iejg46ilon7ibl",
"ui://m7iejg46ilon7ias",
"ui://m7iejg46ilon7ibc",
"ui://m7iejg46imp57ihp",
@@ -29,6 +37,14 @@
"ui://v0j9abjygq7ms2",
"ui://v0j9abjygq7m8f",
"ui://v0j9abjygq7m8l",
+ "ui://v6yvqp7wfgao1dn",
+ "ui://v6yvqp7wvoqg1dy",
+ "ui://27vd145bpgy941",
+ "ui://27vd145bbt6w96",
+ "ui://v6yvqp7wmk2u130",
+ "ui://ppu1wv76j4mf9j",
+ "ui://ppu1wv76j4mf9d",
+ "ui://v6yvqp7wf55qwa",
"ui://v0j9abjygq7m8u",
"ui://v0j9abjyp0aisn",
"ui://v0j9abjygq7med",
@@ -52,10 +68,24 @@
"test.device": "720p Phone",
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://v0j9abjygq7m8l",
+ "doc.activeDoc": "ui://9n9stu2eprgzf0",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "s63l0suw",
+ "9n9stu2e",
+ "/",
+ "9n9stu2e",
+ "/component/",
+ "9n9stu2e",
+ "/component/Main/",
+ "9n9stu2e",
+ "/component/Main/component/",
+ "2d9xdj6z",
+ "/",
+ "2d9xdj6z",
+ "/images/",
+ "v6yvqp7w",
+ "/",
+ "m7iejg46",
"/"
],
"auxline1": true,
diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
index 82c273de..3f00be9c 100644
--- a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
+++ b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
@@ -2,13 +2,13 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
index 635f4e6d..b0beace6 100644
--- a/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
+++ b/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
@@ -1,11 +1,11 @@
-
+
-
+
diff --git a/wb_new_ui/assets/Common/component/create_room/image/single_btn_s.png b/wb_new_ui/assets/Common/component/create_room/image/single_btn_s.png
index 14d3bc52..9e7d6bc9 100644
Binary files a/wb_new_ui/assets/Common/component/create_room/image/single_btn_s.png and b/wb_new_ui/assets/Common/component/create_room/image/single_btn_s.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
index 86163b7d..83de0d89 100644
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
@@ -1,6 +1,6 @@
-
+
@@ -70,7 +70,7 @@
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml
index 412d1d9c..d723f45a 100644
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing_1_item.xml
@@ -20,7 +20,7 @@
-
+
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
index a5a19ff0..d18e628a 100644
--- a/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
@@ -1,9 +1,9 @@
-
+
-
-
+
+
@@ -33,11 +33,11 @@
-
+
-
+
@@ -46,34 +46,34 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -141,7 +141,7 @@
-
+
@@ -156,7 +156,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index 4372c16a..13c128e6 100644
--- a/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -22,6 +22,7 @@
+
diff --git a/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml b/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
index 92fe928e..d62e29c6 100644
--- a/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
+++ b/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
@@ -11,7 +11,7 @@
-
+
@@ -125,12 +125,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd2.xml b/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd2.xml
index b9d7f4fb..f154d09d 100644
--- a/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd2.xml
+++ b/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd2.xml
@@ -26,10 +26,13 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/NewGroup/images/user1.png b/wb_new_ui/assets/NewGroup/images/user1.png
new file mode 100644
index 00000000..a2d5eab4
Binary files /dev/null and b/wb_new_ui/assets/NewGroup/images/user1.png differ
diff --git a/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label1.xml b/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label1.xml
index 809e4ab9..79e58915 100644
--- a/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label1.xml
+++ b/wb_new_ui/assets/NewGroup/mgr/component/comm/mng_label1.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/wb_new_ui/assets/NewGroup/package.xml b/wb_new_ui/assets/NewGroup/package.xml
index 35e82f54..2dc45037 100644
--- a/wb_new_ui/assets/NewGroup/package.xml
+++ b/wb_new_ui/assets/NewGroup/package.xml
@@ -1119,6 +1119,7 @@
+
\ No newline at end of file
diff --git a/wb_unity_pro_2/Library/SourceAssetDB b/wb_unity_pro_2/Library/SourceAssetDB
index b4927c87..571d3c94 100644
Binary files a/wb_unity_pro_2/Library/SourceAssetDB and b/wb_unity_pro_2/Library/SourceAssetDB differ
diff --git a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
index e69de29b..ab5e9c24 100644
--- a/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -0,0 +1,2 @@
+Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler