diff --git a/lua_probject/base_project/Game/Controller/LoddyController.lua b/lua_probject/base_project/Game/Controller/LoddyController.lua
index 28f7ff05..36d8ed37 100644
--- a/lua_probject/base_project/Game/Controller/LoddyController.lua
+++ b/lua_probject/base_project/Game/Controller/LoddyController.lua
@@ -525,7 +525,7 @@ end
function M:FG_Get_Diamond_Msg(callback)
local _data = {}
_data.id = DataManager.SelfUser.account_id
- local _client = ControllerManager.GroupClient
+ local _client = ControllerManager.WebClient
_client:send(Protocol.WEB_Get_Diamond_Mssages, _data, function(res)
callback(res)
end)
diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua
index c42fabb3..f24376ba 100644
--- a/lua_probject/base_project/Game/Protocol.lua
+++ b/lua_probject/base_project/Game/Protocol.lua
@@ -56,7 +56,7 @@ Protocol = {
---手机号码登录
WEB_LOGIN_Phone = "acc/phone_login",
-- 获取自己房卡记录
- WEB_Get_Diamond_Mssages = "acc/get_diamo_messages",
+ WEB_Get_Diamond_Mssages = "acc/get_messages",
----index----
-- 获取公告
WEB_UPDATE_NOTICE = "index/get_notice",
diff --git a/lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua b/lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua
index 6f02a88a..19877e65 100644
--- a/lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua
+++ b/lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua
@@ -27,7 +27,9 @@ function M:Init()
--大厅的请求
local lobbyCtr = ControllerManager.GetController(LoddyController)
+ ViewUtil.ShowModalWait2()
lobbyCtr:FG_Get_Diamond_Msg(function(res)
+ ViewUtil.CloseModalWait2()
if res.ReturnCode ~= 0 then
ViewUtil.ErrorTip(res.ReturnCode, "获取房卡记录失败")
else
diff --git a/wb_new_ui/assets/Lobby/DiamondRecord.xml b/wb_new_ui/assets/Lobby/DiamondRecord.xml
index 947af77e..0182e4f3 100644
--- a/wb_new_ui/assets/Lobby/DiamondRecord.xml
+++ b/wb_new_ui/assets/Lobby/DiamondRecord.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg(1).xml b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg(1).xml
new file mode 100644
index 00000000..05293a8e
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg(1).xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg.xml b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg.xml
new file mode 100644
index 00000000..825cdbc4
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg_diamond.xml b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg_diamond.xml
new file mode 100644
index 00000000..5eff3620
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Component/item_msg_diamond.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Group 650(1).png b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Group 650(1).png
new file mode 100644
index 00000000..d0f8d45d
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Group 650(1).png differ
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Group 650.png b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Group 650.png
new file mode 100644
index 00000000..d0f8d45d
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Group 650.png differ
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 290(1).png b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 290(1).png
new file mode 100644
index 00000000..6751a3ee
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 290(1).png differ
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 290.png b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 290.png
new file mode 100644
index 00000000..6751a3ee
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 290.png differ
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 291(1).png b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 291(1).png
new file mode 100644
index 00000000..5a67c911
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 291(1).png differ
diff --git a/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 291.png b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 291.png
new file mode 100644
index 00000000..5a67c911
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/FamilyMsgRecord/Iamge/Rectangle 291.png differ
diff --git a/wb_new_ui/assets/Lobby/component/Main/Component/btn_close.xml b/wb_new_ui/assets/Lobby/component/Main/Component/btn_close.xml
new file mode 100644
index 00000000..ab216c66
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/Main/Component/btn_close.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/Main/Image/bg_main1.png b/wb_new_ui/assets/Lobby/component/Main/Image/bg_main1.png
new file mode 100644
index 00000000..ff40ae68
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/Main/Image/bg_main1.png differ
diff --git a/wb_new_ui/assets/Lobby/component/Main/Image/bg_main2.png b/wb_new_ui/assets/Lobby/component/Main/Image/bg_main2.png
new file mode 100644
index 00000000..2f36dae9
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/Main/Image/bg_main2.png differ
diff --git a/wb_new_ui/assets/Lobby/component/Main/Image/bt_top.png b/wb_new_ui/assets/Lobby/component/Main/Image/bt_top.png
new file mode 100644
index 00000000..751eb112
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/Main/Image/bt_top.png differ
diff --git a/wb_new_ui/assets/Lobby/component/Main/Image/btn_close.png b/wb_new_ui/assets/Lobby/component/Main/Image/btn_close.png
new file mode 100644
index 00000000..9a705866
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/Main/Image/btn_close.png differ
diff --git a/wb_new_ui/assets/Lobby/component/Main/Image/hall_club_common_tittle_icon1.png b/wb_new_ui/assets/Lobby/component/Main/Image/hall_club_common_tittle_icon1.png
new file mode 100644
index 00000000..190d0bdb
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/Main/Image/hall_club_common_tittle_icon1.png differ
diff --git a/wb_new_ui/assets/Lobby/component/Main/Image/loginBg.png b/wb_new_ui/assets/Lobby/component/Main/Image/loginBg.png
new file mode 100644
index 00000000..d8579a0c
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/Main/Image/loginBg.png differ
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 8ee1f5ae..b262dcc7 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -733,6 +733,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png
index e53ee937..1ad93fc9 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0.png 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 a65049a6..2a4cb4a4 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