diff --git a/lua_probject/base_project/Game/Controller/LoddyController.lua b/lua_probject/base_project/Game/Controller/LoddyController.lua
index 29a8e875..39d29010 100644
--- a/lua_probject/base_project/Game/Controller/LoddyController.lua
+++ b/lua_probject/base_project/Game/Controller/LoddyController.lua
@@ -1,12 +1,11 @@
-
LoddyController = {}
local M = {}
--- Create a new LoddyController
function LoddyController.new()
- setmetatable(M, {__index = IController})
- local self = setmetatable({}, {__index = M})
+ setmetatable(M, { __index = IController })
+ local self = setmetatable({}, { __index = M })
self.baseType = LoddyController
self.class = "Loddy"
self.recordList = {}
@@ -27,7 +26,7 @@ local function __FillRoomData(s2croom)
extend:FillRoomData(s2croom)
end
-local function __ConntectGameServer(cmd,room, host, _data,callback)
+local function __ConntectGameServer(cmd, room, host, _data, callback)
-- local _data = {}
_data["session"] = room.session
local _game_client = NetClient.new(host, "game")
@@ -35,7 +34,7 @@ local function __ConntectGameServer(cmd,room, host, _data,callback)
ControllerManager.SetGameNetClient(_game_client)
_game_client.onconnect:Add(function(code)
if (code == SocketCode.Connect) then
- _game_client:send(cmd, _data, function (response)
+ _game_client:send(cmd, _data, function(response)
if (response.ReturnCode == 0) then
_game_client.onconnect:Clear()
_game_client.onconnect:Add(ControllerManager.OnConnect)
@@ -44,39 +43,38 @@ local function __ConntectGameServer(cmd,room, host, _data,callback)
end
_game_client:destroy()
if ControllerManager.GameNetClinet == _game_client then
- ControllerManager.GameNetClinet =nil
+ ControllerManager.GameNetClinet = nil
end
callback(response)
end)
-
else
if ControllerManager.GameNetClinet == _game_client then
- ControllerManager.GameNetClinet =nil
+ ControllerManager.GameNetClinet = nil
end
_game_client:destroy()
- callback({ReturnCode = 101})
+ callback({ ReturnCode = 101 })
end
end)
end
function M:CreateRoom(game_id, _data, callback)
- local _client = ControllerManager.WebClient
- local data = {}
- data.game_id = game_id
+ local _client = ControllerManager.WebClient
+ local data = {}
+ data.game_id = game_id
data["platform"] = GetPlatform()
data.config_data = _data
-- local runtime = os.clock()
_client:send(Protocol.WEB_CREATE_ROOM, data, function(res)
- if ( res.ReturnCode == Table_Error_code.ERR_IN_ROOM or res.ReturnCode == Table_Error_code.ERR_CREATE_ROOM) then
- self:JoinRoom("000000",callback)
+ if (res.ReturnCode == Table_Error_code.ERR_IN_ROOM or res.ReturnCode == Table_Error_code.ERR_CREATE_ROOM) then
+ self:JoinRoom("000000", callback)
return
end
if (res.ReturnCode == 0) then
local json = res.Data
local game_info = json["game_info"]
if ExtendHotupdate.CheckVersion(game_info) ~= ExtendHotupdate.VERSION_NORMAL then
- ExtendHotupdate.UpdateGame(game_info,function()
+ ExtendHotupdate.UpdateGame(game_info, function()
res.ReturnCode = -2
callback(res)
end)
@@ -87,7 +85,7 @@ function M:CreateRoom(game_id, _data, callback)
local server_ip = json["server_ip"]
local server_port = json["server_port"]
- local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
+ local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
room.game_id = game_id
room.room_id = room_id
room.server_host = string.concat(server_ip, ":", server_port)
@@ -99,12 +97,12 @@ function M:CreateRoom(game_id, _data, callback)
local j_data = {}
j_data["session"] = room.session
if not DataManager.SelfUser.location then
- DataManager.SelfUser.location = Location.new()
+ DataManager.SelfUser.location = Location.new()
end
j_data["pos"] = DataManager.SelfUser.location:Location2String()
- -- game_net =
- __ConntectGameServer(Protocol.GAME_JOIN_ROOM,room,room.server_host, j_data, function (response)
+ -- game_net =
+ __ConntectGameServer(Protocol.GAME_JOIN_ROOM, room, room.server_host, j_data, function(response)
if (response.ReturnCode == 0) then
-- game_net:clearEvent()
local _s2croom = response.Data
@@ -113,7 +111,7 @@ function M:CreateRoom(game_id, _data, callback)
room.banker_seat = _s2croom["manor"]
if _s2croom.createTime then
room.create_time = _s2croom["createTime"]
- end
+ end
room.agent = _s2croom.agent == 1 and true or false
local extend = ExtendManager.GetExtendConfig(room.game_id)
extend:FillRoomData(_s2croom)
@@ -126,13 +124,13 @@ function M:CreateRoom(game_id, _data, callback)
callback(response)
end)
else
- if callback then callback(res) end
+ if callback then callback(res) end
end
end)
end
local join_room_frame = 0
-function M:PublicJoinRoom(cmd,room_id,callback,group_id,group_layer)
+function M:PublicJoinRoom(cmd, room_id, callback, group_id, group_layer)
-- 同一帧不重复调用
local last_frame = join_room_frame
join_room_frame = Time.frameCount
@@ -147,12 +145,12 @@ function M:PublicJoinRoom(cmd,room_id,callback,group_id,group_layer)
_data["floor"] = group_layer
_data["platform"] = GetPlatform()
local _client = ControllerManager.WebClient;
- _client:send(cmd, _data, function( res)
+ _client:send(cmd, _data, function(res)
if (res.ReturnCode == 0) then
local json = res.Data
local game_info = json["game_info"]
if ExtendHotupdate.CheckVersion(game_info) ~= ExtendHotupdate.VERSION_NORMAL then
- ExtendHotupdate.UpdateGame(game_info,function()
+ ExtendHotupdate.UpdateGame(game_info, function()
res.ReturnCode = -2
callback(res)
end)
@@ -162,7 +160,7 @@ function M:PublicJoinRoom(cmd,room_id,callback,group_id,group_layer)
local server_ip = json["server_ip"]
local server_port = json["server_port"]
- local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
+ local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
room.lev = json["lev"] -- 自己在当前房间所在圈子的职位,1盟主,2管理员,3用户,非圈子房间就是3
room.room_id = json["room_id"]
room.game_id = game_id
@@ -178,44 +176,43 @@ function M:PublicJoinRoom(cmd,room_id,callback,group_id,group_layer)
DataManager.CurrenRoom = room
local j_data = {}
if not DataManager.SelfUser.location then
- DataManager.SelfUser.location = Location.new()
+ DataManager.SelfUser.location = Location.new()
end
j_data["pos"] = DataManager.SelfUser.location:Location2String()
-- local game_net = nil
--print(vardump(room))
- -- game_net =
- __ConntectGameServer(Protocol.GAME_JOIN_ROOM,room,room.server_host, j_data,function ( res1)
- if (res1.ReturnCode ~= 0 ) then
+ -- game_net =
+ __ConntectGameServer(Protocol.GAME_JOIN_ROOM, room, room.server_host, j_data, function(res1)
+ if (res1.ReturnCode ~= 0) then
if (callback) then callback(res1) end
else
local _s2croom = res1.Data
room.owner_id = _s2croom["owner"]
if _s2croom.createTime then
room.create_time = _s2croom["createTime"]
- end
+ end
if _s2croom.manor then
room.banker_seat = _s2croom.manor
end
room.agent = _s2croom.agent == 1 and true or false
-- ControllerManager.SetGameNetClient(game_net)
- local extend = ExtendManager.GetExtendConfig(room.game_id)
+ local extend = ExtendManager.GetExtendConfig(room.game_id)
extend:FillRoomData(_s2croom)
ControllerManager.ChangeController(GameController)
if callback then callback(res1) end
end
- end)
+ end)
-- callback(res)
else
- if callback then callback(res) end
+ if callback then callback(res) end
end
end)
end
-function M:JoinRoom(room_id,callback,group_id,group_layer)
- self:PublicJoinRoom(Protocol.WEB_JOIN_ROOM,room_id,callback,group_id,group_layer)
+function M:JoinRoom(room_id, callback, group_id, group_layer)
+ self:PublicJoinRoom(Protocol.WEB_JOIN_ROOM, room_id, callback, group_id, group_layer)
end
-
function M:ResetJionRoom(callback)
local _game = ControllerManager.GetController(GameController)
local o_room = DataManager.CurrenRoom
@@ -224,7 +221,7 @@ function M:ResetJionRoom(callback)
DataManager.SelfUser.location = Location.new()
end
j_data["pos"] = DataManager.SelfUser.location:Location2String()
- local room = ExtendManager.GetExtendConfig(o_room.game_id):NewRoom()
+ local room = ExtendManager.GetExtendConfig(o_room.game_id):NewRoom()
room.lev = o_room.lev
room.room_id = o_room.room_id
room.game_id = o_room.game_id
@@ -241,14 +238,14 @@ function M:ResetJionRoom(callback)
room.create_time = o_room.create_time
room:SetReloadStatus(true)
DataManager.CurrenRoom = room
- __ConntectGameServer(Protocol.GAME_JOIN_ROOM,room,room.server_host, j_data,function ( res1)
+ __ConntectGameServer(Protocol.GAME_JOIN_ROOM, room, room.server_host, j_data, function(res1)
room:SetReloadStatus(false)
- if (res1.ReturnCode ~= 0 ) then
+ if (res1.ReturnCode ~= 0) then
if (callback) then callback(res1) end
else
printlog("ResetJionRoom==>>>")
pt(res1)
- ControllerManager.enterPlayerData=res1.Data.tableInfo.playerData
+ ControllerManager.enterPlayerData = res1.Data.tableInfo.playerData
local _s2croom = res1.Data
local extend = ExtendManager.GetExtendConfig(room.game_id)
extend:FillRoomData(_s2croom)
@@ -259,8 +256,8 @@ function M:ResetJionRoom(callback)
end
function M:UpdatePlayerInfo(callback)
- local _client = ControllerManager.WebClient
- _client:send(Protocol.WEB_UPDATE_INFO, nil, function (res)
+ local _client = ControllerManager.WebClient
+ _client:send(Protocol.WEB_UPDATE_INFO, nil, function(res)
if res.ReturnCode == 0 then
DataManager.SelfUser.diamo = res.Data.diamo
DataManager.SelfUser.invited = res.Data.invitation
@@ -272,11 +269,11 @@ function M:UpdatePlayerInfo(callback)
end)
end
-function M:UpdateNotice(id,callback)
- local _client = ControllerManager.WebClient
- local _data = {}
+function M:UpdateNotice(id, callback)
+ local _client = ControllerManager.WebClient
+ local _data = {}
_data.id = id
- _client:send(Protocol.WEB_UPDATE_NOTICE, _data, function (res)
+ _client:send(Protocol.WEB_UPDATE_NOTICE, _data, function(res)
--print("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ",res)
--pt(res)
if res.ReturnCode == 0 and #res.Data.notice_list > 0 then
@@ -284,7 +281,7 @@ function M:UpdateNotice(id,callback)
else
callback(false)
end
- end)
+ end)
end
function M:RequestRecordList(callback, roomid)
@@ -293,15 +290,15 @@ function M:RequestRecordList(callback, roomid)
_data["platform"] = GetPlatform()
local proto
if not roomid then
- proto = Protocol.WEB_GET_MILITARY
- else
+ proto = Protocol.WEB_GET_MILITARY
+ else
proto = Protocol.WEB_GET_MILITARY_BY_ROOMID
_data.roomId = roomid
end
- _client:send(proto, _data, function (res)
+ _client:send(proto, _data, function(res)
self.recordList = nil
-- print(vardump(res))
- if (res.ReturnCode == 0 or res.ReturnCode == 19 ) then
+ if (res.ReturnCode == 0 or res.ReturnCode == 19) then
--self:RequestRankList(callback)
self.recordList = {}
if res.ReturnCode == 19 then return end
@@ -335,8 +332,8 @@ function M:RequestRecordList(callback, roomid)
end
local round_count = record_list_item["round"]
- for j = 1,round_count do
- local round_score_str = record_list_item["round_"..j]
+ for j = 1, round_count do
+ local round_score_str = record_list_item["round_" .. j]
local m_round_game = MGameTimes.new()
if round_score_str then
local round_score_item = json.decode(round_score_str)
@@ -359,50 +356,45 @@ function M:RequestRecordList(callback, roomid)
end)
end
-
-function M:RequestPlayBack(_data,callback,game_info)
+function M:RequestPlayBack(_data, callback, game_info)
if game_info and ExtendHotupdate.CheckVersion(game_info) ~= ExtendHotupdate.VERSION_NORMAL then
- ExtendHotupdate.UpdateGame(game_info,function()
- self:RequestPlayBack(_data,callback)
+ ExtendHotupdate.UpdateGame(game_info, function()
+ self:RequestPlayBack(_data, callback)
end)
return
else
local _client = ControllerManager.WebClient
- _client:send(Protocol.WEB_GET_PLAY_BACK , _data , function (res)
+ _client:send(Protocol.WEB_GET_PLAY_BACK, _data, function(res)
if res.ReturnCode == 0 then
local data = json.decode(res.Data.playback)
local cmdList = data.cmdList
local info = data.info
local extend = ExtendManager.GetExtendConfig(info.game_id)
- local room = extend:NewRoom()
+ local room = extend:NewRoom()
room.game_id = info.game_id
DataManager.CurrenRoom = room
extend:FillPlayBackData(data)
if not room.self_player then
room.self_player = room:GetPlayerBySeat(1)
end
- callback(res.ReturnCode,data)
+ callback(res.ReturnCode, data)
else
- callback(res.ReturnCode,nil)
+ callback(res.ReturnCode, nil)
end
-
end)
end
end
-
-
--获取手机验证码
-function M:GetPhoneCode(phone,callback)
+function M:GetPhoneCode(phone, callback)
local _client = ControllerManager.WebClient
local _data = {}
- _data["phone"]=phone
+ _data["phone"] = phone
_client:send(Protocol.WEB_GET_VERIFCATION_CODE, _data, function(res)
callback(res)
end)
end
-
function M:GetUserInfo(callback)
local _client = ControllerManager.WebClient
_client:send(Protocol.WEB_GET_USER_INFO, nil, function(res)
@@ -419,7 +411,7 @@ function M:GetUserInfo(callback)
end)
end
-function M:UpdateUserInfo(_data,callback)
+function M:UpdateUserInfo(_data, callback)
local _client = ControllerManager.WebClient
_client:send(Protocol.WEB_UPDATE_USER_INFO, _data, function(res)
callback(res)
@@ -427,11 +419,21 @@ function M:UpdateUserInfo(_data,callback)
end
-- 设置被邀请开关
-function M:SetInvited(on, callback)
+function M:SetInvited(on, callback)
local _client = ControllerManager.WebClient
local _data = {}
_data["invitation"] = on
_client:send(Protocol.WEB_SET_GROUP_INVITATED, _data, function(res)
callback(res)
end)
-end
\ No newline at end of file
+end
+
+--找回账号信息
+function M:RetrievePassword(data, callback)
+ local _client = ControllerManager.WebClient
+ local _data = {}
+ _data.data = RSAHelper.Encrypt(json.encode(data))
+ _client:send(Protocol.WEB_BACK_PASSWORD, _data, function(res)
+ callback(res)
+ end)
+end
diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua
index 2ed0f6d0..ca6d9052 100644
--- a/lua_probject/base_project/Game/Controller/LoginController.lua
+++ b/lua_probject/base_project/Game/Controller/LoginController.lua
@@ -31,6 +31,11 @@ local FilterGame = function(games)
end
local function __Login(cmd, _data, callBack)
+ if not UnityEngine.SystemInfo.deviceUniqueIdentifier or #UnityEngine.SystemInfo.deviceUniqueIdentifier < 6 then
+ ViewUtil.CloseModalWait()
+ ViewUtil.ErrorMsg(nil, "", "找不到您的设备信息,若无法登录请联系客服人员解决")
+ return
+ end
local _client = ControllerManager.WebClient
_client:send(cmd, _data, function(res)
if (res.ReturnCode == 0) then
@@ -47,9 +52,9 @@ local function __Login(cmd, _data, callBack)
user.group_id = account["groupId"]
user.type = account["type"]
user.agent = account["mng"]
- -- user.bind_pwd = account["bind_pwd"]
- --默认设置为true
- user.bind_pwd = true
+ user.bind_pwd = data["havePassword"]
+ --默认设置为false,false为进入强制输入密码
+ -- user.bind_pwd = false
user.real_info = account.real_info
user.phone = account.phone
@@ -99,19 +104,24 @@ function M:PhonePasswordLogin(phone, password, callback)
__Login(Protocol.WEB_PHONE_PASSWORD_LOGIN, _data, callback)
end
-function M:IdPasswordLogin2(uid, password, callback)
+function M:IdPasswordLogin(uid, password, callback)
local _data = {}
- _data.data = RSAHelper.Encrypt(json.encode({
- id = tonumber(uid),
- password = password,
- deviceCode = UnityEngine.SystemInfo.deviceUniqueIdentifier
- }))
- print("lingmeng IdPasswordLogin", _data.data)
- -- print("lingmeng IdPasswordLogin RSAHelper", RSAHelper.Decrypt(_data.data))
- __getCode(Protocol.WEB_ID_PASSWORD_LOGIN_2, _data, callback)
+ local result, resultInfo = pcall(function(...)
+ _data.data = RSAHelper.Encrypt(json.encode({
+ id = tonumber(uid),
+ password = password,
+ deviceCode = UnityEngine.SystemInfo.deviceUniqueIdentifier
+ }))
+ end)
+ if result then
+ __getCode(Protocol.WEB_ID_PASSWORD_LOGIN_2, _data, callback)
+ else
+ ViewUtil.CloseModalWait()
+ ViewUtil.ErrorMsg(nil, "", "您的个人信息太长,若无法登录请联系客服人员解决")
+ end
end
-function M:IdPasswordLogin(uid, password, callback)
+function M:IdPasswordLogin2(uid, password, callback)
local _data = {}
_data["id"] = tonumber(uid)
_data["password"] = password
@@ -133,29 +143,36 @@ end
function M:Login(callback)
local user = DataManager.SelfUser
local _data = {}
- _data.data = RSAHelper.Encrypt(json.encode({
- acc = user.acc,
- nick = user.nick_name,
- sex = user.sex,
- portrait = user
- .head_url,
- deviceCode = UnityEngine.SystemInfo.deviceUniqueIdentifier
- }))
- __Login(Protocol.WEB_USER_LOGIN_2, _data, callback)
+ local result = pcall(function(...)
+ _data.data = RSAHelper.Encrypt(json.encode({
+ acc = user.acc,
+ nick = user.nick_name,
+ sex = user.sex,
+ portrait = user
+ .head_url,
+ deviceCode = UnityEngine.SystemInfo.deviceUniqueIdentifier
+ }))
+ end)
+ if result then
+ __Login(Protocol.WEB_USER_LOGIN_2, _data, callback)
+ else
+ ViewUtil.CloseModalWait()
+ ViewUtil.ErrorMsg(nil, "", "您的个人信息太长,若无法登录请联系客服人员解决")
+ end
end
-function M:QuickLogin2(session_id, callback)
+function M:QuickLogin(session_id, callback)
local _data = {}
_data.data = RSAHelper.Encrypt(json.encode({
deviceCode = UnityEngine.SystemInfo.deviceUniqueIdentifier
}))
local _client = ControllerManager.WebClient
_client:setSession(session_id)
- -- ControllerManager.GroupClient:setSession(session_id)
__Login(Protocol.WEB_QUICK_LOGIN_2, _data, callback)
end
-function M:QuickLogin(session_id, callback)
+--快速登入加密
+function M:QuickLogin2(session_id, callback)
local _data = {}
_data["deviceCode"] = UnityEngine.SystemInfo.deviceUniqueIdentifier
local _client = ControllerManager.WebClient
diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua
index 7ad4eae3..a3c30f47 100644
--- a/lua_probject/base_project/Game/Protocol.lua
+++ b/lua_probject/base_project/Game/Protocol.lua
@@ -51,7 +51,8 @@ Protocol = {
----index----
-- 获取公告
WEB_UPDATE_NOTICE = "index/get_notice",
-
+ --找回账号
+ WEB_BACK_PASSWORD = "acc/set_back_password",
diff --git a/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua b/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua
index 884879f7..0b3c0759 100644
--- a/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua
+++ b/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua
@@ -2,6 +2,11 @@ local IDPasswordAlone = {}
local M = IDPasswordAlone
+--黑体字提示
+local Tips1 = { { "当前账号未设置密码,为了您的账号安全请设置密码", "若您为旧用户或者当前账号不属于你,点击左上角可以找回账号" }, { "请输入正确的账号和密码,若忘记请联系客服人员" } }
+--红字提示
+local Tips1 = { { "注:初始账号将强制要求设置密码" }, { "注:找回账号功能会删除现有账户,请勿随便使用" } }
+
function IDPasswordAlone.new(callback)
setmetatable(M, { __index = BaseWindow })
local self = setmetatable({}, { __index = M })
@@ -16,12 +21,28 @@ end
function M:init(url)
BaseWindow.init(self, url)
+ local text_id = self._view:GetChild("tex_phone")
+ local tex_passwd = self._view:GetChild("tex_passwd")
+ text_id.text = DataManager.SelfUser.account_id
- self._view:GetChild("tex_phone").text = DataManager.SelfUser.account_id
+ local ctr_retrieve = self._view:GetController('retrieve')
+ ctr_retrieve.onChanged:Set(function(context)
+ if ctr_retrieve.selectedIndex == 0 then
+ text_id.text = DataManager.SelfUser.account_id
+ tex_passwd.text = ""
+ else
+ text_id.text = ""
+ tex_passwd.text = ""
+ end
+ end)
local btn_ok = self._view:GetChild("btn_ok")
btn_ok.onClick:Set(function()
- self:Bind()
+ if ctr_retrieve.selectedIndex == 0 then
+ self:Bind()
+ else
+ self:Retrieve()
+ end
end)
end
@@ -56,7 +77,7 @@ function M:Bind()
return
end
- _data = {}
+ local _data = {}
ViewUtil.ShowModalWait(self._root_view, "正在提交...")
local loddyctr = ControllerManager.GetController(LoddyController)
@@ -75,4 +96,29 @@ function M:Bind()
end)
end
+--找回账号
+function M:Retrieve()
+ local tex_phone = self._view:GetChild("tex_phone")
+ local text_id = tex_phone.text
+ local tex_passwd = self._view:GetChild("tex_passwd")
+ local password = tex_passwd.text
+
+ local _data = {}
+
+ ViewUtil.ShowModalWait(self._root_view, "正在提交...")
+ local loddyctr = ControllerManager.GetController(LoddyController)
+ _data.password = password
+ _data.id = tonumber(text_id)
+
+ loddyctr:RetrievePassword(_data, function(res)
+ ViewUtil.CloseModalWait()
+ if res.ReturnCode == 0 then
+ PlayerPrefs.DeleteKey('session_id')
+ Application.Quit()
+ else
+ ViewUtil.ErrorTip(res.ReturnCode, "找回账号失败,请联系客服人员")
+ end
+ end)
+end
+
return M
diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua
index 7c717467..fb20ef37 100644
--- a/lua_probject/base_project/Main.lua
+++ b/lua_probject/base_project/Main.lua
@@ -36,14 +36,14 @@ oldGameVersion = 2 --1 原始 2 老游戏新加功能
--主入口函数。从这里开始lua逻辑
function Main()
- --PlayerPrefs.DeleteKey('session_id')
+ -- PlayerPrefs.DeleteKey('session_id')
Application.targetFrameRate = 60
FairyGUI.UIConfig.buttonSound = FairyGUI.NAudioClip(ResourcesManager.LoadObject("base/common/sound/click.mp3",
typeof(UnityEngine.AudioClip)))
FairyGUI.UIConfig.defaultFont = "FZDaBiaoSong-B06S"
FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("SIYUAN", "base/static/fonts/SIYUAN.TTF"), null)
FairyGUI.FontManager.RegisterFont(
- FairyGUI.DynamicFont.New("AlimamaFangYuanTiVF-Thin", "base/static/fonts/AlimamaFangYuanTiVF-Thin.ttf"), null)
+ FairyGUI.DynamicFont.New("AlimamaFangYuanTiVF-Thin", "base/static/fonts/AlimamaFangYuanTiVF-Thin.ttf"), null)
--FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("FZCuYuan-M03","base/static/fonts/FZCuYuan-M03.TTF"),null)
--FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("HYFangLiJ","base/static/fonts/HYFangLiJ.ttf"),null)
_game_info = json.decode(GameApplication.Instance.GameInfo)
@@ -321,7 +321,7 @@ function LuaPrint(lua_table, limit, indent, step)
local kk, vv = next(v._fields)
if type(vv) == "table" then
content = content .. "\n\t" .. kk.name .. "={" .. LuaPrint(vv._fields, 5, indent + 1, step + 1) ..
- "}"
+ "}"
else
content = content .. "\n\t" .. kk.name .. "=" .. vv
end
diff --git a/wb_new_ui/assets/Lobby/component/user_info/btn_mul.xml b/wb_new_ui/assets/Lobby/component/user_info/btn_mul.xml
new file mode 100644
index 00000000..bb24fd71
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/user_info/btn_mul.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/real/Group 923.png b/wb_new_ui/assets/Lobby/component/user_info/real/Group 923.png
new file mode 100644
index 00000000..d8abf1c9
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/real/Group 923.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/real/Group 924.png b/wb_new_ui/assets/Lobby/component/user_info/real/Group 924.png
new file mode 100644
index 00000000..40c5b1eb
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/real/Group 924.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png b/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png
index c3067f66..f0bf6f42 100644
Binary files a/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png and b/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/real/xiugaimiam.png b/wb_new_ui/assets/Lobby/component/user_info/real/xiugaimiam.png
new file mode 100644
index 00000000..f854b901
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/real/xiugaimiam.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/real/zhaohuizhanghao.png b/wb_new_ui/assets/Lobby/component/user_info/real/zhaohuizhanghao.png
new file mode 100644
index 00000000..41287f74
Binary files /dev/null and b/wb_new_ui/assets/Lobby/component/user_info/real/zhaohuizhanghao.png differ
diff --git a/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml b/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml
index b7ba4ad8..159e9091 100644
--- a/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml
+++ b/wb_new_ui/assets/Lobby/component/user_info/win_id_password_alone.xml
@@ -1,21 +1,35 @@
+
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/component/user_info/win_retrieve_alone.xml b/wb_new_ui/assets/Lobby/component/user_info/win_retrieve_alone.xml
new file mode 100644
index 00000000..86d004bd
--- /dev/null
+++ b/wb_new_ui/assets/Lobby/component/user_info/win_retrieve_alone.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/package.xml b/wb_new_ui/assets/Lobby/package.xml
index 48e4e590..d3d7173d 100644
--- a/wb_new_ui/assets/Lobby/package.xml
+++ b/wb_new_ui/assets/Lobby/package.xml
@@ -687,6 +687,12 @@
+
+
+
+
+
+
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 6fb6f64d..48ce4a71 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_atlas0_1.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png
index 0d4e5e28..06f37c19 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_1.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_10.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_10.png
index 3a200258..f6bc96bc 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_10.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_10.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_11.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_11.png
index fc4dd988..678546d1 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_11.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_11.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_12.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_12.png
index ecb52af1..204ff604 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_12.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_12.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_13.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_13.png
index 1daf9367..5c7a410e 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_13.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_13.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_14.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_14.png
index 4a40a6c3..5f6951c4 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_14.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_14.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_15.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_15.png
index 3a1e38b9..c07ec4eb 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_15.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_15.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_16.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_16.png
index ecd4d033..9bb026c2 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_16.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_16.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_17.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_17.png
index 261cd719..c760aa61 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_17.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_17.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_18.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_18.png
index 391dc9ff..93b2efdf 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_18.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_18.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_19.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_19.png
index 9046ef88..bd804593 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_19.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_19.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png
index a49c7a79..1b5280a4 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_2.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_20.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_20.png
index a56cb347..5e84fca5 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_20.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_20.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_21.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_21.png
index 817fb1c4..1452be15 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_21.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_21.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_22.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_22.png
index 2afc72c7..bfeaea25 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_22.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_22.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_23.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_23.png
index c5a9cc10..03e85a3d 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_23.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_23.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_24.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_24.png
index 5030bb68..6d640302 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_24.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_24.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_25.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_25.png
index 6ab0ec97..d2167b6c 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_25.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_25.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_26.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_26.png
index ad0b1fea..70369327 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_26.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_26.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_27.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_27.png
index 270c1014..95857f3d 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_27.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_27.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_28.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_28.png
index 8e2a0131..62889177 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_28.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_28.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_29.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_29.png
index e316899c..309cd9f0 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_29.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_29.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png
index 68ce5d87..08caab9a 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_3.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_30.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_30.png
index 6328a8af..6d101ae1 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_30.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_30.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_31.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_31.png
index cd4e8fc8..1f484421 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_31.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_31.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_32.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_32.png
index 4437e23e..50f7ced4 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_32.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_32.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_34.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_34.png
index 7eb647f8..107a7e28 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_34.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_34.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_39.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_39.png
index d82229a9..1d924152 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_39.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_39.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png
index b26a5868..74243a7c 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_4.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_42.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_42.png
index 3aac3e36..a49ab699 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_42.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_42.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_43.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_43.png
index 4a9cde99..3fd68cb5 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_43.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_43.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_44.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_44.png
index a14da025..15be1627 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_44.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_44.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_46.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_46.png
index 6ebe3e3b..4de1f71b 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_46.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_46.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_47.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_47.png
index 1b718c12..0e3c1364 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_47.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_47.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_48.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_48.png
index 27e02cc1..28c051a9 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_48.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_48.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png
index e1429c7e..9db02f3f 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_5.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_50.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_50.png
index 17d888de..02a14021 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_50.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_50.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_51.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_51.png
index 3143c79b..b5bdab6a 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_51.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_51.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_52.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_52.png
index 3b66c2e6..de287c4b 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_52.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_52.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_53.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_53.png
index 6a2bc3fd..3b66c2e6 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_53.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_53.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_54.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_54.png
index 356ebf6a..f8717678 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_54.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_54.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_55.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_55.png
index 68d6ef36..ddd870f7 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_55.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_55.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_56.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_56.png
index 8cf6a98f..63be654c 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_56.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_56.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_57.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_57.png
index 9d603638..1652b0d7 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_57.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_57.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_59.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_59.png
index d70a35c3..2fdbb2c4 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_59.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_59.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png
index 19850841..84c96bdd 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_6.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_62.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_62.png
index a88dcded..bfed11dc 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_62.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_62.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png
index 9c9fc3d6..95fa097a 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_7.png differ
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.png b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.png
index 401049bc..f62dd23d 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.png and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_8.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 c4f4f96a..2d0a79e3 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