同步

lua_probject/base_project/Game/Controller/GameController.lua

@@ -671,12 +671,12 @@ function M:ReturnToRoom()
         false,
         function(response)
             if (response.ReturnCode == -1) then
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
                 RestartGame()
                 return
             end
             ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
-            ViewUtil.CloseModalWait('join_room')
+            ViewUtil.CloseModalWait2('join_room')
         end,
         self.tmpGroupID
     )

lua_probject/base_project/Game/Controller/LoddyController.lua

@@ -92,9 +92,12 @@ function M:CreateRoom(game_id, dataInfo, callback)
 
 			local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
 			room.game_id = game_id
+			room.game_info = game_info
+
 			room.room_id = room_id
 			room.server_host = string.concat(server_ip, ":", server_port)
 			room.session = _client:getSession()
+			room._flag_lobby = true
 			DataManager.CurrenRoom = room
 
 			local game_net = nil
@@ -174,7 +177,9 @@ function M:PublicJoinRoom(cmd, room_id, callback, group_id, group_layer)
 			room.server_host = string.concat(server_ip, ":", server_port)
 			room.session = _client:getSession()
 			room.group_id = json["groupId"]
+			room.game_info = game_info
 			room.play_id = json["pid"]
+			room._flag_lobby = true
 			-- 体力值开关
 			room.hpOnOff = json["hpOnOff"]
 			-- 体力值倍数
@@ -242,6 +247,7 @@ function M:ResetJionRoom(callback)
 	room.hpOnOff = o_room.hpOnOff
 	room.owner_id = o_room.owner_id
 	room.create_time = o_room.create_time
+	room._flag_lobby = true
 	room:SetReloadStatus(true)
 	DataManager.CurrenRoom = room
 	__ConntectGameServer(Protocol.GAME_JOIN_ROOM, room, room.server_host, j_data, function(res1)
@@ -390,14 +396,14 @@ function M:RequestPlayBack(_data, callback, game_info)
 end
 
 --获取手机验证码
-function M:GetPhoneCode(phone, callback)
-	local _client = ControllerManager.WebClient
-	local _data = {}
-	_data["phone"] = phone
-	_client:send(Protocol.WEB_GET_VERIFCATION_CODE, _data, function(res)
-		callback(res)
-	end)
-end
+-- function M:GetPhoneCode(phone, callback)
+-- 	local _client = ControllerManager.WebClient
+-- 	local _data = {}
+-- 	_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
@@ -485,3 +491,42 @@ function M:GetServiceInfo(data, callback)
 		end
 	end)
 end
+
+--手机验证码
+function M:GetPhoneCode(phone, callback)
+	--不走登录逻辑
+	local _client = ControllerManager.WebClient
+	local _data = {}
+	_data["phone"] = phone
+	if DataManager.SelfUser.phone and #DataManager.SelfUser.phone then
+		return
+	end
+	_client:send(Protocol.WEB_GET_Phone_Code, _data, function(res)
+		if (callback ~= nil) then
+			callback(res)
+		end
+	end)
+end
+
+--绑定手机验证码
+function M:PhoneBind(phone, code, callback)
+	local _client = ControllerManager.WebClient
+	local _data = {}
+	_data["phone"] = phone
+	_data["code"] = code
+	_client:send(Protocol.WEB_BIND_Phone, _data, function(res)
+		if (callback ~= nil) then
+			callback(res)
+		end
+	end)
+end
+
+-- 获取亲友圈房卡记录
+function M:FG_Get_Diamond_Msg(callback)
+	local _data = {}
+	_data.id = DataManager.SelfUser.account_id
+	local _client = ControllerManager.GroupClient
+	_client:send(Protocol.WEB_Get_Diamond_Mssages, _data, function(res)
+		callback(res)
+	end)
+end

lua_probject/base_project/Game/Controller/LoginController.lua

@@ -82,7 +82,7 @@ function M:GetPhoneCode(phone, callback)
     local _client = ControllerManager.WebClient
     local _data = {}
     _data["phone"] = phone
-    _client:send(Protocol.WEB_GET_VERIFCATION_CODE, _data, function(res)
+    _client:send(Protocol.WEB_GET_Phone_Code, _data, function(res)
         if (callback ~= nil) then
             callback(res)
         end
@@ -93,7 +93,7 @@ function M:PhoneLogin(phone, code, callback)
     local _data = {}
     _data["phone"] = phone
     _data["code"] = code
-    __Login(Protocol.WEB_PHONE_LOGIN, _data, callback)
+    __Login(Protocol.WEB_LOGIN_Phone, _data, callback)
 end
 
 --手机密码登录
@@ -118,6 +118,13 @@ function M:Login(callback)
     _data["nick"] = user.nick_name
     _data["sex"] = user.sex
     _data["portrait"] = user.head_url
+    local sys_type = 2
+    if GetPlatform() == "Android" then
+        sys_type = 0
+    elseif GetPlatform() == "iOS" then
+        sys_type = 1
+    end
+    _data["sys_type"] = sys_type
     __Login(Protocol.WEB_USER_LOGIN, _data, callback)
 end
 

lua_probject/base_project/Game/Controller/RoomController.lua

@@ -77,6 +77,7 @@ function M:CreateRoom(game_id, _data, callback)
 
 			local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
 			room.game_id = game_id
+			room.game_info = game_info
 			room.room_id = room_id
 			room.server_host = string.concat(server_ip, ":", server_port)
 			room.session = _client:getSession()
@@ -201,6 +202,7 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 			room.session = _client:getSession()
 			-- 圈子信息，圈子id和玩法id
 			room.group_id = json["groupId"]
+			room.game_info = game_info
 			-- 圈子禁止文字聊天，禁止语音聊天
 			--room.ban_chat1 = json["ban_chat1"]
 			--room.ban_chat2 = json["ban_chat2"]

lua_probject/base_project/Game/Data/GroupData.lua

@@ -138,10 +138,12 @@ function M:addPlay(play)
 	--printlog("添加玩法addPlay===>>>")
 	--pt(play)
 	local maxRound = 0
+	local hpdata = json.decode(play.hpData)
 	if play.maxRound then
 		maxRound = play.maxRound
+		hpdata.maxRound = maxRound
+		play.hpData = json.encode(hpdata)
 	else
-		local hpdata = json.decode(play.hpData)
 		maxRound = hpdata.maxRound
 	end
 

lua_probject/base_project/Game/ExtendHotupdate.lua

@@ -60,7 +60,8 @@ local function __update_check(data, onback, _version_view)
             if game_data["size"] then
                 printlog("lingmeng down", download_size, version_update.Progress, game_data["size"])
                 onback(
-                download_size + (version_update.Progress > 1 and 1 or version_update.Progress) * game_data["size"], false)
+                    download_size + (version_update.Progress > 1 and 1 or version_update.Progress) * game_data["size"],
+                    false)
             else
                 onback(version_update.Progress, false)
                 tex_tip.text = version_update.TextTip
@@ -127,7 +128,7 @@ function ExtendHotupdate.UpdateGame(data, callback)
         if callback then callback() end
         return
     end
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
     NetResetConnectWindow.CloseNetReset()
     local _version_view = UIPackage.CreateObjectFromURL("ui://Common/ExtendHotUpdate")
     _version_view:GetChild("tex_info").text = "正在检查资源。。。"

lua_probject/base_project/Game/Protocol.lua

@@ -49,6 +49,14 @@ Protocol = {
     ACC_GET_DIAMONDRECORD    = "acc/get_recharge_diamo_list",
     ---获取客服信息
     WEB_GET_SERVICEINFO      = "acc/get_customer_service",
+    ---获取手机验证码
+    WEB_GET_Phone_Code       = "acc/get_verification_code",
+    ---绑定手机号码
+    WEB_BIND_Phone           = "acc/binding_phone",
+    ---手机号码登录
+    WEB_LOGIN_Phone          = "acc/phone_login",
+    -- 获取自己房卡记录
+    WEB_Get_Diamond_Mssages  = "acc/get_diamo_messages",
     ----index----
     -- 获取公告
     WEB_UPDATE_NOTICE        = "index/get_notice",

lua_probject/base_project/Game/View/FGAssistView.lua

@@ -200,7 +200,7 @@ function M:GetOnlinePlayers(index)
                 ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败")
             else
                 fgCtr:FG_EnterGroup(self.group_id, function(res)
-                    ViewUtil:CloseModalWait()
+                    ViewUtil:CloseModalWait2()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "连接亲友圈失败")
                     else

lua_probject/base_project/Game/View/Family/CreatePlayView.lua

@@ -95,7 +95,7 @@ function M:CreatePlay()
     -- loddyCtr:CreateRoom(gameId,_data, function (res)
     --         self:__OnCreateRoomAction(res)
     -- end)
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
 end
 
 function M:initePlayInfo()

lua_probject/base_project/Game/View/Family/FamilAllRank.lua

@@ -134,6 +134,7 @@ function M:SearchRank()
 end
 
 function M:RecursionSearchRank(fgCtr, index, begin_time, end_time)
+    ViewUtil:ShowModalWait2()
     fgCtr:FG_GetMemberRank(self.group_id, 0, index * 2, 2, begin_time, end_time, nil, function(res)
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取排行榜失败")
@@ -144,6 +145,7 @@ function M:RecursionSearchRank(fgCtr, index, begin_time, end_time)
                 self:RankTableInsert(info.ranks)
                 self:RecursionSearchRank(fgCtr, index + 1, begin_time, end_time)
             else
+                ViewUtil.CloseModalWait2()
                 table.sort(self.roundRanks, function(a, b)
                     return a.round > b.round
                 end)

lua_probject/base_project/Game/View/Family/FamilyAllNumbers.lua

@@ -23,7 +23,7 @@ function M:Reflash(group)
             numbers = self._group.members
             -- print("==========================res.Data.members")
             pt(self._group.members)
-            ViewUtil:CloseModalWait()
+            ViewUtil:CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
             else
@@ -92,7 +92,9 @@ function M:FillList(numbers)
 
         obj.onClick:Set(function()
             print("lingmengtextBtn_detail")
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_FindMember(self._group.id, numbers[i].uid, function(res)
+                ViewUtil.CloseModalWait2()
                 local familyNumberDetail = FamilyNumberDetail.new(self._group.id, self._group.lev, res)
                 familyNumberDetail:SetTickCallback(handler(self, self.TickNumberCallback))
                 familyNumberDetail:SetRefrenCallback(handler(self, self.RefrenMemberCallback))
@@ -124,7 +126,7 @@ function M:RefrenMemberCallback()
         fgCtr:FG_GroupMembers(self._group.id, 0, self._group.total_member_num, false, 1, function(res)
             numbers = self._group.members
             -- print("==========================res.Data.members")
-            ViewUtil:CloseModalWait()
+            ViewUtil:CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
             else

lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua

@@ -55,7 +55,9 @@ end
 function FamilyAuditNumber:Show(group)
     self._group = group
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_GroupJoins(self._group.id, function(res)
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
             return
@@ -73,7 +75,9 @@ end
 
 function FamilyAuditNumber:ClickBtn(isAllow, uid, tag)
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_GroupVerifyJoin(self._group.id, uid, isAllow == 1, function(res)
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
         else

lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua

@@ -75,8 +75,10 @@ local function AddPlayer(data, self)
         players[#players + 1] = number.uid
         self.sending = true
         local fgCtr = ControllerManager.GetController(NewGroupController)
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
             self.sending = false
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(-1, "设置失败")
                 return
@@ -111,8 +113,10 @@ local function DelPalyer(data, uid, self)
 
     self.sending = true
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, players, data.deskName, function(res)
         self.sending = false
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(-1, "删除失败")
             return
@@ -134,7 +138,9 @@ local function DelDesk(data, self)
 
     self.sending = true
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_SetBanTable1(self.root._group.id, data.deskId, {}, data.deskName, function()
+        ViewUtil.CloseModalWait2()
         self.sending = false
         self:Reflash()
     end)
@@ -142,7 +148,9 @@ end
 
 local function ChangeName(deskData, name, self)
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_SetBanTable1(self.root._group.id, deskData.deskId, AllUid(deskData.deskList), name, function(res)
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(-1, "删除失败")
             return
@@ -315,7 +323,9 @@ function BanDesk:Reflash()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local groupId = self.root._group.id
 
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_GetBanTable1(groupId, function(res)
+        ViewUtil.CloseModalWait2()
         self:GetBanTableCallback(res)
     end)
 end
@@ -338,7 +348,9 @@ function BanDesk:GetBanTableCallback(res)
         local fgCtr = ControllerManager.GetController(NewGroupController)
         local groupId = self.root._group.id
         local banList = {}
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_SetBanTable1(groupId, -1, banList, "新建关系", function()
+            ViewUtil.CloseModalWait2()
             self.sending = false
             self:Reflash()
         end)

lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua

@@ -191,7 +191,7 @@ function FamilyChatRoom:Show()
 
     mgr_ctr:FG_ENTER_CHATROOM(self.root._group.id, getData, function(res)
         if res.returnCode == 0 then
-            ViewUtil.ShowModalWait(self._root_view, "正在加载聊天室......")
+            ViewUtil.ShowModalWait2(self._root_view, "正在加载聊天室......")
         end
     end)
 

lua_probject/base_project/Game/View/Family/FamilyEventView.lua

@@ -224,7 +224,7 @@ function M:_evtChatRoomData(...)
         return
     end
     view.com_FamilyChatRoom:Refalsh()
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
 end
 
 function M:_evtOnNewRecord(...)

lua_probject/base_project/Game/View/Family/FamilyInviteFamilyView.lua

@@ -5,11 +5,13 @@ local FamilyInviteFamilyView = {}
 local M = FamilyInviteFamilyView
 setmetatable(M, { __index = BaseWindow })
 
-function FamilyInviteFamilyView.new()
+function FamilyInviteFamilyView.new(curGroup)
     local self = setmetatable({}, { __index = M })
     self.class = 'FamilyInviteFamilyView'
     self._close_destroy = true
+    self._close_zone = false
     self._new_hide = false
+    self._curGroup = curGroup
     self:init('ui://Family/InviteFamily')
     return self
 end
@@ -18,11 +20,17 @@ function M:init(url)
     BaseWindow.init(self, url)
 
     local view = self._view
+    local tem = self._curGroup
+    local data = {}
+    data.title = string.format('亲友圈【%s】,ID【%s】,期待您的加入！', tem.name, tem.id)
+    data.description = "快来加入趣友麻将吧，妈妈再也不担心我串房间了，和趣友麻将小伙伴们一起玩耍吧"
     view:GetChild('btn_wx').onClick:Add(function()
-        ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
+        data.type = 0
+        ViewUtil.__share(data)
     end)
     view:GetChild('btn_moments').onClick:Add(function()
-        ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
+        data.type = 1
+        ViewUtil.__share(data)
     end)
 end
 

lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua

@@ -3,8 +3,10 @@ local tipsWindow = import("..Common.tipsWindow")
 local FamilyJoinAndCreate = {}
 
 local function SendJoinRoom(self, roomId, remark)
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_JoinGroup(tonumber(roomId), function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode)
             end
@@ -43,8 +45,10 @@ function FamilyJoinAndCreate:init(root)
     end)
 
     self._view:GetChild('btn_c').onClick:Set(function()
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_GroupList(function(res)
             fgCtr:FG_CreateGroup(self.input_name.text, 1, 2, function(res)
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode == 0 then
                     root.familyType.selectedIndex = 1
                     root:ConnetFamily(1, DataManager.groups.groupList, true)

lua_probject/base_project/Game/View/Family/FamilyMsgDiamond.lua

@@ -3,7 +3,7 @@ local FamilyMsgDiamond = {}
 local M = FamilyMsgDiamond
 
 --类型字段，1为进入游戏预扣，2为结束游戏返还
-local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您" }
+local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您", "您为亲友圈充值" }
 
 function M.New(data, callback)
     setmetatable(M, { __index = BaseWindow })
@@ -25,7 +25,9 @@ function M:Init()
     end
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_Get_Diamond_Msg(self.data.groupId, function(res)
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取房卡记录失败")
         else

lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua

@@ -3,7 +3,9 @@ local FamilyMsgRecord = {}
 -- m_state : 进入亲友圈(0)退出亲友圈(1)，创建亲友圈(2)，踢出亲友圈(3)
 local function RequestData(self, groupId)
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_Get_Msg(groupId, function(res)
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode)
             return

lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua

@@ -12,8 +12,10 @@ local root = {}
 
 local function ChangeFamilyConfig(data, self)
     local fgCtr = ControllerManager.GetController(NewGroupController)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_UpdateGroupInfo(data,
         function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "更改失败,请稍后再试")
             else
@@ -58,7 +60,9 @@ local function QuitFamily(self)
         self.networkSending = true
         local fgCtr = ControllerManager.GetController(NewGroupController)
         print("发送了退出协议 familyid = ", self.family.id)
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_ExitGroup(self.family.id, function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 return
             end
@@ -120,11 +124,11 @@ function FamilyMyFamily:Show(groupId)
     Broadcast.AddListener(BroadcastEvent.OnJoinsChange, self.ReflashJoinsRedPoint, self)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈数据......")
+    ViewUtil.ShowModalWait2(self._root_view, "正在加载亲友圈数据......")
     fgCtr:WEB_FG_GET_GROUP_DETAIL(self.groupId, function(res)
         print("收到家族的详细信息")
         pt(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode)
         end
@@ -333,9 +337,11 @@ function FamilyMyFamily:Init()
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
         self.networkSending = true
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_SetGroupShow(0, self.family.id, function(res)
             print("收到协议M:FG_SetGroupShow")
             pt(res)
+            ViewUtil.CloseModalWait2()
             self.networkSending = false
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode)
@@ -357,9 +363,11 @@ function FamilyMyFamily:Init()
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
         self.networkSending = true
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_SetGroupShow(1, self.family.id, function(res)
             print("收到协议M:FG_SetGroupShow")
             pt(res)
+            ViewUtil.CloseModalWait2()
             self.networkSending = false
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode)
@@ -380,7 +388,9 @@ function FamilyMyFamily:Init()
         self.networkSending = true
         local fgCtr = ControllerManager.GetController(NewGroupController)
         print("发送了退出协议 familyid = ", self.family.id)
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_ExitGroup(self.family.id, function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 return
             end

lua_probject/base_project/Game/View/Family/FamilyNumberDetail.lua

@@ -63,7 +63,9 @@ function M:init(url, lev, res)
                 ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
                 return
             end
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetJoinScore(self.groupId, info.uid, tonumber(text) or 0, MJScore, function(res)
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else
@@ -87,7 +89,9 @@ function M:init(url, lev, res)
                 ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
                 return
             end
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetJoinScore(self.groupId, info.uid, MJScore, tonumber(text) or 0, function(res)
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else
@@ -116,7 +120,9 @@ function M:init(url, lev, res)
             MsgWindow.new(self._root_view, string.format("是否禁止用户(%s)进入房间", info.nick), MsgWindow.MsgMode.OkAndCancel)
         _curren_msg.onOk:Add(
             function()
+                ViewUtil.ShowModalWait2()
                 fgCtr:FG_BanMember(self.groupId, info.uid, 1 - flag_band, 1, function()
+                    ViewUtil.CloseModalWait2()
                     if res.ReturnCode == 0 then
                         flag_band = 1 - flag_band
                         self._view:GetChild('btn_band'):GetController('band').selectedIndex = flag_band
@@ -143,7 +149,9 @@ function M:init(url, lev, res)
                 flag_assistant == 1 and "助理身份" or "设置为助理"), MsgWindow.MsgMode.OkAndCancel)
         _curren_msg.onOk:Add(
             function()
+                ViewUtil.ShowModalWait2()
                 fgCtr:FG_SetManager(self.groupId, info.uid, flag_assistant + 1, function(res)
+                    ViewUtil.CloseModalWait2()
                     if res.ReturnCode == 0 then
                         local g = DataManager.groups.groupMap[self.groupId]
                         local player = g.memberMap[info.uid]

lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua

@@ -87,7 +87,9 @@ function FamilyNumberRecord.New(root, page)
         self._data_leftTime = os.time(timeTable) - index * 86400
         self._data_rightTime = os.time(timeTable) - index * 86400 + 86399
         self:OnClickSortType()
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_GetConsumeStat(group_id, self._data_leftTime, self._data_rightTime, function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取总信息失败")
             else
@@ -135,7 +137,9 @@ function FamilyNumberRecord.New(root, page)
             return
         end
         --写限制分数
+        ViewUtil.ShowModalWait2()
         fgCtr:FG_SetGroupRecordUpdateDayType(group_id, ctr_limitDay.selectedIndex + 1, function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "分数限制分设置失败")
                 self.ctr_limitDay_isReverting = true
@@ -206,7 +210,9 @@ function FamilyNumberRecord.New(root, page)
                 ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
                 return
             end
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetJoinScore(group_id, 0, tonumber(text) or 0, self.MJScore, function(res)
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else
@@ -236,7 +242,9 @@ function FamilyNumberRecord.New(root, page)
                 ViewUtil.ShowOneChooose({ showText = "请输入正确的权限分" })
                 return
             end
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetJoinScore(group_id, 0, self.MJScore, tonumber(text) or 0, function(res)
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "修改限制分失败")
                 else
@@ -267,8 +275,10 @@ function FamilyNumberRecord.New(root, page)
         local _curren_msg = MsgWindow.new(self._root_view, newReadType == 1 and "确定要将选中的对局设置为未读" or "确定要将选中的对局设置为已读",
             MsgWindow.MsgMode.OkAndCancel)
         _curren_msg.onOk:Add(function()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetGroupRecordReadStatus(group_id, GetPlatform(), self.military.list, newReadType - 1, self._tagId,
                 function(res)
+                    ViewUtil.CloseModalWait2()
                     pt(res)
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "修改战绩阅读状态失败")
@@ -322,8 +332,9 @@ function FamilyNumberRecord.New(root, page)
             btn_reflash.grayed = false
         end)
     end)
-
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_GetConsumeStat(group_id, self._data_leftTime, self._data_rightTime, function(res)
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取总信息失败")
         else
@@ -605,9 +616,11 @@ function M:OnClickSortType()
 end
 
 function M:RecursionGetNumberRank(fgCtr, index, round, win, cost)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_GetMemberRank_2(self.group_id, 0, index * 67, 67, self._data_leftTime, self._data_rightTime,
         self._data_seletedType, self._data_sortType,
         function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取排行榜失败")
                 return

lua_probject/base_project/Game/View/Family/FamilyRecord.lua

@@ -139,8 +139,10 @@ function M:ShowNumberRecord()
 end
 
 function M:RecursionRecord(fgCtr, index, uid, leftTime, rightTime)
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_GetGroupRecordSpe2(self.group_id, GetPlatform(), uid, 0, index * 60, 60, leftTime, rightTime, 0,
         function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "查看个人战绩失败")
                 self.visible = false

lua_probject/base_project/Game/View/Family/FamilyRoomCard.lua

@@ -18,7 +18,9 @@ local function charge(num, self)
     _curren_msg.onOk:Add(
         function()
             local fgCtr = ControllerManager.GetController(NewGroupController)
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_Recharge_Diamo(self.groupId, num, function(res)
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "重置房卡操作失败")
                     return

lua_probject/base_project/Game/View/Family/PlayEditView.lua

@@ -81,7 +81,9 @@ function PlayEditView:Init()
             obj:GetChild('btn_del').onClick:Set(function()
                 ViewUtil.ShowTwoChooose("是否要删除该玩法", function()
                     local fgCtr = ControllerManager.GetController(NewGroupController)
+                    ViewUtil.ShowModalWait2()
                     fgCtr:FG_DelPlay(self.groupId, playList[index].id, function(res)
+                        ViewUtil.CloseModalWait2()
                         if res.ReturnCode ~= 0 then
                             ViewUtil.ErrorTip(res.ReturnCode, "删除玩法操作失败")
                             return

lua_probject/base_project/Game/View/FamilyView.lua

@@ -268,6 +268,13 @@ function M:init(url)
             self._data_falshRoomTime = 20
         end)
     end
+
+    local btn_inviteFriends = self._view:GetChild('btn_inviteFriends')
+    if btn_inviteFriends then
+        btn_inviteFriends.onClick:Set(function()
+            self:ShareWx()
+        end)
+    end
 end
 
 function M:Reflash()
@@ -324,7 +331,7 @@ function M:InitCloseClick()
 end
 
 function M:ShareWx()
-    local familyInviteFamilyView = FamilyInviteFamilyView.new()
+    local familyInviteFamilyView = FamilyInviteFamilyView.new(self._group)
     familyInviteFamilyView:Show()
 end
 
@@ -529,7 +536,7 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type)
         self.members = SortMembers(self._group.members) --local members = self._group.members
         print("FG_GroupMembers12")
         pt(self._group.members)
-        --ViewUtil:CloseModalWait()
+        --ViewUtil:CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
         else
@@ -566,7 +573,7 @@ end
 
 function M:EnterGroup(fgCtr, id)
     fgCtr:FG_EnterGroup(id, function(res)
-        ViewUtil:CloseModalWait()
+        ViewUtil:CloseModalWait2()
         ViewUtil:CloseModalWait2()
         if res.ReturnCode ~= 0 then
             if res.ReturnCode == 101 then
@@ -594,10 +601,10 @@ function M:OnEnterGroupCallBack()
 
     self:UpdateFamilyRoom(fgCtr, self._group.id)
 
-    --ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......")
+    --ViewUtil.ShowModalWait2(self._root_view, "正在加载亲友圈权限中......")
     --self:ChangeOther()
 
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
 
     self:ReflashChatRoomRedPoint()
 
@@ -843,7 +850,7 @@ function M:JieSanRomm(groupId, roomId)
         )
     _curren_msg.onOk:Add(
         function()
-            ViewUtil.ShowModalWait(self._root_view)
+            ViewUtil.ShowModalWait2(self._root_view)
             local fgCtr = ControllerManager.GetController(NewGroupController)
 
             fgCtr:FG_RemoveRoom(
@@ -853,7 +860,7 @@ function M:JieSanRomm(groupId, roomId)
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！')
                         return
@@ -871,14 +878,14 @@ function M:ReflashFamilyList()
 end
 
 function M:ConnetFamily(index, groups)
-    ViewUtil.ShowModalWait(self._root_view, "正在加载成员列表中......")
+    ViewUtil.ShowModalWait2(self._root_view, "正在加载成员列表中......")
 
     if self._group then
         FamilyOffline(self._group.id, self)
     end
 
     UpdateBeat:Remove(self.OnUpdate, self)
-    ViewUtil:CloseModalWait()
+    ViewUtil:CloseModalWait2()
     self._group = DataManager.groups:get(groups[index].id)
     DataManager.CurrenGroup = self._group
     self._view:GetChild('text_familyId').text = self._group.id
@@ -889,21 +896,21 @@ function M:ConnetFamily(index, groups)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
 
-    ViewUtil.ShowModalWait(self._root_view, "正在进入亲友圈......")
+    ViewUtil.ShowModalWait2(self._root_view, "正在进入亲友圈......")
     Utils.SaveLocalFile("Family_lastID" .. DataManager.SelfUser.account_id, self._group.id)
     self:EnterGroup(fgCtr, self._group.id)
 
     --[[
-    ViewUtil.ShowModalWait(self._root_view, "正在加载亲友圈权限中......")
+    ViewUtil.ShowModalWait2(self._root_view, "正在加载亲友圈权限中......")
     self:ChangeOther(tonumber(self._group.lev) + 1)
     allLoad = 1
 
-    ViewUtil.ShowModalWait(self._root_view, "正在加载成员列表中......")
+    ViewUtil.ShowModalWait2(self._root_view, "正在加载成员列表中......")
     allLoad = allLoad +
         self:ChangeNumber(fgCtr, self._group.id, 0, self._group.total_member_num, false,
             1)
 
-    ViewUtil.ShowModalWait(self._root_view, "正在加载房间列表中......")
+    ViewUtil.ShowModalWait2(self._root_view, "正在加载房间列表中......")
 
     allLoad = allLoad + self:EnterGroup(fgCtr, self._group.id)
     ]]

lua_probject/base_project/Game/View/Lobby/CreateRoomView.lua

@@ -185,7 +185,7 @@ function M:OnCreateRoom(mode_data)
         end
 
 
-        ViewUtil.ShowModalWait(self._root_view, "正在创建房间...")
+        ViewUtil.ShowModalWait2(self._root_view, "正在创建房间...")
         loddyCtr:CreateRoom(game_id, { _data = _data, hpData = self.hpData, name = name }, function(res)
             self:__OnCreateRoomAction(res)
         end)
@@ -193,7 +193,7 @@ function M:OnCreateRoom(mode_data)
 end
 
 function M:__OnCreateRoomAction(response)
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
     if (response.ReturnCode == -2) then
         return
     end

lua_probject/base_project/Game/View/Lobby/DiamondRecord.lua

@@ -3,7 +3,7 @@ local DiamondRecord = {}
 local M = DiamondRecord
 
 --类型字段，1为进入游戏预扣，2为结束游戏返还
-local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您" }
+local TypeTable = { "亲友圈开局游戏预扣", "因游戏结束返还您", "您为亲友圈充值" }
 
 function M.New(data, callback)
     setmetatable(M, { __index = BaseWindow })
@@ -26,6 +26,15 @@ function M:Init()
     end
 
     --大厅的请求
+    local lobbyCtr = ControllerManager.GetController(LoddyController)
+    lobbyCtr:FG_Get_Diamond_Msg(function(res)
+        if res.ReturnCode ~= 0 then
+            ViewUtil.ErrorTip(res.ReturnCode, "获取房卡记录失败")
+        else
+            self.msgData = res.Data.messages
+            list_msg.numItems = #self.msgData
+        end
+    end)
 end
 
 function M:msgRenderer(index, obj)

lua_probject/base_project/Game/View/Lobby/EditNickView.lua

@@ -28,13 +28,13 @@ function M:init(url)
 			ViewUtil.ErrorTip(nil, "昵称不能为空")
 			return
 		end
-        ViewUtil.ShowModalWait(self._root_view, "正在连接服务器")
+		ViewUtil.ShowModalWait2(self._root_view, "正在连接服务器")
 		local loddyctr = ControllerManager.GetController(LoddyController)
 		local _data = {}
 		_data.type = 7
 		_data.nick = nick
 		loddyctr:UpdateUserInfo(_data, function(res)
-	        ViewUtil.CloseModalWait()
+			ViewUtil.CloseModalWait2()
 			if (res.ReturnCode == 0) then
 				DataManager.SelfUser.nick_name = nick
 			else

lua_probject/base_project/Game/View/Lobby/JoinRoomView.lua

@@ -64,10 +64,10 @@ function M:OnNumButtonAction(context)
 end
 
 function M:JoinRoom(str)
-    ViewUtil.ShowModalWait(self._root_view, "正在加入房间...")
+    ViewUtil.ShowModalWait2(self._root_view, "正在加入房间...")
     local boddyCtr = ControllerManager.GetController(LoddyController)
     boddyCtr:JoinRoom(str, function(response)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if response.ReturnCode == -2 then
             self:JoinRoom(str)
             return

lua_probject/base_project/Game/View/Lobby/LobbyHeadView.lua

@@ -83,13 +83,13 @@ function M:fill_user_info()
     local ctr_invte = item_invte:GetController("c1")
     ctr_invte.selectedIndex = invitation
     ctr_invte.onChanged:Set(function()
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local loddyctr = ControllerManager.GetController(LoddyController)
         local _data = {}
         _data.type = 5
         _data.invitation = ctr_invte.selectedIndex
         loddyctr:UpdateUserInfo(_data, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if (res.ReturnCode == 0) then
                 DataManager.SelfUser.invitation = ctr_invte.selectedIndex
             else
@@ -118,7 +118,6 @@ function M:fill_user_info()
     end)
 end
 
-
 function M:ChangeToLogin()
     local _curren_msg = MsgWindow.new(self._root_view, '您是否退出当前账号?', MsgWindow.MsgMode.OkAndCancel)
     _curren_msg.onOk:Add(function()

lua_probject/base_project/Game/View/Lobby/LobbyPlayerInfoView.lua

@@ -1,4 +1,5 @@
 --设置窗口对象
+local PhoneLoginView = import(".PhoneLoginView2")
 
 local LobbyPlayerInfoView = {}
 
@@ -21,11 +22,6 @@ function M:init(url)
     local view = self._view
     local user = self.user;
 
-    -- print("================phone=====================")
-    for k, v in pairs(user) do
-        -- print(string.format("k:%s|v:%s", k, v))
-    end
-
     --show
     view:GetChild('name').text = user.nick_name
     view:GetChild('phone').text = user.phone
@@ -33,11 +29,18 @@ function M:init(url)
     view:GetChild('diamo').text = user.diamo
     view:GetChild('sex').text = user.sex == 1 and "男" or "女"
     view:GetController('ctr_sex').selectedIndex = user.sex - 1
+    view:GetChild('ip').text = DataManager.SelfUser.currenIp
     ImageLoad.Load(DataManager.SelfUser.head_url, view:GetChild("btn_PlayerHead")._iconObject)
-
+    GameApplication.Instance:GetPublicIP(function(ip)
+        DataManager.SelfUser.currenIp = ip
+    end)
     --change
     view:GetChild('choose_id').text = user.account_id
     view:GetChild('choose_diamo').text = user.diamo
+    if user.phone and #user.phone == 11 then
+        self._view:GetChild('btn_changeInfo').visible = false
+        self._view:GetChild('btn_changeInfo').touchable = false
+    end
     self.Lable_name = view:GetChild('Lable_name'):GetChild('text')
     self.Lable_name.text = user.nick_name
     self.group_sex = view:GetController('group_sex')
@@ -45,10 +48,8 @@ function M:init(url)
     self.Lable_phone = view:GetChild('Lable_phone'):GetChild('text')
     local bind = view:GetController('bind')
     if user.phone then
-        bind.selectedIndex = 1
         self.Lable_phone.text = user.phone
     else
-        bind.selectedIndex = 0
         self.Lable_phone.text = ""
     end
     view:GetChild('btn_headChange').onClick:Add(function()
@@ -62,7 +63,6 @@ function M:init(url)
     view:GetChild('btn_bindPhone').onClick:Add(function()
         local guo_msg = MsgWindow.new(self._root_view, "绑定页面正在优化中，请稍后绑定", MsgWindow.MsgMode.OnlyOk)
         guo_msg.onOk(function()
-            bind.selectedIndex = 1
         end)
         guo_msg:Show()
     end)
@@ -104,6 +104,19 @@ function M:init(url)
             end
         end)
     end)
+
+    local btn_changeInfo = self._view:GetChild('btn_changeInfo')
+    btn_changeInfo.onClick:Set(function()
+        local phoneLoginView = PhoneLoginView.new(1, function(res)
+            view:GetChild('phone').text = res.Data.phone
+            user.phone = res.Data.phone
+            if user.phone and #user.phone == 11 then
+                self._view:GetChild('btn_changeInfo').visible = false
+                self._view:GetChild('btn_changeInfo').touchable = false
+            end
+        end)
+        phoneLoginView:Show()
+    end)
 end
 
 return M

lua_probject/base_project/Game/View/Lobby/LobbyRecordView.lua

@@ -157,7 +157,7 @@ function M:PlayerScoreRenderer(index, obj)
             _data["round"] = tostring(round)
             local loddyCtr1 = ControllerManager.GetController(LoddyController)
             loddyCtr1:RequestPlayBack(_data, function(code, data)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if code == 0 then
                     if DataManager.SelfUser.playback[allDate.military_id] ~= nil then
                         DataManager.SelfUser.playback[allDate.military_id][round] = data

lua_probject/base_project/Game/View/Lobby/LobbyService.lua

@@ -20,7 +20,7 @@ function M:init(url)
         obj.text = info.service_link
         obj:GetChild('text_title').text = string.format("%s：", info.service_name)
         obj:GetChild('btn_copy').onClick:Set(function()
-            GameApplication.Instance:CopyToClipboard(info.service_link) --湘北
+            GameApplication.Instance:CopyToClipboard(info.service_link)
             ViewUtil.ErrorTip(-1, "复制成功")
         end)
     end

lua_probject/base_project/Game/View/Lobby/LobbySettingView.lua

@@ -73,8 +73,15 @@ function M:init(url)
     _btn_logout.onClick:Set(function()
         local _curren_msg = MsgWindow.new(self._root_view, '您是否退出当前账号?', MsgWindow.MsgMode.OkAndCancel)
         _curren_msg.onOk:Add(function()
-            PlayerPrefs.DeleteKey('session_id')
+            -- PlayerPrefs.DeleteKey('session_id')
+            -- PlayerPrefs.Save()
+            local phone = "11"
+            if DataManager.SelfUser.phone and #DataManager.SelfUser.phone == 11 then
+                phone = DataManager.SelfUser.phone
+            end
+            PlayerPrefs.SetString("session_phone", phone)
             PlayerPrefs.Save()
+            print("lingmeng log", phone)
             RestartGame()
         end)
         _curren_msg:Show()

lua_probject/base_project/Game/View/Lobby/PhoneBindView.lua

@@ -80,14 +80,14 @@ function M:Bind()
     if not code then
         return
     end
-    ViewUtil.ShowModalWait(self._root_view,"正在提交...")
+    ViewUtil.ShowModalWait2(self._root_view, "正在提交...")
     local loddyctr = ControllerManager.GetController(LoddyController)
     local _data = {}
     _data.type = 4
     _data.phone = phone
     _data.code = code
     loddyctr:UpdateUserInfo(_data, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if (res.ReturnCode == 0) then
             DataManager.SelfUser.phone = phone
             if self._callback then self._callback() end

lua_probject/base_project/Game/View/Lobby/PhoneLoginView2.lua

@@ -0,0 +1,187 @@
+local PhoneLoginView = {}
+
+local M = PhoneLoginView
+
+function PhoneLoginView.new(type, callback)
+    setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self.class = "PhoneLoginView"
+    self._callback = callback
+    self._close_destroy = true
+    self.codeType = type
+    self._new_hide = false
+    self:init("ui://Lobby/PhnoeLogin")
+
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+    self.login_type = self._view:GetController("type")
+    self.login_type.selectedIndex = self.codeType;
+
+    self.code = self._view:GetController("code")
+
+    local btn_login = self._view:GetChild("btn_login")
+    btn_login.onClick:Add(handler(self, function()
+        self:login()
+    end))
+
+    local btn_getCode = self._view:GetChild("btn_code_send")
+    btn_getCode.onClick:Add(handler(self, function()
+        self:getCode()
+    end))
+    if DataManager.SelfUser._data_codeTiem and DataManager.SelfUser._data_codeTiem - os.time() > 0 then
+        self._left_time = DataManager.SelfUser._data_codeTiem - os.time()
+        self._view:GetChild("phone_input").text = DataManager.SelfUser._data_codephone
+        UpdateBeat:Add(self.OnUpdate, self)
+        self.code.selectedIndex = 1
+    end
+end
+
+function M:login()
+    if self.codeType == 0 then
+        local uid = self:CheckInputId()
+        if not uid then
+            return
+        end
+        ViewUtil.ShowModalWait(self._root_view, "正在登录游戏...")
+        local loginCtr = ControllerManager.GetController(LoddyController)
+        local passwd = self:CheckInputPasswd()
+        if not passwd then
+            return
+        end
+        loginCtr:IdPasswordLogin(uid, passwd, function(res)
+            ViewUtil.CloseModalWait2()
+            if res.ReturnCode ~= 0 then
+                if res.ReturnCode ~= 0 then
+                    local guo_msg = MsgWindow.new(self._root_view, "验证码已发送", MsgWindow.MsgMode.OnlyOk)
+                    guo_msg._new_hide = false
+                    guo_msg:Show()
+                    return
+                end
+                return
+            end
+            self._callback(res)
+        end)
+    else
+        ---[[
+        --直接登入
+        local loginCtr = ControllerManager.GetController(LoddyController)
+
+        local phone = self:CheckInputPhone()
+        if not phone then
+            return
+        end
+
+        local code = self:CheckInputPhoneCode()
+        if not code then
+            return
+        end
+
+        loginCtr:PhoneBind(phone, code, function(res)
+            if res.ReturnCode ~= 0 then
+                local msg_txt = "验证码错误"
+                if (Table_Error_code_Map[res.ReturnCode] ~= nil) then
+                    msg_txt = Table_Error_code_Map[res.ReturnCode].note
+                end
+                local guo_msg = MsgWindow.new(self._root_view, msg_txt, MsgWindow.MsgMode.OnlyOk)
+                guo_msg._new_hide = false
+                guo_msg:Show()
+                return
+            end
+            self._callback(res)
+            self:Destroy()
+        end)
+    end
+end
+
+function M:getCode()
+    local phone = self:CheckInputPhone()
+    if not phone then
+        self.code.selectedIndex = 0
+        return
+    end
+    --发送电话给后端
+    ViewUtil:ShowModalWait2(0.1)
+    local loginCtr = ControllerManager.GetController(LoginController)
+    loginCtr:GetPhoneCode(phone, function(res)
+        ViewUtil.CloseModalWait2()
+        if res.ReturnCode == 0 then
+            self.phone = phone
+            self._left_time = 60
+            DataManager.SelfUser._data_codeTiem = os.time() + 60
+            DataManager.SelfUser._data_codephone = phone
+            UpdateBeat:Add(self.OnUpdate, self)
+        else
+            if res.ReturnCode == 1 then
+                self._left_time = 15
+                DataManager.SelfUser._data_codeTiem = os.time() + 15
+                DataManager.SelfUser._data_codephone = phone
+                UpdateBeat:Add(self.OnUpdate, self)
+                ViewUtil.ErrorTip(self._root_view, "验证码还在有效期")
+            else
+                self.code.selectedIndex = 0
+                ViewUtil.ErrorTip(self._root_view, "网络超时，请重新获取验证码")
+            end
+        end
+    end)
+end
+
+function M:OnUpdate()
+    local deltaTime = Time.deltaTime
+    local _left_time = self._left_time
+    if (_left_time > 0) then
+        _left_time = _left_time - deltaTime
+        _left_time = math.max(0, _left_time)
+        local leftTime = math.floor(_left_time)
+        self._view:GetChild("code_send_text").text = tostring(leftTime)
+        self._left_time = _left_time
+    else
+        self.code.selectedIndex = 0
+        UpdateBeat:Remove(self.OnUpdate, self)
+    end
+end
+
+function M:Destroy()
+    BaseWindow.Destroy(self)
+    UpdateBeat:Remove(self.OnUpdate, self)
+end
+
+function M:CheckInputId()
+    local uid = self._view:GetChild("phone_input").text
+    if not (string.len(uid) >= 6) then
+        ViewUtil.ShowTips("请输入正确的用户ID")
+        return
+    end
+    return uid
+end
+
+function M:CheckInputPasswd()
+    local tex_passwd = self._view:GetChild("tex_passwd").text
+    if string.len(tex_passwd) < 6 then
+        ViewUtil.ShowTips("密码最少六位")
+        return
+    end
+    return tex_passwd
+end
+
+function M:CheckInputPhone()
+    local phone = self._view:GetChild("phone_input").text
+    if not (string.len(phone) == 11) then
+        ViewUtil.ShowTips("请输入正确的电话号码")
+        return
+    end
+    return phone
+end
+
+function M:CheckInputPhoneCode()
+    local code = self._view:GetChild("code_input").text
+    if string.len(code) ~= 6 then
+        ViewUtil.ShowTips("请输入正确的验证码")
+        return
+    end
+    return code
+end
+
+return M

lua_probject/base_project/Game/View/Lobby/PhonePasswordView.lua

@@ -92,13 +92,13 @@ function M:Bind()
     --     _data.phone = DataManager.SelfUser.phone
     --     _data.code = code
     -- end
-    ViewUtil.ShowModalWait(self._root_view, "正在提交...")
+    ViewUtil.ShowModalWait2(self._root_view, "正在提交...")
     local loddyctr = ControllerManager.GetController(LoddyController)
     _data.password = password
     _data.type = 3
 
     loddyctr:UpdateUserInfo(_data, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if (res.ReturnCode == 0) then
             DataManager.SelfUser.password = "123"
             if self._callback then self._callback() end

lua_probject/base_project/Game/View/Lobby/RankView.lua

@@ -45,7 +45,7 @@ function M:init(url)
 					ViewUtil.ShowModalWait(self._root_view)
 					local loddyCtr1 = ControllerManager.GetController(LoddyController)
 					loddyCtr1:RequestRecordList(function(result)
-						ViewUtil.CloseModalWait()
+						ViewUtil.CloseModalWait2()
 						if self._is_destroy then
 							return
 						end
@@ -245,7 +245,7 @@ function M:InitRecord1(recordList, develop_tool)
 						ShareScreenShotWithOption(function()
 							result_view:Dispose()
 						end)
-						ViewUtil.CloseModalWait()
+						ViewUtil.CloseModalWait2()
 						break
 					end
 					coroutine.wait(1)
@@ -338,7 +338,7 @@ function M:ShowRecord2(playback_id, room_type, room_id, room_time, item_score, g
 				_data["round"] = tostring(i)
 				local loddyCtr1 = ControllerManager.GetController(LoddyController)
 				loddyCtr1:RequestPlayBack(_data, function(code, data)
-					ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					if code == 0 then
 						if DataManager.SelfUser.playback[playback_id] ~= nil then
 							DataManager.SelfUser.playback[playback_id][i] = data

lua_probject/base_project/Game/View/Lobby/RealAddressView.lua

@@ -60,6 +60,7 @@ function M:fill_real()
         self.ctr_update.selectedIndex = 0
     end
 end
+
 function M:SetCallBack(callback)
     self._CB = callback
 end
@@ -70,7 +71,7 @@ function M:real_action()
         ViewUtil.ShowTips(str)
         return
     end
-    ViewUtil.ShowModalWait(self._root_view,"正在提交认证...")
+    ViewUtil.ShowModalWait2(self._root_view, "正在提交认证...")
     local loddyctr = ControllerManager.GetController(LoddyController)
     local _data = {}
     _data.type = 1
@@ -79,7 +80,7 @@ function M:real_action()
     real_info.identity = self._view:GetChild("tex_identity").text
     _data.real_info = real_info
     loddyctr:UpdateUserInfo(_data, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if (res.ReturnCode == 0) then
             DataManager.SelfUser.real_info = real_info
             if self._callback then self._callback() end
@@ -123,13 +124,13 @@ function M:address_action()
         ViewUtil.ShowTips("请输入详细地址")
         return
     end
-    ViewUtil.ShowModalWait(self._root_view,"正在提交...")
+    ViewUtil.ShowModalWait2(self._root_view, "正在提交...")
     local loddyctr = ControllerManager.GetController(LoddyController)
     local _data = {}
     _data.type = 2
     _data.address = tex_address
     loddyctr:UpdateUserInfo(_data, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if (res.ReturnCode == 0) then
             DataManager.SelfUser.address = _data.address
             if self._callback then self._callback() end

lua_probject/base_project/Game/View/Lobby/WeChatView.lua

@@ -20,25 +20,23 @@ function M:init(url)
 
     local btn_ok = self._view:GetChild("btn_ok")
     btn_ok.onClick:Set(function()
-        ViewUtil.ShowModalWait(self._root_view,"正在同步数据...")
+        ViewUtil.ShowModalWait2(self._root_view, "正在同步数据...")
         GameApplication.Instance:WXLogin(handler(self, self.WXCallBack))
     end)
-    
 end
 
 function M:WXCallBack(result, data)
-           
     if (not result) or result ~= 0 then
         if result == 10 then
-          ViewUtil.ShowModalWait(self._root_view)
+            ViewUtil.ShowModalWait2(self._root_view)
             return
         end
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         return
     end
 
     if not data then
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         return
     end
     local jd = json.decode(data)
@@ -49,7 +47,7 @@ function M:WXCallBack(result,data)
     local nickname = jd["nickname"]
 
     if not unionid or string.len(unionid) < 1 then
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         return
     end
     local _data = {}
@@ -60,7 +58,7 @@ function M:WXCallBack(result,data)
     _data["portrait"] = headurl
     local loddyctr = ControllerManager.GetController(LoddyController)
     loddyctr:UpdateUserInfo(_data, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if (res.ReturnCode == 0) then
             local user = DataManager.SelfUser
             user.acc = unionid
@@ -75,5 +73,4 @@ function M:WXCallBack(result,data)
     end)
 end
 
-
 return M

lua_probject/base_project/Game/View/LobbyView.lua

@@ -123,9 +123,9 @@ function M:InitView(url)
     -- local btn_more_group = self._view:GetChild("btn_family")
     -- btn_more_group.onClick:Set(function()
     --     --self.groupMainView._view.visible = true
-    --     ViewUtil.ShowModalWait(self._root_view, "请稍等，获取牌友圈中...")
+    --     ViewUtil.ShowModalWait2(self._root_view, "请稍等，获取牌友圈中...")
     --     local enterGroupCallBackFunc = function(code)
-    --         ViewUtil.CloseModalWait()
+    --         ViewUtil.CloseModalWait2()
     --         if code == 0 then
     --             self.groupMainView._view.visible = true
     --         else
@@ -181,6 +181,9 @@ function M:InitView(url)
         printlog("load Callback")
         self._flag_loadImageSucces = true
     end)
+    GameApplication.Instance:GetPublicIP(function(ip)
+        DataManager.SelfUser.currenIp = ip
+    end)
     btn_head.onClick:Set(function()
         -- local headView = HeadView.new(DataManager.SelfUser, nil, function()
         --     view:GetChild("tex_name").text = DataManager.SelfUser.nick_name
@@ -276,9 +279,9 @@ function M:InitView(url)
     -- local btn_more_group = self._view:GetChild("btn_more_group")
     -- 	btn_more_group.onClick:Set(function()
     -- 		--self.groupMainView._view.visible = true
-    -- 		ViewUtil.ShowModalWait(self._root_view,"请稍等，获取牌友圈中...")
+    -- 		ViewUtil.ShowModalWait2(self._root_view,"请稍等，获取牌友圈中...")
     -- 		local enterGroupCallBackFunc=function (code)
-    -- 			 ViewUtil.CloseModalWait()
+    -- 			 ViewUtil.CloseModalWait2()
     -- 			if code==0 then
     -- 				self.groupMainView._view.visible = true
     -- 			else

lua_probject/base_project/Game/View/LoginView.lua

@@ -1,4 +1,4 @@
-local PhoneLoginView = import(".PhoneLoginView")
+local PhoneLoginView = import(".PhoneLoginView2")
 LoginView = {}
 
 
@@ -47,13 +47,13 @@ function M:init()
             ViewUtil.ErrorTip(self._root_view, "请勾选同意《用户协议》")
             return
         end
-        ViewUtil.ShowModalWait(self._root_view, "正在登录游戏...")
+        ViewUtil.ShowModalWait2(self._root_view, "正在登录游戏...")
         coroutine.start(function()
             coroutine.wait(8)
             if self.isWXCallBackMark then
                 return
             end
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             ViewUtil.ErrorTip(10000, "微信登录失败！")
         end)
         if (not GameApplication.Instance.accountTest) then
@@ -128,7 +128,7 @@ end
 local function __join_room(roomid, res)
     local loddyctr = ControllerManager.GetController(LoddyController)
     loddyctr:JoinRoom(roomid, function(res1)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res1.ReturnCode == -2 then
             __join_room(roomid, res)
         elseif res1.ReturnCode == 0 then
@@ -142,7 +142,7 @@ local function __join_room(roomid, res)
 end
 
 local function __login_response(self, response)
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
     local skey = "session_id"
     if (response.ReturnCode == 0) then
         local user = DataManager.SelfUser
@@ -161,7 +161,7 @@ local function __login_response(self, response)
             local roomid = user.room_id
             if (string.len(roomid) > 1) then
                 if user.group_id == 0 then
-                    ViewUtil.ShowModalWait(self._root_view, "正在加入房间...")
+                    ViewUtil.ShowModalWait2(self._root_view, "正在加入房间...")
                     __join_room(roomid, response)
                     return
                 else
@@ -216,7 +216,7 @@ end
 
 function M:PhoneCodeLogin()
     local _phoneCodeView = nil
-    _phoneCodeView = PhoneLoginView.new(1, function(res)
+    _phoneCodeView = PhoneLoginView.new(1, self.phone, function(res)
         if res.ReturnCode == 0 then
             _phoneCodeView:Destroy()
         end
@@ -240,9 +240,15 @@ end
 function M:QuickLogin()
     if (not GameApplication.Instance.accountTest) then
         local session_id = PlayerPrefs.GetString("session_id")
+        self.phone = PlayerPrefs.GetString("session_phone")
         -- print("session_id:" .. session_id)
         if session_id and string.len(session_id) > 3 then
-            ViewUtil.ShowModalWait(self._root_view, "正在登录游戏...")
+            PlayerPrefs.DeleteKey('session_phone')
+            PlayerPrefs.Save()
+            if self.phone and #self.phone > 0 then
+                return
+            end
+            ViewUtil.ShowModalWait2(self._root_view, "正在登录游戏...")
             local loginCtr = ControllerManager.GetController(LoginController)
             loginCtr:QuickLogin(session_id, function(response)
                 __login_response(self, response)
@@ -258,10 +264,10 @@ function M:LoginCallBack(result, data)
     --pt(data)
     if (not result) or result ~= 0 then
         if result == 10 then
-            ViewUtil.ShowModalWait(self._root_view)
+            ViewUtil.ShowModalWait2(self._root_view)
             return
         end
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         return
     end
 
@@ -279,7 +285,7 @@ function M:LoginCallBack(result, data)
         DataManager.SelfUser.sex = sex
         DataManager.SelfUser.head_url = headurl
         if not DataManager.SelfUser.acc or string.len(DataManager.SelfUser.acc) < 1 then
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             return
         end
     end

lua_probject/base_project/Game/View/MainView.lua

@@ -409,10 +409,10 @@ function M:InitView(url, isHideIpAdds)
                         if self._state.selectedIndex > 0 and self._state.selectedIndex < 3 then
                             ViewUtil.ErrorTip(nil, '房间已开始,无法退出游戏。')
                         else
-                            ViewUtil.ShowModalWait(self._root_view)
+                            ViewUtil.ShowModalWait2(self._root_view)
                             self._gamectr:LevelRoom(
                                 function(res)
-                                    ViewUtil.CloseModalWait()
+                                    ViewUtil.CloseModalWait2()
                                     if res.ReturnCode == 0 then
                                         ViewManager.ChangeView(ViewManager.View_Lobby)
                                     else
@@ -445,10 +445,10 @@ function M:InitView(url, isHideIpAdds)
                         if self._state.selectedIndex > 0 and self._state.selectedIndex < 3 then
                             ViewUtil.ErrorTip(nil, '房间已开始,无法退出游戏。')
                         else
-                            ViewUtil.ShowModalWait(self._root_view)
+                            ViewUtil.ShowModalWait2(self._root_view)
                             self._gamectr:LevelRoom(
                                 function(res)
-                                    ViewUtil.CloseModalWait()
+                                    ViewUtil.CloseModalWait2()
                                     if res.ReturnCode == 0 then
                                         ViewManager.ChangeView(ViewManager.View_Lobby)
                                     else
@@ -469,7 +469,7 @@ function M:InitView(url, isHideIpAdds)
             if IsRoomOwer() then
                 self._gamectr:AskDismissRoom(
                     function(res)
-                        ViewUtil.CloseModalWait()
+                        ViewUtil.CloseModalWait2()
                         if res.ReturnCode == 0 then
                             ViewManager.ChangeView(ViewManager.View_Family)
                         else
@@ -571,6 +571,23 @@ function M:InitView(url, isHideIpAdds)
     end
 
     RefalshBtnClose(self)
+
+    local config = ExtendManager.GetExtendConfig(_room.game_id)
+    local mode = config:GetGameInfo()
+    local gamePlay = mode:LoadConfigToDetail(json.encode(_room.room_config.config),
+        json.encode(_room.room_config.config.hpData))
+    local btn_invite = self._view:GetChild('btn_invite')
+    if btn_invite then
+        btn_invite.onClick:Set(function()
+            local data = {}
+            data.title = string.format('%s,房号:%d(%s%s局)', _room.game_info.name, _room.room_id,
+                _room.group_id ~= 0 and "亲友圈," or "", _room.room_config.config.hpData.maxRound)
+            data.description = gamePlay
+            data.type = 0
+            pt("lingmeng share ", data)
+            ViewUtil.__share(data)
+        end)
+    end
     ------------------------------------------------------------
 end
 
@@ -592,10 +609,10 @@ function M:continue_game(continue)
                 if self._state.selectedIndex > 0 and self._state.selectedIndex < 3 then
                     ViewUtil.ErrorTip(nil, '房间已开始,无法退出游戏。')
                 else
-                    ViewUtil.ShowModalWait(self._root_view)
+                    ViewUtil.ShowModalWait2(self._root_view)
                     self._gamectr:LevelRoom(
                         function(res)
-                            ViewUtil.CloseModalWait()
+                            ViewUtil.CloseModalWait2()
                             if res.ReturnCode == 0 then
                                 ViewManager.ChangeView(ViewManager.View_Lobby)
                             else
@@ -1553,7 +1570,7 @@ function M:Destroy()
     ControllerManager.resetJionRoom = false
     self._popEvent = false
     GRoot.inst:HidePopup()
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
     GameApplication.Instance.StopMusic = 0
     coroutine.stopAll()
     UpdateBeat:Remove(self.OnUpdate, self)

lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua

@@ -306,7 +306,7 @@ local function __fillRoomItem(self, index, item, room)
                             )
                         _curren_msg.onOk:Add(
                             function()
-                                ViewUtil.ShowModalWait(self._root_view)
+                                ViewUtil.ShowModalWait2(self._root_view)
                                 local fgCtr = ControllerManager.GetController(NewGroupController)
 
                                 fgCtr:FG_RemoveRoom(
@@ -316,7 +316,7 @@ local function __fillRoomItem(self, index, item, room)
                                         if self._is_destroy then
                                             return
                                         end
-                                        ViewUtil.CloseModalWait()
+                                        ViewUtil.CloseModalWait2()
                                         if res.ReturnCode ~= 0 then
                                             ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！')
                                             return
@@ -930,7 +930,7 @@ function M:InitView(url)
     --         local delroomid
     --         delroomid = (texroomid.text) or 0
     --         if texroomid.text == "" then
-    --             ViewUtil.CloseModalWait()
+    --             ViewUtil.CloseModalWait2()
     --             ViewUtil.ErrorTip(nil, '输入不能为空')
     --             return
     --         end
@@ -943,7 +943,7 @@ function M:InitView(url)
     --         _curren_msg.onOk:Add(
     --             function()
 
-    --                 ViewUtil.ShowModalWait(self._root_view)
+    --                 ViewUtil.ShowModalWait2(self._root_view)
     --                 local fgCtr = ControllerManager.GetController(NewGroupController)
     --                 fgCtr:FG_RemoveRoom(
     --                     self.curGroup.id,
@@ -952,7 +952,7 @@ function M:InitView(url)
     --                         if self._is_destroy then
     --                             return
     --                         end
-    --                         ViewUtil.CloseModalWait()
+    --                         ViewUtil.CloseModalWait2()
     --                         if res.ReturnCode ~= 0 then
     --                             ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！')
     --                             return
@@ -1313,7 +1313,7 @@ function M:__onUpdate()
 end
 
 function M:__joinRoom(room_id)
-    ViewUtil.ShowModalWait(self._root_view, '正在加入游戏...', 'join_room')
+    ViewUtil.ShowModalWait2(self._root_view, '正在加入游戏...', 'join_room')
     local roomCtr = ControllerManager.GetController(RoomController)
     local _gameCtrl = ControllerManager.GetController(GameController)
     local _currentCtrl = ControllerManager.GetCurrenController()
@@ -1327,7 +1327,7 @@ function M:__joinRoom(room_id)
                         false,
                         function(response)
                             if (response.ReturnCode == -1) then
-                                ViewUtil.CloseModalWait('join_room')
+                                ViewUtil.CloseModalWait2('join_room')
                                 RestartGame()
                                 return
                             end
@@ -1336,7 +1336,7 @@ function M:__joinRoom(room_id)
                                 self:__joinRoom(room_id)
                                 return
                             elseif response.ReturnCode ~= 0 then
-                                ViewUtil.CloseModalWait('join_room')
+                                ViewUtil.CloseModalWait2('join_room')
                                 ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
                                 return
                             end
@@ -1346,7 +1346,7 @@ function M:__joinRoom(room_id)
                             self._view.visible = false
                             ImageLoad.Clear(self.class)
                             ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
-                            ViewUtil.CloseModalWait('join_room')
+                            ViewUtil.CloseModalWait2('join_room')
                             timer = 0
                         end,
                         self.curGroup.id
@@ -1364,7 +1364,7 @@ function M:__joinRoom(room_id)
             printlog("进入房间返回事件==========》》》")
             pt(response)
             if (response.ReturnCode == -1) then
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
                 RestartGame()
                 return
             end
@@ -1373,7 +1373,7 @@ function M:__joinRoom(room_id)
                 self:__joinRoom(room_id)
                 return
             elseif response.ReturnCode ~= 0 then
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
                 ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
                 return
             end
@@ -1383,7 +1383,7 @@ function M:__joinRoom(room_id)
             self._view.visible = false
             ImageLoad.Clear(self.class)
             ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
-            ViewUtil.CloseModalWait('join_room')
+            ViewUtil.CloseModalWait2('join_room')
             timer = 0
         end,
         self.curGroup.id
@@ -1407,7 +1407,7 @@ function M:__joinRoom_match(roomid, pid, is_null, isHidden, callback)
         end
     end
     if isHidden == 1 then
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if not DataManager.SelfUser.location then
             DataManager.SelfUser.location = Location.new()
         end
@@ -1433,7 +1433,7 @@ function M:__joinRoom_match(roomid, pid, is_null, isHidden, callback)
                 function(response)
                     if (response.ReturnCode == -1) then
                         self._view:GetController('pipei').selectedIndex = 0
-                        ViewUtil.CloseModalWait('join_room')
+                        ViewUtil.CloseModalWait2('join_room')
                         RestartGame()
                         return
                     end
@@ -1454,7 +1454,7 @@ function M:__joinRoom_match(roomid, pid, is_null, isHidden, callback)
                         -- ImageLoad.Clear(self.class)
                         -- ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
                         -- callback(response.ReturnCode)
-                        -- ViewUtil.CloseModalWait('join_room')
+                        -- ViewUtil.CloseModalWait2('join_room')
                         -- timer = 0
                     end
                 end,
@@ -1473,7 +1473,7 @@ function M:__joinRoom_match(roomid, pid, is_null, isHidden, callback)
         is_null,
         function(response)
             if (response.ReturnCode == -1) then
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
                 RestartGame()
                 return
             end
@@ -1490,7 +1490,7 @@ function M:__joinRoom_match(roomid, pid, is_null, isHidden, callback)
                 ImageLoad.Clear(self.class)
                 ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
                 callback(response.ReturnCode)
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
                 timer = 0
             end
         end,
@@ -1705,7 +1705,7 @@ function M:__loadGroupData()
     curGroup.update_room = false
     curGroup.update_info = false
     curGroup.update_joins = false
-    ViewUtil.ShowModalWait(self._root_view, "正在进入牌友圈,请稍等...")
+    ViewUtil.ShowModalWait2(self._root_view, "正在进入牌友圈,请稍等...")
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_EnterGroup(
         curGroup.id,
@@ -1713,7 +1713,7 @@ function M:__loadGroupData()
             -- if self._is_destroy then
             --     return
             -- end
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 --self._view.visible=false
                 --ViewUtil.ErrorTip(res.ReturnCode, "获取圈子数据失败")
@@ -1863,7 +1863,7 @@ end
 
 -- 匹配游戏
 function M:__startGame(roomid, pid, is_null, isHidden, callback)
-    ViewUtil.ShowModalWait(self._root_view, '正在加入游戏...', 'join_room')
+    ViewUtil.ShowModalWait2(self._root_view, '正在加入游戏...', 'join_room')
     local _gameCtrl = ControllerManager.GetController(GameController)
     local _currentCtrl = ControllerManager.GetCurrenController()
     if _gameCtrl == _currentCtrl then
@@ -1879,7 +1879,7 @@ function M:__startGame(roomid, pid, is_null, isHidden, callback)
                             self:__startGame(roomid, pid, is_null, isHidden, callback)
                         elseif code ~= 0 then
                             ViewUtil.ErrorMsg(self._root_view, code, '进入房间失败')
-                            ViewUtil.CloseModalWait('join_room')
+                            ViewUtil.CloseModalWait2('join_room')
                         end
                         if callback then
                             callback()
@@ -1900,7 +1900,7 @@ function M:__startGame(roomid, pid, is_null, isHidden, callback)
                 self:__startGame(roomid, pid, is_null, isHidden, callback)
             elseif code ~= 0 then
                 ViewUtil.ErrorMsg(self._root_view, code, '进入房间失败')
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
             end
             if callback then
                 callback()

lua_probject/base_project/Game/View/NewGroup/GroupJoinsView.lua

@@ -31,12 +31,12 @@ local function __fillJoins(self,curGroup,joins)
         btn_yes.data = rdata
         btn_yes.onClick:Set(function(context)
             local _rd = context.sender.data
-            ViewUtil.ShowModalWait(self._root_view)
+            ViewUtil.ShowModalWait2(self._root_view)
             fgCtr:FG_GroupVerifyJoin(curGroup.id, _rd.id, true, function(res1)
                 if self._is_destroy then
                     return
                 end
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res1.ReturnCode == 0 then
                     curGroup.joins = #res1.Data.joins
                     self.change = true
@@ -50,12 +50,12 @@ local function __fillJoins(self,curGroup,joins)
         btn_del.data = rdata
         btn_del.onClick:Set(function(context)
             local _rd = context.sender.data
-            ViewUtil.ShowModalWait(self._root_view)
+            ViewUtil.ShowModalWait2(self._root_view)
             fgCtr:FG_GroupVerifyJoin(curGroup.id, _rd.id, false, function(res1)
                 if self._is_destroy then
                     return
                 end
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res1.ReturnCode == 0 then
                     curGroup.joins = #res1.Data.joins
                     self.change = true
@@ -91,7 +91,6 @@ function M:SetCallback(callback)
     self.callback = callback
 end
 
-
 -- 销毁窗口
 function M:Destroy(remove_map)
     if self.change and self.callback then

lua_probject/base_project/Game/View/NewGroup/GroupMailView.lua

@@ -41,10 +41,10 @@ function M:FillView()
 end
 
 function M:GetMailData(index)
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetMailList(self.curGroup.id, DataManager.SelfUser.account_id, index, 20, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode == 0 then
             if #res.Data.mail_list > 0 then
                 list_concat(self.mail_data, res.Data.mail_list)
@@ -57,10 +57,10 @@ function M:GetMailData(index)
 end
 
 function M:DelAllMail()
-	ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_DelAllMail(self.curGroup.id, DataManager.SelfUser.account_id, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode == 0 then
             self.mail_data = {}
             self.lst_mail.numItems = 0
@@ -82,10 +82,12 @@ function M:OnRenderItem(index, obj)
         local str_lev = data.lev == 3 and "合伙人" or "管理员"
         local act = hp >= 0 and "给您增加了" or "扣除了您"
         tex_title.text = "消息内容为:" --string.format("%s(%s) %s%s积分", nick, id, act, math.abs(hp))
-		tex_content.text = string.format("%s [color=#08a446]%s[/color](%s) %s[color=#08a446] %s [/color]积分", str_lev, nick, id, act, math.abs(hp))
+        tex_content.text = string.format("%s [color=#08a446]%s[/color](%s) %s[color=#08a446] %s [/color]积分", str_lev,
+            nick, id, act, math.abs(hp))
     else
         tex_title.text = "消息内容为:" --string.format("%s(%s) 转账给您%s积分", nick, id, math.abs(hp))
-		tex_content.text = string.format("[color=#08a446]%s[/color](%s) 转账给您[color=#08a446] %s [/color]积分", nick, id, math.abs(hp))
+        tex_content.text = string.format("[color=#08a446]%s[/color](%s) 转账给您[color=#08a446] %s [/color]积分", nick, id,
+            math.abs(hp))
     end
     obj:GetChild("tex_data").text = os.date("%Y-%m-%d %H:%M", data.time)
 end
@@ -94,7 +96,6 @@ function M:SetCallback(callback)
     self.callback = callback
 end
 
-
 -- 销毁窗口
 function M:Destroy(remove_map)
     if self.callback then

lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua

@@ -36,9 +36,9 @@ function M:InitView(url)
         local cgv = CreateGroupView.new(self._root_view)
         cgv:Show()
         cgv:SetCallback(function(name, pay_type, fg_type)
-            ViewUtil.ShowModalWait(cgv._root_view)
+            ViewUtil.ShowModalWait2(cgv._root_view)
             fgCtr:FG_CreateGroup(name, pay_type, fg_type, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if self._is_destroy then
                     return
                 end
@@ -93,9 +93,9 @@ function M:InitView(url)
 
     local btn_refresh = self._view:GetChild('btn_refresh')
     btn_refresh.onClick:Set(function()
-        ViewUtil.ShowModalWait(self._root_view)
+        ViewUtil.ShowModalWait2(self._root_view)
         fgCtr:FG_GroupList(function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if self._is_destroy then
                 return
             end
@@ -239,9 +239,9 @@ function M:FillData()
         btn_top.onClick:Set(function(context)
             context:StopPropagation()
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait(self._root_view)
+            ViewUtil.ShowModalWait2(self._root_view)
             fgCtr:FG_TopGroup(group.id, ctr_select.selectedIndex == 0, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if self._is_destroy then
                     return
                 end

lua_probject/base_project/Game/View/NewGroup/GroupMngFagPackView.lua

@@ -25,7 +25,6 @@ function GroupMngFagPackView.new(gid, blur_view,ctrNum,uid)
 end
 
 function M:FillView()
-	
 	self.Ctr = self._view:GetController("ctr")
 	self.Ctr.selectedIndex = 1
 
@@ -74,9 +73,7 @@ function M:FillView()
 	local btn_cr = self._view:GetChild('btn_qd')
 	btn_cr.onClick:Set(
 		function()
-                        
 			local gniv = GroupNumberInputView.new(nil, function(num)
-        
 				local value = limit
 				if otype == 1 then
 					value = value + ad2d(num)
@@ -90,10 +87,10 @@ function M:FillView()
 					ViewUtil.ErrorTip(1, "输入数据异常！")
 				end
 
-							ViewUtil.ShowModalWait()
+				ViewUtil.ShowModalWait2()
 				local fgCtr = ControllerManager.GetController(NewGroupController)
 				fgCtr:FG_SAVEBankInfo(self.group_id, value, self.uid, function(res1)
-								ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					pt(res1)
 					if (res1.ReturnCode == 0) then
 						self:SetBank(res1.Data.hp, res1.Data.b_hp)
@@ -102,11 +99,8 @@ function M:FillView()
 						ViewUtil.ErrorTip(res1.ReturnCode, "存取积分失败！")
 					end
 				end)
-						
 			end, 0, nil)
 			gniv:Show()
-						
-						
 		end
 	)
 
@@ -114,9 +108,7 @@ function M:FillView()
 	local btn_qc = self._view:GetChild('btn_qc')
 	btn_qc.onClick:Set(
 		function()
-						
 			local gniv = GroupNumberInputView.new(nil, function(num)
-        
 				local value = limit
 				if otype == 1 then
 					value = value + ad2d(num)
@@ -130,10 +122,10 @@ function M:FillView()
 					ViewUtil.ErrorTip(1, "输入数据异常！")
 				end
 
-							ViewUtil.ShowModalWait()
+				ViewUtil.ShowModalWait2()
 				local fgCtr = ControllerManager.GetController(NewGroupController)
 				fgCtr:FG_TakeBankInfo(self.group_id, value, self.uid, function(res1)
-								ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					pt(res1)
 					if (res1.ReturnCode == 0) then
 						self:SetBank(res1.Data.hp, res1.Data.b_hp)
@@ -142,10 +134,8 @@ function M:FillView()
 						ViewUtil.ErrorTip(res1.ReturnCode, "获取积分失败！")
 					end
 				end)
-						
 			end, 0, nil)
 			gniv:Show()
-						
 		end
 	)
 
@@ -187,35 +177,28 @@ function M:FillView()
 	self.lst_bxx.numItems = self.ctrNum
 end
 
-
-
 function M:initBankData()
-	ViewUtil.ShowModalWait()
+	ViewUtil.ShowModalWait2()
 	local fgCtr = ControllerManager.GetController(NewGroupController)
 	fgCtr:FG_GetBankInfo(self.group_id, self.uid, function(res)
 		pt(res)
-		ViewUtil.CloseModalWait()
+		ViewUtil.CloseModalWait2()
 		if res.ReturnCode ~= 0 then
 			ViewUtil.ErrorTip(res.ReturnCode, "获取银行数据失败")
 		else
 			self:SetBank(res.Data.total_hp, res.Data.bank_hp)
 			self.Ctr.selectedIndex = 0
-
 		end
-
 	end)
 end
 
-
-
-
 function M:initShouyiData()
-	ViewUtil.ShowModalWait()
+	ViewUtil.ShowModalWait2()
 	self.shouyiData = {}
 	self._view:GetChild("tex_total").text = 0
 	local fgCtr = ControllerManager.GetController(NewGroupController)
 	fgCtr:FG_GetTakeInfo(self.group_id, self.uid, function(res)
-		ViewUtil.CloseModalWait()
+		ViewUtil.CloseModalWait2()
 		if res.ReturnCode ~= 0 then
 			ViewUtil.ErrorTip(res.ReturnCode, "获取保险箱数据失败")
 		else
@@ -235,14 +218,11 @@ function M:SetCallback(callback)
 	self.callback = callback
 end
 
-
 function M:SetBank(totalHp, bankHp)
 	self.playerJF.text = totalHp / 1000
 	self.bankJF.text = bankHp / 1000
 end
 
-
-
 function M:fillGameItem(index, item)
 	if index ~= 0 then
 		item.icon = "ui://NewGroup/button_cqg"
@@ -263,22 +243,8 @@ function M:fillGameItem(index, item)
 			self:initShouyiData()
 		end
 	end
-	
-	
-	
 end
 
-
-
-
-
-
-
-
-
-
-
-
 -- 销毁窗口
 function M:Destroy(remove_map)
 	if self.callback then

lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua

@@ -63,7 +63,7 @@ function M:FillView()
     ctr_ua.selectedIndex = bit:_and(option, 8) > 0 and 1 or 0
 
     self._view:GetChild("btn_ok").onClick:Set(function()
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local data = {}
         data.id = self.group_id
         data.name = tex_name.text
@@ -104,7 +104,7 @@ function M:FillView()
         end
 
         fgCtr:FG_UpdateGroupInfo(data, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "设置大联盟失败。")
             else

lua_probject/base_project/Game/View/NewGroup/GroupRecordView.lua

@@ -6,7 +6,6 @@ local GroupRecordView = {}
 local M = GroupRecordView
 
 function GroupRecordView.new(curGroup, qid, includeMembers, begin_time, end_time, time_type)
-
     setmetatable(M, { __index = BaseWindow })
     local self = setmetatable({}, { __index = M })
     self.class = "GroupRecordView"
@@ -44,15 +43,14 @@ function M:OnRenderRecordItem(index, obj)
 end
 
 function M:GetRecordData(index)
-   
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetGroupRecordSpe(self.curGroup, GetPlatform(), self.qid, self.includeMembers, index, 6, self.begin_time, self.end_time, self.time_type, function(res)
-
+    fgCtr:FG_GetGroupRecordSpe(self.curGroup, GetPlatform(), self.qid, self.includeMembers, index, 6, self.begin_time,
+        self.end_time, self.time_type, function(res)
             if self._is_destroy then
                 return
             end
-        ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
 
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败")
@@ -67,7 +65,6 @@ function M:GetRecordData(index)
 end
 
 function M:FillRecordItem(data, obj)
-
     local game_id = data.game_id
     local room_id = data.room_id
     local create_time = data.create_time
@@ -140,7 +137,7 @@ function M:FillRecordItem(data, obj)
 end
 
 function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType)
-    ViewUtil.ShowModalWait(self._view, "正在分享...")
+    ViewUtil.ShowModalWait2(self._view, "正在分享...")
     UIPackage.AddPackage("base/rank/ui/Rank")
     local result_view = UIPackage.CreateObjectFromURL("ui://Rank/ResultView")
     result_view.visible = false
@@ -179,7 +176,7 @@ function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore,
                 ShareScreenShotWithOption(function()
                     result_view:Dispose()
                 end)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 break
             end
             coroutine.wait(1)
@@ -253,13 +250,13 @@ function M:OnShowRecordInfo(rdata)
                 main._totalRound = tonumber(rdata.round)
                 main:FillRoomData(DataManager.SelfUser.playback[playback_id][i])
             else
-                ViewUtil.ShowModalWait(self._view)
+                ViewUtil.ShowModalWait2(self._view)
                 local _data = {}
                 _data["military_id"] = playback_id
                 _data["round"] = tostring(i)
                 local loddyCtr1 = ControllerManager.GetController(LoddyController)
                 loddyCtr1:RequestPlayBack(_data, function(code, data)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if code == 0 then
                         if DataManager.SelfUser.playback[playback_id] ~= nil then
                             DataManager.SelfUser.playback[playback_id][i] = data
@@ -285,7 +282,6 @@ function M:OnShowRecordInfo(rdata)
     end
 end
 
-
 function M:GenaratePlayBack(id, game_id, ...)
     local tem = nil
     local dview_class = nil
@@ -303,5 +299,4 @@ function M:GenaratePlayBack(id, game_id, ...)
     return tem
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/GroupRemitView.lua

@@ -49,9 +49,9 @@ function M:FillView()
             ViewUtil.ErrorTip(nil, "请输入玩家ID")
             return
         end
-        ViewUtil.ShowModalWait(nil)
+        ViewUtil.ShowModalWait2(nil)
         fgCtr:FG_RemitFindMember(self.curGroup.id, remite_id, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if self._is_destroy then
                 return
             end
@@ -89,9 +89,9 @@ function M:FillView()
                 ViewUtil.ErrorTip(nil, "请输入转让数量")
                 return
             end
-            ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             fgCtr:FG_FagRemit(self.curGroup.id, remite_id, ad2d(remite_num), function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if self._is_destroy then
                     return
                 end
@@ -112,7 +112,6 @@ function M:SetCallback(callback)
     self.callback = callback
 end
 
-
 -- 销毁窗口
 function M:Destroy(remove_map)
     if self.change and self.callback then

lua_probject/base_project/Game/View/NewGroup/GroupSetDefaultGameView.lua

@@ -59,9 +59,6 @@ function M:FillData(list, index,callbackFill)
 		MarkSelect.onClick:Set(function()
 			self:MarkPlay(MarkSelect, tem.id, MarkSelect.selected)
 		end)
-	
-	
-		
 	end
 	local btn_confirm = self._view:GetChild("btn_confirm")
 	btn_confirm.onClick:Set(function()
@@ -70,25 +67,16 @@ function M:FillData(list, index,callbackFill)
 		end
 		self:Destroy()
 	end)
-	
-
-	
-	
 end
 
-
-
-
-
-
 function M:MarkPlay(markS, pid, isMark)
 	--[[local fgCtr = ControllerManager.GetController(NewGroupController)
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     fgCtr:FG_MarkPlay(self.group_id, pid, isMark, function(res)
         if self._is_destroy then
             return
         end
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode == 0 then
         	local group = DataManager.groups:get(self.group_id)
 			group:markPlay(pid, isMark)
@@ -116,11 +104,6 @@ function M:MarkPlay(markS,pid,isMark)
 	if self.callbackFill then
 		self.callbackFill()
 	end
-	
-	
 end
 
-
-
-
 return M

lua_probject/base_project/Game/View/NewGroup/GroupSetTagView.lua

@@ -32,7 +32,7 @@ function M:init(url, member)
     ]]
 
     self._view:GetChild("btn_ok").onClick:Set(function()
-        ViewUtil.ShowModalWait(nil)
+        ViewUtil.ShowModalWait2(nil)
         --local score = tonumber(tex_tag.text) or 0
         local score = tex_tag.text
         local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -40,7 +40,7 @@ function M:init(url, member)
             if self._is_destroy then
                 return
             end
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "备注失败")
             else

lua_probject/base_project/Game/View/NewGroup/GroupSettingView.lua

@@ -18,18 +18,17 @@ function GroupSettingView.new(blur_view)
     return self
 end
 
-
 local function __removeGroup(self, msg, curData)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local _curren_msg = MsgWindow.new(self._root_view, msg, MsgWindow.MsgMode.OkAndCancel)
     _curren_msg.onOk:Add(function()
-        ViewUtil.ShowModalWait(self._root_view)
+        ViewUtil.ShowModalWait2(self._root_view)
         local func = curData.owner == DataManager.SelfUser.account_id and fgCtr.FG_RemoveGroup or fgCtr.FG_ExitGroup
         func(fgCtr, curData.id, function(res)
             if self._is_destroy then
                 return
             end
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode == 0 then
                 self.change = true
                 local groups = DataManager.groups.groupList
@@ -44,7 +43,6 @@ local function __removeGroup(self,msg,curData)
         end)
     end)
     _curren_msg:Show()
-	
 end
 
 function M:init(url)
@@ -70,13 +68,11 @@ function M:init(url)
             local option = group.option or 0
             if bit:_and(option, 2) > 0 then
                 self._view:GetController("opt").selectedIndex = 1
-                
             else
                 self._view:GetController("opt").selectedIndex = 0
             end
         end
     end)
-
 end
 
 function M:FillData()
@@ -112,15 +108,12 @@ function M:FillData()
     if #groups == 0 then
         self._view:GetController("opt").selectedIndex = 0
     end
-
-
 end
 
 function M:SetCallback(callback)
     self.callback = callback
 end
 
-
 -- 销毁窗口
 function M:Destroy(remove_map)
     if self.change and self.callback then
@@ -129,5 +122,4 @@ function M:Destroy(remove_map)
     BaseWindow.Destroy(self, remove_map)
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/JoinGroupView.lua

@@ -38,10 +38,10 @@ function M:init(url)
             ViewUtil.ErrorTip(-12, "您输入的大联盟ID少于六位！")
             return
         end
-        ViewUtil.ShowModalWait(self._root_view)
+        ViewUtil.ShowModalWait2(self._root_view)
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_JoinGroup(tonumber(self._texnum_str), function(response)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if self._is_destroy then
                 return
             end
@@ -70,7 +70,6 @@ function M:OnNumButtonAction(context)
             self._currenIndex = self._currenIndex + 1
             self._texnum_str = self._texnum_str .. typer
             self.tex_num.text = self._texnum_str
-            
         end
     end
 end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupAddMemberInfoView.lua

@@ -29,13 +29,13 @@ function M:init(url)
 	)
 	self._view:GetChild("btn_qd").onClick:Set(
 		function()
-			ViewUtil.ShowModalWait()
+			ViewUtil.ShowModalWait2()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_AddMember(
 				self.group_id,
 				self.member_id,
 				function(response)
-					ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					if (response.ReturnCode == 0) then
 						ViewUtil.ErrorTip(-1, '添加成功！', 1)
 					else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupBanSameTableView.lua

@@ -62,15 +62,15 @@ function M:init(url)
 
 	local fgCtr = ControllerManager.GetController(NewGroupController)
 	self._view:GetChild("btn_search_member").onClick:Set(function()
-		ViewUtil.ShowModalWait(nil)
+		ViewUtil.ShowModalWait2(nil)
 		local qid = tonumber(self._view:GetChild("tex_find_memb").text)
 		if not qid then
-			ViewUtil.CloseModalWait()
+			ViewUtil.CloseModalWait2()
 			ViewUtil.ErrorTip(nil, "输入ID进行搜索")
 			return
 		end
 		fgCtr:FG_FindMember(self.group_id, qid, function(res)
-			ViewUtil.CloseModalWait()
+			ViewUtil.CloseModalWait2()
 			if self._is_destroy then
 				return
 			end
@@ -118,9 +118,9 @@ function M:init(url)
 				table.insert(del_list, tem.uid)
 			end
 		end
-		ViewUtil.ShowModalWait()
+		ViewUtil.ShowModalWait2()
 		fgCtr:FG_SetBanTable(self.group_id, self.member_id, set_list, del_list, function(res)
-			ViewUtil.CloseModalWait()
+			ViewUtil.CloseModalWait2()
 			if res.ReturnCode == 0 then
 				self:Destroy()
 				ViewUtil.ErrorTip(-1, "禁止同桌设置成功")
@@ -171,10 +171,10 @@ function M:getMemberData(index)
 	-- if index == 0 then
 	-- 	group:clearMember()
 	-- end
-	ViewUtil.ShowModalWait(nil)
+	ViewUtil.ShowModalWait2(nil)
 	local fgCtr = ControllerManager.GetController(NewGroupController)
 	fgCtr:FG_GroupMembers(self.group_id, index, 10, false, 1, function(res)
-		ViewUtil.CloseModalWait()
+		ViewUtil.CloseModalWait2()
 		if res.ReturnCode ~= 0 then
 			ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
 		else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView.lua

@@ -459,7 +459,7 @@ function M:FillFagData()
         pt(self.hpData)
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        ViewUtil.ShowModalWait(self._root_view)
+        ViewUtil.ShowModalWait2(self._root_view)
         if not self.play then
             -- 新增玩法
             fgCtr:FG_AddPlay(self.group_id, game_id, _data, name, self.hpData, hpOnOff, group.type, self.table_color,
@@ -467,7 +467,7 @@ function M:FillFagData()
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     ---- print("======新增玩法=============")
                     --pt(res)
                     if res.ReturnCode == 0 then
@@ -508,7 +508,7 @@ function M:FillFagData()
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     ---- print("======修改玩法=============")
                     --pt(res)
                     if res.ReturnCode == 0 then

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -552,7 +552,7 @@ function M:FillFagData()
         pt(self.hpData)
 
         local fgCtr = ControllerManager.GetController(NewGroupController)
-        ViewUtil.ShowModalWait(self._root_view)
+        ViewUtil.ShowModalWait2(self._root_view)
         if not self.play then
             -- 新增玩法
             fgCtr:FG_AddPlay(self.group_id, game_id, _data, name, self.hpData, hpOnOff, group.type, self.table_color,
@@ -560,7 +560,7 @@ function M:FillFagData()
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     ---- print("======新增玩法=============")
                     --pt(res)
                     if res.ReturnCode == 0 then
@@ -602,7 +602,7 @@ function M:FillFagData()
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     ---- print("======修改玩法=============")
                     --pt(res)
                     if res.ReturnCode == 0 then
@@ -1054,7 +1054,7 @@ function M:FillFagData_jiangxi()
     pt(self.hpData)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    ViewUtil.ShowModalWait(self._root_view)
+    ViewUtil.ShowModalWait2(self._root_view)
     if not self.play then
         -- 新增玩法
         fgCtr:FG_AddPlay(self.group_id, game_id, _data, name, self.hpData, hpOnOff, group.type, self.table_color,
@@ -1062,7 +1062,7 @@ function M:FillFagData_jiangxi()
                 if self._is_destroy then
                     return
                 end
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ---- print("======新增玩法=============")
                 --pt(res)
                 if res.ReturnCode == 0 then
@@ -1104,7 +1104,7 @@ function M:FillFagData_jiangxi()
                 if self._is_destroy then
                     return
                 end
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ---- print("======修改玩法=============")
                 --pt(res)
                 if res.ReturnCode == 0 then

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberFagLogView.lua

@@ -148,14 +148,14 @@ end
 function M:GetData(index)
     local filter = self:GetFilter()
     if filter == 0 then return end
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetMemberHpLog(self.group_id, self.member.uid, index, 6, filter, self.begin_time, self.end_time,
         function(res)
             if self._is_destroy then
                 return
             end
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败")
             else
@@ -265,13 +265,13 @@ function M:OnRenderItem(index, obj)
             self.lst_fag:RefreshVirtualList()
             self.lst_fag:ScrollToView(index)
         else
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             local fgCtr = ControllerManager.GetController(NewGroupController)
             fgCtr:FG_GetHpLogDetail(self.group_id, self.member.uid, data.roomid, data.time, function(res)
                 if self._is_destroy then
                     return
                 end
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败")
                 else
@@ -292,13 +292,13 @@ end
 
 -- 获取日统计数据
 function M:GetDailyData()
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPlayerDailyHPCount(self.group_id, self.member.uid, function(res)
         if self._is_destroy then
             return
         end
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取积分详情失败")
         else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMemberOperateView.lua

@@ -106,21 +106,21 @@ function M:init(url)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     self._view:GetChild("btn_deploy").onClick:Set(function()
         local gniv = GroupNumberInputView.new(nil, function(num)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             local parent_id = tonumber(num)
             fgCtr:FG_FindMember(self.group_id, parent_id, function(res)
                 if self._is_destroy then
                     return
                 end
                 if res.ReturnCode ~= 0 then
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     ViewUtil.ErrorTip(res.ReturnCode, "找不到成员")
                 elseif res.Data.partnerLev == 0 then
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     ViewUtil.ErrorTip(res.ReturnCode, "目标不是合伙人")
                 else
                     fgCtr:FG_DeployMember(self.group_id, member.uid, parent_id, function(res1)
-                        ViewUtil.CloseModalWait()
+                        ViewUtil.CloseModalWait2()
                         if (res1.ReturnCode == 0) then
                             member.parentId = parent_id
                             self._view:GetChild("tex_superior_id").text = parent_id
@@ -146,7 +146,7 @@ function M:init(url)
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res1.ReturnCode == 0 then
                         member.isvip = selected
                         self.callBack()
@@ -175,12 +175,12 @@ function M:init(url)
             end
             local _curren_msg = MsgWindow.new(nil, "确定删除该成员吗？", MsgWindow.MsgMode.OkAndCancel)
             _curren_msg.onOk:Add(function()
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 fgCtr:FG_GroupRemoveMember(self.group_id, member.uid, function(res1)
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res1.ReturnCode == 0 then
                         self.callBack(true)
                         ViewUtil.ErrorTip(-1, "已成功删除玩家")
@@ -209,13 +209,13 @@ function M:init(url)
             local str = member.ban == 1 and "确定恢复娱乐吗？" or "确定禁止娱乐吗？"
             local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel)
             _curren_msg.onOk:Add(function()
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 local val = 1 - member.ban
                 fgCtr:FG_BanMember(self.group_id, member.uid, val, 1, function(res1)
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res1.ReturnCode == 0 then
                         member.ban = val
                         pic = member.ban == 1 and "mng_del_ban" or "mng_ban"
@@ -248,13 +248,13 @@ function M:init(url)
             local str = member.group_ban == 1 and "确定恢复该合伙人整组娱乐吗？" or "确定禁止该合伙人整组娱乐吗？"
             local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel)
             _curren_msg.onOk:Add(function()
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 local val = member.group_ban == 1 and 0 or 1
                 fgCtr:FG_BanMember(self.group_id, member.uid, val, 2, function(res1)
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res1.ReturnCode == 0 then
                         member.group_ban = val
                         pic = member.group_ban == 1 and "mng_del_ban_group" or "mng_ban_group"
@@ -277,9 +277,9 @@ function M:init(url)
             if not CheckPermission(group.lev, perm_array[MngPermissionList.BanSameTable]) then
                 return
             end
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_GetBanTable(self.group_id, member.uid, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode == 0 then
                     local btv = GroupBanSameTableView.new(self.blur_view, self.group_id, member.uid, res.Data)
                     btv:Show()
@@ -297,9 +297,9 @@ function M:init(url)
         btn_set_mng.icon = "ui://NewGroup/zhengzu"
         btn_set_mng.onClick:Set(
             function()
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 fgCtr:FG_GetBanMemberHB(self.group_id, member.uid, function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     --pt(res)
                     if res.ReturnCode == 0 then
                         local diaoduView = GroupSetMemberInfoDiaoduView.new(self.group_id, member.uid)
@@ -322,13 +322,13 @@ function M:init(url)
             local str = member.lev == 3 and "确定设置玩家为副盟主吗？" or "确定取消玩家副盟主身份吗？"
             local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel)
             _curren_msg.onOk:Add(function()
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 local val = 4 - member.lev
                 fgCtr:FG_SetManager(self.group_id, member.uid, val, function(res1)
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res1.ReturnCode == 0 then
                         member.lev = val + 1
                         self.callBack()
@@ -356,13 +356,13 @@ function M:init(url)
             local str = member.partnerLev == 0 and "确定设置玩家为合伙人吗？" or "确定取消玩家合伙人身份吗？"
             local _curren_msg = MsgWindow.new(nil, str, MsgWindow.MsgMode.OkAndCancel)
             _curren_msg.onOk:Add(function()
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 local val = member.partnerLev > 0 and 2 or 1
                 fgCtr:FG_SetPartner(self.group_id, member.uid, val, function(res1)
                     if self._is_destroy then
                         return
                     end
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res1.ReturnCode == 0 then
                         member.parentId = res1.Data.parentId
                         member.partnerLev = res1.Data.partnerLev
@@ -411,17 +411,17 @@ function M:init(url)
                     self:MovePartner(parent_id, member, self._view)
                     return
                 end
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 local fgCtr = ControllerManager.GetController(NewGroupController)
                 fgCtr:FG_FindMember(self.group_id, parent_id, function(res)
                     if self._is_destroy then
                         return
                     end
                     if res.ReturnCode ~= 0 then
-                        ViewUtil.CloseModalWait()
+                        ViewUtil.CloseModalWait2()
                         ViewUtil.ErrorTip(res.ReturnCode, "找不到成员")
                     elseif res.Data.partnerLev == 0 then
-                        ViewUtil.CloseModalWait()
+                        ViewUtil.CloseModalWait2()
                         ViewUtil.ErrorTip(res.ReturnCode, "目标不是合伙人")
                     else
                         self:MovePartner(parent_id, member, self._view)
@@ -460,9 +460,9 @@ function M:init(url)
         btn_qiangzhi.onClick:Set(function()
             local msg_tip = MsgWindow.new(self._root_view, "确定全部提取吗?", MsgWindow.MsgMode.OnlyOk)
             msg_tip.onOk:Add(function(...)
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 fgCtr:FG_TakeHp1(self.group_id, member.uid, function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -486,7 +486,7 @@ end
 function M:MovePartner(parent_id, member, obj)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_MovePartner(self.group_id, member.uid, parent_id, function(res1)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if (res1.ReturnCode == 0) then
             member.parentId = parent_id
             member.partnerLev = res1.Data.partnerLev

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddMemberView.lua

@@ -56,10 +56,10 @@ function M:FillView()
             return
         end
         if self._texnum_str == "" then return end
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_AddMember(self.group_id, tonumber(self._texnum_str), function(response)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if (response.ReturnCode == 0) then
                 ViewUtil.ErrorTip(-1, "添加成功！", 1)
             else
@@ -86,10 +86,10 @@ end
 function M:GetJoinsData()
     local group = DataManager.groups:get(self.group_id)
     if group.joins > 0 then
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_GroupJoins(self.group_id, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if (res.ReturnCode == 0) then
                 local joins = res.Data.joins
                 group.joins = #joins
@@ -127,10 +127,10 @@ function M:FillJoinList(data)
 end
 
 function M:VerifyPlayerJoin(id, allow)
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupVerifyJoin(self.group_id, id, allow, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if (res.ReturnCode == 0) then
             self:GetJoinsData()
         else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngAddPartner.lua

@@ -16,9 +16,7 @@ function GroupMngAddPartner.new(group_id, member,callback)
     return self
 end
 
-
 function M:init(url)
-
     BaseWindow.init(self, url)
 
     local member = self.member
@@ -37,7 +35,7 @@ function M:init(url)
             if self._is_destroy then
                 return
             end
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res1.ReturnCode == 0 then
                 member.parentId = res1.Data.parentId
                 member.partnerLev = res1.Data.partnerLev
@@ -50,5 +48,4 @@ function M:init(url)
     end)
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngFagListView.lua

@@ -20,7 +20,6 @@ function GroupMngFagListView.new(group_id)
 end
 
 function M:initData()
-
     self.fag_result_data = {}
     self.fag_data = {}
 
@@ -36,9 +35,6 @@ function M:initData()
 end
 
 function M:FillView()
-
-    
-
     self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupFagList")
     local group = DataManager.groups:get(self.group_id)
     if group.lev < 3 then
@@ -72,7 +68,6 @@ function M:FillView()
                 self.fag_data = {}
                 self:GetFagData(0)
             else
-
                 self.quary_id = 0
                 self.query_nick = ""
 
@@ -98,7 +93,8 @@ function M:FillView()
         self.query_nick = ""
     end)
 
-    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, function()
+    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"),
+        self._view:GetChild("btn_date2"), -308, 0, function()
             self:GetMngFagInfo()
         end)
 end
@@ -116,7 +112,7 @@ function M:GetFagData(index)
             self.fag_result_data = {}
         end
     end
-	ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
 
     --type：1管理员加分，2管理员减分，3合伙人加分，4合伙人减分
     local type = self._view:GetController("page").selectedIndex + 1
@@ -126,7 +122,7 @@ function M:GetFagData(index)
     end
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetMngHpLog(self.group_id, index, num, type, qid, qName, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -156,10 +152,10 @@ end
 
 -- 获取体力值统计
 function M:GetHpStatistic()
-	-- ViewUtil.ShowModalWait(nil, "正在获取数据")
+    -- ViewUtil.ShowModalWait2(nil, "正在获取数据")
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetMngHpStatistic(self.group_id, function(res)
-        -- ViewUtil.CloseModalWait()
+        -- ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -176,13 +172,13 @@ end
 
 -- 获取管理员总计/合伙人总计
 function M:GetMngFagInfo()
-	ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local begin_time, end_time = self.time_panel1:GetDate()
     local group = DataManager.groups:get(self.group_id)
     local type = group.lev < 3 and 1 or 2
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetMngHpInfo(self.group_id, type, begin_time, end_time, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngGameListView.lua

@@ -127,12 +127,12 @@ function M:OnRenderItem(index, obj)
 		local msg_del = MsgWindow.new(nil, "删除该玩法,该玩法的相关数据也会被清除。\r确定要删除吗？", MsgWindow.MsgMode.OkAndCancel)
 		msg_del.onOk:Add(function(...)
 			local fgCtr = ControllerManager.GetController(NewGroupController)
-			ViewUtil.ShowModalWait()
+			ViewUtil.ShowModalWait2()
 			fgCtr:FG_DelPlay(self.group_id, play.id, function(res)
 				if self._is_destroy then
 					return
 				end
-				ViewUtil.CloseModalWait()
+				ViewUtil.CloseModalWait2()
 				if res.ReturnCode == 0 then
 					group:delPlay(play.id)
 					self.lst_play.numItems = #group.playList
@@ -170,12 +170,12 @@ end
 
 function M:MarkPlay(markS, pid, isMark)
 	local fgCtr = ControllerManager.GetController(NewGroupController)
-	ViewUtil.ShowModalWait()
+	ViewUtil.ShowModalWait2()
 	fgCtr:FG_MarkPlay(self.group_id, pid, isMark, function(res)
 		if self._is_destroy then
 			return
 		end
-		ViewUtil.CloseModalWait()
+		ViewUtil.CloseModalWait2()
 		if res.ReturnCode == 0 then
 			local group = DataManager.groups:get(self.group_id)
 			group:markPlay(pid, isMark)
@@ -229,12 +229,12 @@ end
 -- 禁止、恢复玩法
 function M:BanPlay(pid, ban)
 	local fgCtr = ControllerManager.GetController(NewGroupController)
-	ViewUtil.ShowModalWait()
+	ViewUtil.ShowModalWait2()
 	fgCtr:FG_BanPlay(self.group_id, pid, ban, function(res)
 		if self._is_destroy then
 			return
 		end
-		ViewUtil.CloseModalWait()
+		ViewUtil.CloseModalWait2()
 		if res.ReturnCode == 0 then
 			local group = DataManager.groups:get(self.group_id)
 			group:banPlay(pid, ban)

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberInfoView.lua

@@ -1,4 +1,3 @@
-
 -- 开桌统计
 local GroupMngMemberInfoView = {}
 
@@ -17,11 +16,10 @@ function M:initData()
 end
 
 function M:ShowPeopleNum()
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetMembersCount(self.group_id, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
 
         if res.ReturnCode == 0 then
             self._view:GetChild('tex_memb_num').text = res.Data.member_num
@@ -32,10 +30,6 @@ end
 
 function M:InitView()
     self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupMemberInfo")
-
 end
 
-
-
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView.lua

@@ -75,11 +75,11 @@ function M:FillView()
     local ctr_search = self._view:GetController('search')
     self._view:GetChild('btn_search').onClick:Set(
         function()
-            ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = self._view:GetChild('tex_id').text
             local qid, qnick
             if text == "" then
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -90,7 +90,7 @@ function M:FillView()
                 self.group_id,
                 qid,
                 function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -141,7 +141,7 @@ function M:FillView()
             if self._texnum_str == '' then
                 return
             end
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             local fgCtr = ControllerManager.GetController(NewGroupController)
             fgCtr:GetAddMember(
                 self.group_id,
@@ -149,7 +149,7 @@ function M:FillView()
                 function(response)
                     printlog("响应获取添加玩家==》》》")
                     pt(response)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if (response.ReturnCode and response.ReturnCode == 0) then
                         GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
                         self:ClearNumTex()
@@ -191,7 +191,7 @@ function M:GetMemberData(index)
         group:clearMember()
     end
 
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupMembers11(
         self.group_id,
@@ -200,7 +200,7 @@ function M:GetMemberData(index)
         false,
         1,
         function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
             else
@@ -222,14 +222,14 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback)
             nil,
             function(num)
                 num = ad2d((is_add and num or -num))
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 local fgCtr = ControllerManager.GetController(NewGroupController)
                 fgCtr:FG_ChangeFag(
                     gid,
                     pid,
                     num,
                     function(res1)
-                        ViewUtil.CloseModalWait()
+                        ViewUtil.CloseModalWait2()
                         -- if gniv._is_destroy then
                         --     return
                         -- end
@@ -397,11 +397,11 @@ function M:FillItem(obj, member, refresh)
 
     obj:GetChild("super_btn").onClick:Set(
         function()
-            ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = member.uid
             local qid, qnick
             if text == "" then
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -412,7 +412,7 @@ function M:FillItem(obj, member, refresh)
                 self.group_id,
                 qid,
                 function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -449,12 +449,12 @@ end
 function M:GetJoinsData()
     local group = DataManager.groups:get(self.group_id)
     if group.joins > 0 then
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_GroupJoins(
             self.group_id,
             function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if (res.ReturnCode == 0) then
                     local joins = res.Data.joins
                     group.joins = #joins
@@ -497,14 +497,14 @@ function M:FillJoinList(data)
 end
 
 function M:VerifyPlayerJoin(id, allow)
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupVerifyJoin(
         self.group_id,
         id,
         allow,
         function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if (res.ReturnCode == 0) then
                 self:GetJoinsData()
             else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberListView1.lua

@@ -94,11 +94,11 @@ function M:FillView()
     local ctr_search = self._view:GetController('search')
     self._view:GetChild('btn_search').onClick:Set(
         function()
-            ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = self._view:GetChild('tex_id').text
             local qid, qnick
             if text == "" then
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -109,7 +109,7 @@ function M:FillView()
                 self.group_id,
                 qid,
                 function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -160,7 +160,7 @@ function M:FillView()
             if self._texnum_str == '' then
                 return
             end
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             local fgCtr = ControllerManager.GetController(NewGroupController)
             fgCtr:GetAddMember(
                 self.group_id,
@@ -168,7 +168,7 @@ function M:FillView()
                 function(response)
                     printlog("响应获取添加玩家==》》》")
                     pt(response)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if (response.ReturnCode and response.ReturnCode == 0) then
                         GroupAddMemberInfoView.new(self.group_id, tonumber(self._texnum_str)):SetAddMember(response.Data)
                         self:ClearNumTex()
@@ -226,7 +226,7 @@ function M:GetMemberData(index)
         group:clearMember()
     end
 
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupMembers12(
         self.group_id,
@@ -235,7 +235,7 @@ function M:GetMemberData(index)
         self.stype,
         self.online,
         function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, '获取成员列表失败')
             else
@@ -257,14 +257,14 @@ local function __change_fag(gid, pid, is_add, cur_hp, callback)
             nil,
             function(num)
                 num = ad2d((is_add and num or -num))
-                ViewUtil.ShowModalWait()
+                ViewUtil.ShowModalWait2()
                 local fgCtr = ControllerManager.GetController(NewGroupController)
                 fgCtr:FG_ChangeFag(
                     gid,
                     pid,
                     num,
                     function(res1)
-                        ViewUtil.CloseModalWait()
+                        ViewUtil.CloseModalWait2()
                         -- if gniv._is_destroy then
                         --     return
                         -- end
@@ -471,11 +471,11 @@ function M:FillItem(obj, member, refresh)
     superBtn.visible = group.lev == 1
     obj:GetChild("super_btn").onClick:Set(
         function()
-            ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = member.uid
             local qid, qnick
             if text == "" then
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -486,7 +486,7 @@ function M:FillItem(obj, member, refresh)
                 self.group_id,
                 qid,
                 function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -523,12 +523,12 @@ end
 function M:GetJoinsData()
     local group = DataManager.groups:get(self.group_id)
     if group.joins > 0 then
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_GroupJoins(
             self.group_id,
             function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if (res.ReturnCode == 0) then
                     local joins = res.Data.joins
                     group.joins = #joins
@@ -571,14 +571,14 @@ function M:FillJoinList(data)
 end
 
 function M:VerifyPlayerJoin(id, allow)
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupVerifyJoin(
         self.group_id,
         id,
         allow,
         function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if (res.ReturnCode == 0) then
                 self:GetJoinsData()
             else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngMemberStatView.lua

@@ -34,7 +34,8 @@ function M:InitView()
         self:GetRecordData(self.lst_record.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0)
 
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()
@@ -53,25 +54,21 @@ function M:InitView()
         self.begin_time, self.end_time = self.time_panel:GetDate()
         self:GetRecordData(0)
     end)
-
 end
 
 -- 获取合伙人数据
 function M:GetPartnerData(callback)
-
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPartnerList(self.group_id, 1, nil, nil, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         callback(res)
     end)
 end
 
 function M:GetRecordData(index, init)
-
     if init == nil or init == false then
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
     end
 
     quary_id         = tonumber(self._view:GetChild("tex_id").text)
@@ -86,13 +83,13 @@ function M:GetRecordData(index,init)
     end
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetMemberStat(self.group_id, quary_id,partner_id, index, 6, time_type,self.begin_time,self.end_time,function(res)
+    fgCtr:FG_GetMemberStat(self.group_id, quary_id, partner_id, index, 6, time_type, self.begin_time, self.end_time,
+        function(res)
             if init == nil or init == false then
-            ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
             end
 
             if res.ReturnCode == 0 then
-
                 local members = res.Data.members
                 for i = 1, #members do
                     self.record_data[#self.record_data + 1] = members[i]
@@ -103,7 +100,6 @@ function M:GetRecordData(index,init)
 end
 
 function M:FillRecordItem(data, obj)
-
     obj:GetChild("tex_name").text          = ViewUtil.stringEllipsis(data.nick)
     obj:GetChild("tex_round").text         = "" .. data.round
     obj:GetChild("tex_win").text           = "" .. data.win
@@ -125,5 +121,4 @@ function M:OnRenderRecordItem(index, obj)
     self:FillRecordItem(data, obj)
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView.lua

@@ -68,24 +68,22 @@ function M:InitView()
     end
     local btn_ok = self._view:GetChild("btn_ok")
     btn_ok.onClick:Set(function()
-        
-        ViewUtil.ShowModalWait(nil)
+        ViewUtil.ShowModalWait2(nil)
         local qid = tonumber(self._view:GetChild("tex_num").text)
         if not qid then
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             ViewUtil.ErrorTip(nil, "输入ID进行搜索！")
             return
         end
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_FindMember(self.group_id, qid, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if self._is_destroy then
                 return
             end
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
             else
-
                 local member = res.Data
                 if member.parentId ~= 0 and member.parentId ~= DataManager.SelfUser.account_id then
                     ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
@@ -125,28 +123,23 @@ function M:OnNumButtonAction(context)
         end
     else
         if (self._currenIndex < 6) then
-
             self._currenIndex = self._currenIndex + 1
             self._texnum_str = self._texnum_str .. typer
             self.tex_num.text = self._texnum_str
-            
         end
     end
 end
 
-
 -- 获取合伙人数据
 function M:GetPartnerData(index, callback)
-
     local group = DataManager.groups:get(self.group_id)
     if index == 0 then
         self.partner_data = {}
     end
-	ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPartnerList(self.group_id, 0, index, 10, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
         else
@@ -161,21 +154,18 @@ end
 
 -- 获取合伙人数据
 function M:QueryPartnerData(query_id, query_nick)
-
     query_nick = query_nick or ""
     query_id = query_id or 0
 
     local group = DataManager.groups:get(self.group_id)
 
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_QueryPartnerList(self.group_id, query_id, query_nick, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
         else
-            
             if res.Data.members ~= nil and #res.Data.members > 0 then
                 self._view:GetController("search").selectedIndex = 1
                 local lst_partner_search = self._view:GetChild("lst_partner_search")
@@ -211,10 +201,10 @@ end
 local function __change_fag(gid, pid, is_add, cur_hp, callback)
     local gniv = GroupNumberInputView.new(nil, function(num)
         num = ad2d((is_add and num or -num))
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_ChangeFag(gid, pid, num, function(res1)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             -- if gniv._is_destroy then
             --     return
             -- end
@@ -243,7 +233,6 @@ end
 
 -- 填充合伙人对象
 function M:FillItem(obj, partner)
-
     local group = DataManager.groups:get(self.group_id)
     local perm_array = MngPermission.getPermData(group.permission)
 
@@ -283,7 +272,6 @@ function M:FillItem(obj, partner)
         end)
     end)
     obj:GetChild("btn_fag_minus").onClick:Set(function()
-
         if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
             return
         end
@@ -331,13 +319,8 @@ function M:FillItem(obj, partner)
         local GroupMngPartnerListView2 = GroupMngPartnerListView2.new(self.group_id, partner.uid)
         GroupMngPartnerListView2:Show()
     end)
-
-    
 end
 
-
-
-
 -- 列表对象填充
 function M:OnRenderItem(index, obj)
     local partner = self.partner_data[index + 1]

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView1.lua

@@ -67,24 +67,22 @@ function M:InitView()
     end
     local btn_ok = self._view:GetChild("btn_ok")
     btn_ok.onClick:Set(function()
-        
-        ViewUtil.ShowModalWait(nil)
+        ViewUtil.ShowModalWait2(nil)
         local qid = tonumber(self._view:GetChild("tex_num").text)
         if not qid then
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             ViewUtil.ErrorTip(nil, "输入ID进行搜索！")
             return
         end
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_FindMember(self.group_id, qid, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if self._is_destroy then
                 return
             end
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
             else
-
                 local member = res.Data
                 if member.parentId ~= 0 and member.parentId ~= DataManager.SelfUser.account_id then
                     ViewUtil.ErrorTip(res.ReturnCode, "找不到成员！")
@@ -124,28 +122,23 @@ function M:OnNumButtonAction(context)
         end
     else
         if (self._currenIndex < 6) then
-
             self._currenIndex = self._currenIndex + 1
             self._texnum_str = self._texnum_str .. typer
             self.tex_num.text = self._texnum_str
-            
         end
     end
 end
 
-
 -- 获取合伙人数据
 function M:GetPartnerData(index, callback)
-
     local group = DataManager.groups:get(self.group_id)
     if index == 0 then
         self.partner_data = {}
     end
-	ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupTiChu(self.group_id, index, 10, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取踢出列表失败")
         else
@@ -162,21 +155,18 @@ end
 
 -- 获取合伙人数据
 function M:QueryPartnerData(query_id, query_nick)
-
     query_nick = query_nick or ""
     query_id = query_id or 0
 
     local group = DataManager.groups:get(self.group_id)
 
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_QueryPartnerList(self.group_id, query_id, query_nick, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
         else
-            
             if res.Data.members ~= nil and #res.Data.members > 0 then
                 -- self._view:GetController("search").selectedIndex = 1
                 local lst_partner_search = self._view:GetChild("lst_partner_search")
@@ -212,10 +202,10 @@ end
 local function __change_fag(gid, pid, is_add, cur_hp, callback)
     local gniv = GroupNumberInputView.new(nil, function(num)
         num = ad2d((is_add and num or -num))
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_ChangeFag(gid, pid, num, function(res1)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             -- if gniv._is_destroy then
             --     return
             -- end
@@ -244,7 +234,6 @@ end
 
 -- 填充合伙人对象
 function M:FillItem(obj, partner)
-
     local group = DataManager.groups:get(self.group_id)
     local perm_array = MngPermission.getPermData(group.permission)
 
@@ -285,7 +274,6 @@ function M:FillItem(obj, partner)
         end)
     end)
     obj:GetChild("btn_fag_minus").onClick:Set(function()
-
         if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
             return
         end
@@ -331,9 +319,6 @@ function M:FillItem(obj, partner)
     end)
 end
 
-
-
-
 -- 列表对象填充
 function M:OnRenderItem(index, obj)
     local partner = self.partner_data[index + 1]

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerListView2.lua

@@ -24,8 +24,6 @@ function GroupMngPartnerListView2.new(gid,tagId)
     return self
 end
 
-
-
 function M:InitView()
     -- self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/Win_StatMember")
     BaseWindow.init(self, "ui://NewGroup/Win_StatMember")
@@ -46,20 +44,16 @@ function M:InitView()
     self:GetPartnerData(0)
 end
 
-
-
 -- 获取合伙人数据
 function M:GetPartnerData(index, callback)
-
     local group = DataManager.groups:get(self.group_id)
     if index == 0 then
         self.partner_data = {}
     end
-	ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPartnerList(self.group_id, 0, index, 10, function(res)
-
-        ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
             else
@@ -75,23 +69,19 @@ end
 
 -- 获取合伙人数据
 function M:QueryPartnerData(query_id, query_nick)
-
     query_nick = query_nick or ""
     query_id = query_id or 0
 
     local group = DataManager.groups:get(self.group_id)
 
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_QueryPartnerList(self.group_id, query_id, query_nick, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人列表失败")
         else
-            
             if res.Data.members ~= nil and #res.Data.members > 0 then
-               
                 local lst_partner_search = self._view:GetChild("lst_partner_search")
                 lst_partner_search:RemoveChildrenToPool()
                 for i = 1, #res.Data.members do
@@ -125,10 +115,10 @@ end
 local function __change_fag(gid, pid, is_add, cur_hp, callback)
     local gniv = GroupNumberInputView.new(nil, function(num)
         num = ad2d((is_add and num or -num))
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_ChangeFag(gid, pid, num, function(res1)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             -- if gniv._is_destroy then
             --     return
             -- end
@@ -157,7 +147,6 @@ end
 
 -- 填充合伙人对象
 function M:FillItem(obj, partner)
-
     local group = DataManager.groups:get(self.group_id)
     local perm_array = MngPermission.getPermData(group.permission)
 
@@ -192,11 +181,9 @@ function M:FillItem(obj, partner)
             end
             self.lst_partner.numItems = #self.partner_data
             -- 搜索出的玩家显示
-           
         end)
     end)
     obj:GetChild("btn_fag_minus").onClick:Set(function()
-
         if not CheckPermission(group.lev, perm_array[MngPermissionList.SetFag]) then
             return
         end
@@ -212,7 +199,6 @@ function M:FillItem(obj, partner)
             end
             self.lst_partner.numItems = #self.partner_data
             -- 搜索出的玩家显示
-           
         end)
     end)
 
@@ -253,9 +239,6 @@ function M:FillItem(obj, partner)
     )
 end
 
-
-
-
 -- 列表对象填充
 function M:OnRenderItem(index, obj)
     local partner = self.partner_data[index + 1]

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerRewardsView.lua

@@ -261,14 +261,14 @@ function M:GetRewardsData()
     local data
     if #self.search_partner_data == 0 then
         if #self.partner_data == 0 then return end
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         data = self.partner_data[self.lst_partner.selectedIndex + 1]
     else
         data = self.search_partner_data[1]
     end
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetRewards(self.group_id, data.uid, data.partnerLev, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -296,7 +296,7 @@ function M:GetRewardsLog()
     local data
     if #self.search_partner_data == 0 then
         if #self.partner_data2 == 0 then return end
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         data = self.partner_data2[self.lst_partner2.selectedIndex + 1]
     else
         data = self.search_partner_data[1]
@@ -304,7 +304,7 @@ function M:GetRewardsLog()
     local begin_time, end_time = self.time_panel1:GetDate()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetRewardsLog(self.group_id, #self.rewards_log, 6, begin_time, end_time, data.uid, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -333,13 +333,13 @@ end
 
 -- 获取奖励统计
 function M:GetRewardsStatistic()
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local data = self.partner_data2[self.lst_partner2.selectedIndex + 1]
     local begin_time, end_time = self.time_panel2:GetDate()
     local pid = tonumber(self._view:GetChild("cb_play").value)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetRewardStatistic(self.group_id, pid, begin_time, end_time, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -429,9 +429,9 @@ function M:OnRenderRewardsItem(index, obj)
             end
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, false, tem, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
                 else
@@ -453,10 +453,10 @@ function M:OnRenderRewardsItem(index, obj)
                 pdata = self.search_partner_data[1]
             end
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetRewards(self.group_id, data.pid, pdata.partnerLev, pdata.uid, true, data.cur_value,
                 function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
                     else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua

@@ -31,7 +31,7 @@ end
 --     local fgCtr = ControllerManager.GetController(NewGroupController)
 --     fgCtr:FG_GetMembersCount(self.group_id,function(res)
 
---         ViewUtil.CloseModalWait()
+--         ViewUtil.CloseModalWait2()
 
 --         if res.ReturnCode == 0 then
 --             self._view:GetChild('tex_memb_num').text = res.Data.member_num
@@ -97,11 +97,11 @@ function M:InitView()
     self._view:GetChild('btn_search').onClick:Set(
         function()
             --printlog("aaaaaaaaaa1111111111111111111111111111111111111111111111")
-            ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = self._view:GetChild('tex_id').text
             local qid, qnick
             if text == "" then
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -118,7 +118,7 @@ function M:InitView()
                 function(res)
                     -- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
                     -- pt(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -149,7 +149,7 @@ function M:InitView()
 end
 
 function M:GetRecordData(index)
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
 
     local time_type = self._view:GetController("type").selectedIndex
     if self.begin_time ~= nil and self.end_time ~= nil then
@@ -158,7 +158,7 @@ function M:GetRecordData(index)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPartnerStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
 
         if res.ReturnCode == 0 then
             local members = res.Data.members
@@ -206,10 +206,10 @@ function M:FillRecordItem(data, obj)
 
     local btn_check_members = obj:GetChild("btn_check_members")
     btn_check_members.onClick:Set(function()
-        ViewUtil.ShowModalWait(self._root_view)
+        ViewUtil.ShowModalWait2(self._root_view)
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_GetTotalHp(self.group_id, data.uid, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode == 0 then
                 local hp                      = d2ad(res.Data.hp)
                 tex_total_score.text          = hp
@@ -261,7 +261,7 @@ function M:FillRecordItem(data, obj)
         local gfiv = GroupNumberInputView.new(self._root_view, function(num)
             local fgCtr = ControllerManager.GetController(NewGroupController)
             fgCtr:FG_SetPartnerThreshold(self.group_id, data.uid, num, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置失败")
                 else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatView.lua

@@ -31,7 +31,8 @@ function M:InitView()
         self:GetRecordData(self.lst_record.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0)
     self.begin_time, self.end_time = self.time_panel:GetDate()
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()
@@ -52,8 +53,7 @@ function M:InitView()
 end
 
 function M:GetRecordData(index)
-
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
 
     local time_type = self._view:GetController("type").selectedIndex
 
@@ -62,12 +62,12 @@ function M:GetRecordData(index)
     end
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type, self.begin_time, self.end_time, index, 6, function(res)
-
+    fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type,
+        self.begin_time, self.end_time, index, 6, function(res)
             if self._is_destroy then
                 return
             end
-        ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败")
             else
@@ -77,7 +77,9 @@ function M:GetRecordData(index)
                 end
                 self.lst_record.numItems = #self.record_data
 
-            printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333",res.Data.total_round,"    ",res.Data.valid_round)
+                printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333", res.Data
+                    .total_round,
+                    "    ", res.Data.valid_round)
                 pt(res.Data)
                 if index == 0 then
                     --self._view:GetChild("tex_num1").text = ""..res.Data.total
@@ -171,9 +173,8 @@ function M:OnRenderRecordItem(index, obj)
     self:FillRecordItem(data, obj)
 end
 
-
 function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType)
-    ViewUtil.ShowModalWait(self._view, "正在分享...")
+    ViewUtil.ShowModalWait2(self._view, "正在分享...")
     UIPackage.AddPackage("base/rank/ui/Rank")
     local result_view = UIPackage.CreateObjectFromURL("ui://Rank/ResultView")
     result_view.visible = false
@@ -212,7 +213,7 @@ function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore,
                 ShareScreenShotWithOption(function()
                     result_view:Dispose()
                 end)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 break
             end
             coroutine.wait(1)
@@ -291,13 +292,13 @@ function M:OnShowRecordInfo(rdata,ids)
                 main._totalRound = tonumber(rdata.round)
                 main:FillRoomData(DataManager.SelfUser.playback[playback_id][i])
             else
-                ViewUtil.ShowModalWait(self._view)
+                ViewUtil.ShowModalWait2(self._view)
                 local _data = {}
                 _data["military_id"] = playback_id
                 _data["round"] = tostring(i)
                 local loddyCtr1 = ControllerManager.GetController(LoddyController)
                 loddyCtr1:RequestPlayBack(_data, function(code, data)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if code == 0 then
                         if DataManager.SelfUser.playback[playback_id] ~= nil then
                             DataManager.SelfUser.playback[playback_id][i] = data

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPlayStatView.lua

@@ -13,7 +13,6 @@ function GroupMngPlayStatView.new(gid)
 end
 
 function M:initData()
-    
     self:GetConsumeStatData()
 end
 
@@ -34,18 +33,19 @@ function M:InitView()
         self:GetConsumeStatData()
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0)
 end
 
 function M:GetConsumeStatData()
-	ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local begin_time, end_time = self.time_panel:GetDate()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetConsumeStat(self.group_id, begin_time, end_time, function(res)
         if self._is_destroy then
             return
         end
-		ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取统计数据失败")
         else
@@ -62,7 +62,6 @@ function M:GetConsumeStatData()
             end
 
             self.lst_consume_stat.numItems = #self.consume_stat
-
         end
     end)
 end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngProportionView.lua

@@ -36,19 +36,20 @@ function M:FillView()
         self:GetPropData(self.lst_prop.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0)
 end
 
 -- 获取抽水数据
 function M:GetPropData(index)
-	ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local begin_time, end_time = self.time_panel:GetDate()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPropLog(self.group_id, index, 8, begin_time, end_time, function(res)
         if self._is_destroy then
             return
         end
-		ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败")
         else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRankView.lua

@@ -138,12 +138,14 @@ function M:FillView()
         end
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
-    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btndate1"), self._view:GetChild("btndate2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0)
+    self.time_panel1 = TimeSettingPanel.new(self._view, self._view:GetChild("btndate1"), self._view:GetChild("btndate2"),
+        -308, 0)
 end
 
 function M:GetRankData(index)
-	ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local begin_time, end_time = self.time_panel:GetDate()
     local pid = tonumber(self._view:GetChild("cb_play").value)
     local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -151,7 +153,7 @@ function M:GetRankData(index)
         if self._is_destroy then
             return
         end
-		ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败")
         else
@@ -167,7 +169,7 @@ function M:GetRankData(index)
 end
 
 function M:GetWinRankData(index)
-	ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local begin_time, end_time = self.time_panel1:GetDate()
     local pid = tonumber(self._view:GetChild("cb_play").value)
     local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -175,7 +177,7 @@ function M:GetWinRankData(index)
         if self._is_destroy then
             return
         end
-		ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取总输赢排名信息失败")
         else
@@ -234,14 +236,14 @@ function M:OnRenderWinRankItem(index, obj)
 end
 
 function M:GetRoundData()
-	ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local pid = tonumber(self._view:GetChild("cb_play").value)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetRoundStat(self.group_id, pid, function(res)
         if self._is_destroy then
             return
         end
-		ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取排名信息失败")
         else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngRoomStatView.lua

@@ -52,7 +52,6 @@ function M:InitView()
     end
     self.lst_player_record.scrollPane.onPullUpRelease:Set(function()
         self:GetRecordData(self.lst_player_record.numItems, self.qid)
-        
     end)
 
     self._view:GetChild("btn_search").onClick:Set(function()
@@ -76,13 +75,12 @@ function M:InitView()
         self.player_record_data = {}
         self.lst_player_record.numItems = 0
         self.isFindCode = false
-		
     end)
 end
 
 function M:GetRecordData(index, qid)
     qid = qid or 0
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetGroupRecord(self.group_id, GetPlatform(), qid, index, 6, function(res)
         printlog("ccccccccccccccccccccccccccccccccccccc")
@@ -90,7 +88,7 @@ function M:GetRecordData(index, qid)
         if self._is_destroy then
             return
         end
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败")
         else
@@ -205,16 +203,15 @@ function M:OnRenderPlayerRecordItem(index, obj)
     self:FillRecordItem(data, obj)
 end
 
-
 function M:GetRecordByRoomid()
     local qid = self._view:GetChild("tex_id").text
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetRecordByRoomid(self.group_id, qid, GetPlatform(), function(res)
         if self._is_destroy then
             return
         end
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败")
         else
@@ -231,7 +228,7 @@ function M:GetRecordByRoomid()
 end
 
 function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType)
-    ViewUtil.ShowModalWait(self._view, "正在分享...")
+    ViewUtil.ShowModalWait2(self._view, "正在分享...")
     UIPackage.AddPackage("base/rank/ui/Rank")
     local result_view = UIPackage.CreateObjectFromURL("ui://Rank/ResultView")
     result_view.visible = false
@@ -270,7 +267,7 @@ function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore,
                 ShareScreenShotWithOption(function()
                     result_view:Dispose()
                 end)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 break
             end
             coroutine.wait(1)
@@ -344,13 +341,13 @@ function M:OnShowRecordInfo(rdata,ids)
                 main._totalRound = tonumber(rdata.round)
                 main:FillRoomData(DataManager.SelfUser.playback[playback_id][i])
             else
-                ViewUtil.ShowModalWait(self._view)
+                ViewUtil.ShowModalWait2(self._view)
                 local _data = {}
                 _data["military_id"] = playback_id
                 _data["round"] = tostring(i)
                 local loddyCtr1 = ControllerManager.GetController(LoddyController)
                 loddyCtr1:RequestPlayBack(_data, function(code, data)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if code == 0 then
                         if DataManager.SelfUser.playback[playback_id] ~= nil then
                             DataManager.SelfUser.playback[playback_id][i] = data

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngXingYunStatView.lua

@@ -24,11 +24,8 @@ function M:initData()
     self.begin_time = today
     self.end_time = today + 86400
     self:GetRecordData(0)
- 
 end
 
-
-
 function M:InitView()
     self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupXingYunStat")
 
@@ -49,7 +46,8 @@ function M:InitView()
         self:GetRecordData(self.lst_record.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, nil, true)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0, nil, true)
 
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()
@@ -78,13 +76,10 @@ function M:InitView()
     end)
 
     self.totalwin = self._view:GetChild("tex_alltotal")
-  
 end
 
-
 function M:GetRecordData(index)
-
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
 
     local time_type = self._view:GetController("type").selectedIndex
     if self.begin_time ~= nil and self.end_time ~= nil then
@@ -93,11 +88,9 @@ function M:GetRecordData(index)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetXingYunStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
 
         if res.ReturnCode == 0 then
-
             local members = res.Data.members
 
             self.totalwin.text = d2ad(res.Data.all_total_win)
@@ -109,9 +102,7 @@ function M:GetRecordData(index)
     end)
 end
 
-
 function M:FillRecordItem(data, obj)
-   
     local group                            = DataManager.groups:get(self.group_id)
 
     obj:GetChild("tex_name").text          = ViewUtil.stringEllipsis(data.nick)
@@ -119,7 +110,6 @@ function M:FillRecordItem(data, obj)
     obj:GetChild("tex_round_total").text   = data.total_round
     obj:GetChild("tex_total").text         = d2ad(data.total_win)
     obj:GetChild("tex_round_youxiao").text = data.valid_round / 100
-   
 end
 
 function M:OnRenderRecordItem(index, obj)
@@ -127,5 +117,4 @@ function M:OnRenderRecordItem(index, obj)
     self:FillRecordItem(data, obj)
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngZuanShiStatView.lua

@@ -24,11 +24,8 @@ function M:initData()
     self.begin_time = today
     self.end_time = today + 86400
     self:GetRecordData(0)
-
 end
 
-
-
 function M:InitView()
     self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupZuanShi")
 
@@ -52,7 +49,8 @@ function M:InitView()
         self:GetRecordData(self.lst_record.numItems)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0, nil, true)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0, nil, true)
 
     local ctr_page = self._view:GetController("type")
     ctr_page.onChanged:Set(function()
@@ -78,11 +76,11 @@ function M:InitView()
     self._view:GetChild('btn_search').onClick:Set(
         function()
             --printlog("aaaaaaaaaa1111111111111111111111111111111111111111111111")
-            ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = self._view:GetChild('tex_id').text
             local qid, qnick
             if text == "" then
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -99,7 +97,7 @@ function M:InitView()
                 function(res)
                     -- printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
                     -- pt(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -129,10 +127,8 @@ function M:InitView()
     )
 end
 
-
 function M:GetRecordData(index)
-
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
 
     local time_type = self._view:GetController("type").selectedIndex
     if self.begin_time ~= nil and self.end_time ~= nil then
@@ -141,11 +137,9 @@ function M:GetRecordData(index)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetZuanShiStat(self.group_id, index, 6, time_type, self.begin_time, self.end_time, function(res)
-
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
 
         if res.ReturnCode == 0 then
-
             local members = res.Data.members
             --printlog("aaaaaaaaaaaaaacccccccccccccccccccccccccccccccc")
             --pt(res)
@@ -173,7 +167,6 @@ local function __showRewardsValue(rtype, cur_value, max_value, mng)
 end
 
 function M:FillRecordItem(data, obj)
-
     local group                   = DataManager.groups:get(self.group_id)
 
     obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick) .. "(" .. data.total .. ")"
@@ -192,7 +185,6 @@ function M:FillRecordItem(data, obj)
         local gniv = GroupPartnerZuanShiMember.new(self.group_id, data.uid, 0, self.begin_time, self.end_time)
         gniv:Show()
     end)
-
 end
 
 function M:OnRenderRecordItem(index, obj)
@@ -200,5 +192,4 @@ function M:OnRenderRecordItem(index, obj)
     self:FillRecordItem(data, obj)
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerBanPlaysView.lua

@@ -22,7 +22,6 @@ function M:initView(url)
     self.lst_allplays = self._view:GetChild("lst_allplays")
     self.lst_allplays:SetVirtual()
     self.lst_allplays.itemRenderer = function(index, obj)
-
         self:OnRenderAllPlaysItem(index, obj)
     end
     self:GetBanPlaysData()
@@ -32,7 +31,7 @@ end
 function M:GetBanPlaysData()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetAllplays(self.group_id, self.uid, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -48,8 +47,6 @@ function M:GetBanPlaysData()
     end)
 end
 
-
-
 -- 填充奖励设置对象
 function M:OnRenderAllPlaysItem(index, obj)
     local data = self.allplays_data[index + 1]
@@ -64,7 +61,7 @@ function M:OnRenderAllPlaysItem(index, obj)
         local bans = data.ban
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_SetBanPlayid(self.group_id, data.pid, data.ban, self.uid, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if self._is_destroy then
                 return
             end
@@ -77,8 +74,6 @@ function M:OnRenderAllPlaysItem(index, obj)
             end
         end)
     end)
-    
-
 end
 
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerMemberListView.lua

@@ -76,10 +76,10 @@ function M:GetMemberData(index, quary_id, callback)
     if index == 0 then
         self.member_data = {}
     end
-	ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetPartnerMembers(self.group_id, self.partner_id[self.top], index, 8, quary_id, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取合伙人成员列表失败")
         else
@@ -96,10 +96,8 @@ function M:GetMemberData(index, quary_id, callback)
     end)
 end
 
-
 -- 填充合伙人成员对象
 function M:FillItem(obj, data)
-
     obj:GetChild("tex_id").text = data.uid
     obj:GetChild("tex_name").text = ViewUtil.stringEllipsis(data.nick)
 
@@ -121,6 +119,7 @@ function M:FillItem(obj, data)
         self:GetMemberData(0)
     end)
 end
+
 -- 填充列表
 function M:OnRenderItem(index, obj)
     local data = self.member_data[index + 1]

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerRewardsView.lua

@@ -36,7 +36,7 @@ end
 function M:GetRewardsData()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetRewards(self.group_id, self.partner_id, self.partner_lev, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -120,9 +120,9 @@ function M:OnRenderRewardsItem(index, obj)
             end
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置合伙人奖励失败")
                 else
@@ -141,10 +141,10 @@ function M:OnRenderRewardsItem(index, obj)
         msg_win.onOk:Add(function(...)
             local single = msg_win.btnCheck.selected and 1 or 0
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetRewards(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.cur_value, single,
                 function(res)
-                    ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "设置奖励失败")
                     else
@@ -181,9 +181,9 @@ function M:OnRenderRewardsItem(index, obj)
             end
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌奖励失败")
                 else
@@ -203,10 +203,10 @@ function M:OnRenderRewardsItem(index, obj)
             local single = 0 --msg_win.btnCheck.selected and 1 or 0
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetXIPAI(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.xipai_cur_value,
                 single, function(res)
-                ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "设置洗牌失败")
                     else
@@ -245,9 +245,9 @@ function M:OnRenderRewardsItem(index, obj)
             end
             printlog("jefe btn_set2")
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, false, tem, 0, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode ~= 0 then
                     ViewUtil.ErrorTip(res.ReturnCode, "设置管理奖励失败")
                 else
@@ -267,10 +267,10 @@ function M:OnRenderRewardsItem(index, obj)
             local single = 0 --msg_win.btnCheck.selected and 1 or 0
 
             local fgCtr = ControllerManager.GetController(NewGroupController)
-            ViewUtil.ShowModalWait()
+            ViewUtil.ShowModalWait2()
             fgCtr:FG_SetANCHOU(self.group_id, data.pid, self.partner_lev, self.partner_id, true, data.anchou_cur_value,
                 single, function(res)
-                ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if res.ReturnCode ~= 0 then
                         ViewUtil.ErrorTip(res.ReturnCode, "设置管理失败")
                     else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerScoreMgnView.lua

@@ -18,12 +18,9 @@ function GroupPartnerScoreMgnView.new(group_id, member)
     return self
 end
 
-
 -- 修改体力值
 local function __change_limit(gid, pid, otype, limit, callback)
-
     local gniv = GroupNumberInputView.new(nil, function(num)
-        
         local value = limit
         if otype == 1 then
             value = value + ad2d(num)
@@ -37,10 +34,10 @@ local function __change_limit(gid, pid, otype, limit,callback)
             ViewUtil.ErrorTip(1, "更改失败！")
         end
 
-        ViewUtil.ShowModalWait()
+        ViewUtil.ShowModalWait2()
         local fgCtr = ControllerManager.GetController(NewGroupController)
         fgCtr:FG_SetTransHPLimit(gid, pid, value, function(res1)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
 
             if (res1.ReturnCode == 0) then
                 callback(res1.Data)
@@ -48,13 +45,11 @@ local function __change_limit(gid, pid, otype, limit,callback)
                 ViewUtil.ErrorTip(res1.ReturnCode, "更改失败！")
             end
         end)
-    
     end, 0, nil)
     gniv:Show()
 end
 
 function M:init(url)
-
     BaseWindow.init(self, url)
 
     local member = self.member
@@ -74,7 +69,6 @@ function M:init(url)
     ImageLoad.Load(member.portrait, self._view:GetChild("btn_head")._iconObject, self.class)
 
     self._view:GetChild("btn_fag_add").onClick:Set(function()
-       
         __change_limit(self.group_id, member.uid, 1, self.limit, function(data)
             self.limit = data.limit
             self._view:GetChild("tex_fag").text = d2ad(self.limit)
@@ -82,8 +76,6 @@ function M:init(url)
     end)
 
     self._view:GetChild("btn_fag_minus").onClick:Set(function()
-
-
         __change_limit(self.group_id, member.uid, -1, self.limit, function(data)
             self.limit = data.limit
             self._view:GetChild("tex_fag").text = d2ad(self.limit)
@@ -91,8 +83,6 @@ function M:init(url)
     end)
 
     self._view:GetChild("btn_manager").onClick:Set(function()
-
-
         __change_limit(self.group_id, member.uid, 0, self.limit, function(data)
             self.limit = data.limit
             self._view:GetChild("tex_fag").text = d2ad(self.limit)
@@ -103,16 +93,14 @@ function M:init(url)
 end
 
 function M:GetTransHPLimit()
-    
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetTransHPLimit(self.group_id, self.member.uid, function(res)
-
         if self._is_destroy then
             return
         end
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
 
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取数据失败")
@@ -124,5 +112,4 @@ function M:GetTransHPLimit()
     end)
 end
 
-
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatMember.lua

@@ -23,7 +23,6 @@ function GroupPartnerStatMember.new(group_id, uid, time_type, begin_time, end_ti
     return self
 end
 
-
 function M:init(url)
     BaseWindow.init(self, url)
     self.members_log = {}
@@ -60,11 +59,11 @@ function M:init(url)
     self._view:GetChild('btn_search').onClick:Set(
         function()
             -- printlog("aaaaaaaaaa1111111111111111111111111111111111111111111111")
-             ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = self._view:GetChild('tex_id').text
             local qid, qnick
             if text == "" then
-                 ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -79,7 +78,7 @@ function M:init(url)
                 function(res)
                     --  printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
                     --  pt(res)
-                     ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -110,13 +109,12 @@ function M:init(url)
 end
 
 function M:getRewardsLog(index)
-  
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local func = self.check_member and fgCtr.FG_GetDirectMemberStat or fgCtr.FG_GetPartnerStatMember
-    func(fgCtr, self.group_id,self.uids[self.top],self.uids[1], index, 6, self.time_type, self.begin_time, self.end_time, function(res)
-
-        ViewUtil.CloseModalWait()
+    func(fgCtr, self.group_id, self.uids[self.top], self.uids[1], index, 6, self.time_type, self.begin_time,
+        self.end_time, function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取数据失败")
             else
@@ -151,7 +149,8 @@ function M:OnRenderItem(index, obj)
     obj:GetChild("tex_score").text         = d2ad(data.total_win)
     obj:GetChild("tex_total_round").text   = "" .. data.total_round
     obj:GetChild("tex_perfect_round").text = ""
-    obj:GetChild("tex_valid_round").text    = ""..d2ad(data.reward_tongji)--""..d2ad(data.reward_hp)--(data.valid_round / 100)
+    obj:GetChild("tex_valid_round").text   = "" ..
+        d2ad(data.reward_tongji) --""..d2ad(data.reward_hp)--(data.valid_round / 100)
 
     local tex_reward                       = obj:GetChild("tex_reward")
     tex_reward.text                        = d2ad(data.reward_tongji) + d2ad(data.total_win) --d2ad(data.reward_tongji)
@@ -192,8 +191,8 @@ function M:OnRenderItem(index, obj)
 
     local btn_zhanji = obj:GetChild("btn_zhanji")
     btn_zhanji.onClick:Set(function()
-       
-        local groupRecordView = GroupRecordView.new(self.group_id,data.uid,data.partnerLev > 0 and 1 or 0, self.begin_time, self.end_time, self.time_type)
+        local groupRecordView = GroupRecordView.new(self.group_id, data.uid, data.partnerLev > 0 and 1 or 0,
+            self.begin_time, self.end_time, self.time_type)
         groupRecordView:Show()
     end)
 end
@@ -205,7 +204,8 @@ function M:FillRecordItem(data, obj)
     obj:GetChild("tex_score").text         = d2ad(data.total_win)
     obj:GetChild("tex_total_round").text   = "" .. data.total_round
     obj:GetChild("tex_perfect_round").text = ""
-    obj:GetChild("tex_valid_round").text    = ""..d2ad(data.reward_tongji)--""..d2ad(data.reward_hp)--(data.valid_round / 100)
+    obj:GetChild("tex_valid_round").text   = "" ..
+        d2ad(data.reward_tongji) --""..d2ad(data.reward_hp)--(data.valid_round / 100)
 
     local tex_reward                       = obj:GetChild("tex_reward")
     tex_reward.text                        = d2ad(data.reward_tongji) + d2ad(data.total_win) --d2ad(data.reward_tongji)
@@ -246,8 +246,8 @@ function M:FillRecordItem(data, obj)
 
     local btn_zhanji = obj:GetChild("btn_zhanji")
     btn_zhanji.onClick:Set(function()
-       
-        local groupRecordView = GroupRecordView.new(self.group_id,data.uid,data.partnerLev > 0 and 1 or 0, self.begin_time, self.end_time, self.time_type)
+        local groupRecordView = GroupRecordView.new(self.group_id, data.uid, data.partnerLev > 0 and 1 or 0,
+            self.begin_time, self.end_time, self.time_type)
         groupRecordView:Show()
     end)
 end

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerStatPlay.lua

@@ -37,7 +37,7 @@ end
 function M:getPartnerRewards(callback)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GetRewards(self.group_id, self.uid, self.partner_lev, function(res)
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if self._is_destroy then
             return
         end
@@ -55,9 +55,9 @@ function M:getPartnerRewards(callback)
 end
 
 function M:getRewardsLog(index)
-  
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_GetPartnerStatPlay(self.group_id,self.uid, self.parent_id, index, 6, self.time_type, self.begin_time, self.end_time, function(res)
+    fgCtr:FG_GetPartnerStatPlay(self.group_id, self.uid, self.parent_id, index, 6, self.time_type, self.begin_time,
+        self.end_time, function(res)
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取数据失败")
         else
@@ -72,7 +72,6 @@ function M:getRewardsLog(index)
     end)
 end
 
-
 function M:OnRenderItem(index, obj)
     local data                          = self.members_log[index + 1]
 
@@ -102,7 +101,6 @@ function M:OnRenderItem(index, obj)
             end
         end
     end
-    
 end
 
 return M

lua_probject/base_project/Game/View/NewGroup/MngView/GroupPartnerZuanShiMember.lua

@@ -22,7 +22,6 @@ function GroupPartnerZuanShiMember.new(group_id, uid, time_type, begin_time, end
     return self
 end
 
-
 function M:init(url)
     BaseWindow.init(self, url)
     self.members_log = {}
@@ -59,11 +58,11 @@ function M:init(url)
     self._view:GetChild('btn_search').onClick:Set(
         function()
             -- printlog("aaaaaaaaaa1111111111111111111111111111111111111111111111")
-             ViewUtil.ShowModalWait(nil)
+            ViewUtil.ShowModalWait2(nil)
             local text = self._view:GetChild('tex_id').text
             local qid, qnick
             if text == "" then
-                 ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 ViewUtil.ErrorTip(nil, '输入不能为空')
                 return
             end
@@ -78,7 +77,7 @@ function M:init(url)
                 function(res)
                     --  printlog("aaaaaaaaaaaaaaaa22222222222222222222222222222")
                     --  pt(res)
-                     ViewUtil.CloseModalWait()
+                    ViewUtil.CloseModalWait2()
                     if self._is_destroy then
                         return
                     end
@@ -109,13 +108,12 @@ function M:init(url)
 end
 
 function M:getRewardsLog(index)
-  
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local func = self.check_member and fgCtr.FG_GetDirectZuanShiStat or fgCtr.FG_GetPartnerZuanShiMember
-    func(fgCtr, self.group_id,self.uids[self.top],self.uids[1], index, 6, self.time_type, self.begin_time, self.end_time, function(res)
-
-        ViewUtil.CloseModalWait()
+    func(fgCtr, self.group_id, self.uids[self.top], self.uids[1], index, 6, self.time_type, self.begin_time,
+        self.end_time, function(res)
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取数据失败")
             else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupRewardsLogView.lua

@@ -31,7 +31,8 @@ function M:init(url)
         self:getRewardsLog(self.lst_log.numItems + self.m_index)
     end)
 
-    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"), -308, 0)
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0)
     self._view:GetChild("btn_search").onClick:Set(function()
         self.rewards_log = {}
         self:getRewardsLog(0)
@@ -43,14 +44,13 @@ end
 function M:getRewardsLog(index)
     local begin_time, end_time = self.time_panel:GetDate()
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    ViewUtil.ShowModalWait(nil)
+    ViewUtil.ShowModalWait2(nil)
     local limit = 6
     if self.lev == 1 then
         limit = 20
     end
     fgCtr:FG_GetRewardsLog(self.group_id, index, limit, begin_time, end_time, self.uid, function(res)
-    
-        ViewUtil.CloseModalWait()
+        ViewUtil.CloseModalWait2()
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取提取详情失败")
         else
@@ -70,7 +70,6 @@ function M:GuoLv(data)
     pt(data)
     local tempList = {}
     if self.lev == 1 then
-       
         local m_data = {}
         for i = 1, #data do
             if m_data[data[i].roomid] == nil then

lua_probject/base_project/Game/View/NewGroup/MngView/GroupSetMemberInfoDiaoduView.lua

@@ -41,14 +41,14 @@ function M:init(url)
 
 	self._view:GetChild("btn_qd1").onClick:Set(
 		function()
-			ViewUtil.ShowModalWait()
+			ViewUtil.ShowModalWait2()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
 				self.group_id,
 				self.member_id,
 				0,
 				function(response)
-					ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					if (response.ReturnCode == 0) then
 						self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
 						ViewUtil.ErrorTip(-1, '设置成功！', 1)
@@ -63,14 +63,14 @@ function M:init(url)
 
 	self._view:GetChild("btn_qd2").onClick:Set(
 		function()
-			ViewUtil.ShowModalWait()
+			ViewUtil.ShowModalWait2()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
 				self.group_id,
 				self.member_id,
 				1,
 				function(response)
-					ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					if (response.ReturnCode == 0) then
 						self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
 						ViewUtil.ErrorTip(-1, '设置成功！', 1)
@@ -84,14 +84,14 @@ function M:init(url)
 
 	self._view:GetChild("btn_qd3").onClick:Set(
 		function()
-			ViewUtil.ShowModalWait()
+			ViewUtil.ShowModalWait2()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
 				self.group_id,
 				self.member_id,
 				2,
 				function(response)
-					ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					if (response.ReturnCode == 0) then
 						self.currentSelectStateText.text = "整组调动 " .. (response.Data.black + 1)
 						ViewUtil.ErrorTip(-1, '设置成功！', 1)
@@ -149,7 +149,7 @@ function M:init(url)
 
 	self._view:GetChild("btn_ok").onClick:Set(
 		function()
-			ViewUtil.ShowModalWait()
+			ViewUtil.ShowModalWait2()
 			local fgCtr = ControllerManager.GetController(NewGroupController)
 			fgCtr:FG_BanMemberHB(
 				self.group_id,
@@ -158,7 +158,7 @@ function M:init(url)
 				tonumber(self.txtRate.text),
 				tonumber(self.txtBlack.text),
 				function(response)
-					ViewUtil.CloseModalWait()
+					ViewUtil.CloseModalWait2()
 					if (response.ReturnCode == 0) then
 						self.currentSelectStateText.text = "整组调动 " .. (response.Data.ban + 1)
 						self.blackList = { { 0, 0 }, { 25, 0 }, { 15, 0 } }

lua_probject/base_project/Game/View/NewGroup/MngView/GroupStatMember.lua

@@ -1,4 +1,3 @@
-
 local GroupStatMember = {}
 
 local M = GroupStatMember
@@ -16,7 +15,6 @@ function GroupStatMember.new(group_id, uid)
     return self
 end
 
-
 function M:init(url)
     BaseWindow.init(self, url)
     self.members_log = {}
@@ -34,15 +32,13 @@ function M:init(url)
         self.lst_member.numItems = 0
         self:getRewardsLog(0)
     end)
-
 end
 
 function M:getRewardsLog(index)
-    ViewUtil.ShowModalWait()
+    ViewUtil.ShowModalWait2()
     local fgCtr = ControllerManager.GetController(NewGroupController)
 end
 
-
 function M:OnRenderItem(index, obj)
     local data = self.members_log[index + 1]
     --pt(data)

lua_probject/base_project/Game/View/PhoneLoginView.lua

@@ -36,14 +36,14 @@ function M:login()
         if not uid then
             return
         end
-        ViewUtil.ShowModalWait(self._root_view, "正在登录游戏...")
+        ViewUtil.ShowModalWait2(self._root_view, "正在登录游戏...")
         local loginCtr = ControllerManager.GetController(LoginController)
         local passwd = self:CheckInputPasswd()
         if not passwd then
             return
         end
         loginCtr:IdPasswordLogin(uid, passwd, function(res)
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "ID或者密码错误")
                 return
@@ -73,7 +73,7 @@ function M:login()
         if not code then
             return
         end
-        ViewUtil.ShowModalWait(self._root_view, "正在登录游戏...")
+        ViewUtil.ShowModalWait2(self._root_view, "正在登录游戏...")
         local phone = self:CheckInputPhone()
         if not phone then
             return
@@ -82,7 +82,7 @@ function M:login()
         local loginCtr = ControllerManager.GetController(LoginController)
         if false then
             loginCtr:PhoneLogin(phone, code, function(res)
-                ViewUtil.CloseModalWait()
+                ViewUtil.CloseModalWait2()
                 if res.ReturnCode == "100" then
                     ViewUtil.ErrorTip(self._root_view, "验证码错误")
                 elseif res.ReturnCode == "101" then
@@ -105,7 +105,7 @@ function M:login()
             else
                 ViewUtil.ErrorTip(self._root_view, "验证码失效")
             end
-            ViewUtil.CloseModalWait()
+            ViewUtil.CloseModalWait2()
         end
     end
 end

lua_probject/base_project/Game/View/PhoneLoginView2.lua

@@ -0,0 +1,200 @@
+local PhoneLoginView = {}
+
+local M = PhoneLoginView
+
+function PhoneLoginView.new(type, phone, callback)
+    setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self.class = "PhoneLoginView"
+    self._callback = callback
+    self._close_destroy = true
+    self.codeType = type
+    self.phone = phone
+    self:init("ui://Login/PhnoeLogin")
+
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+    self.login_type = self._view:GetController("type")
+    self.code = self._view:GetController("code")
+
+    if self.phone and #self.phone == 11 then
+        self._view:GetChild("phone_input").text = self.phone
+        self.login_type.selectedIndex = 0
+    else
+        self.login_type.selectedIndex = self.codeType
+    end
+
+    local btn_login = self._view:GetChild("btn_login")
+    btn_login.onClick:Add(handler(self, function()
+        local baseView = ViewManager.GetCurrenView()
+        if self.login_type.selectedIndex == 0 and baseView.QuickLogin then
+            baseView:QuickLogin()
+            self:Destroy()
+        else
+            self:login()
+        end
+    end))
+
+    local btn_getCode = self._view:GetChild("btn_code_send")
+    btn_getCode.onClick:Add(handler(self, function()
+        self:getCode()
+    end))
+    if DataManager.SelfUser._data_codeTiem and DataManager.SelfUser._data_codeTiem - os.time() > 0 then
+        self._left_time = DataManager.SelfUser._data_codeTiem - os.time()
+        self._view:GetChild("phone_input").text = DataManager.SelfUser._data_codephone
+        UpdateBeat:Add(self.OnUpdate, self)
+        self.code.selectedIndex = 1
+    end
+
+    self._view:GetChild("phone_input").onFocusOut:Set(function()
+        if self._view:GetChild("phone_input").text ~= self.phone then
+            self.phone = ""
+            self.login_type.selectedIndex = 1
+        end
+    end)
+end
+
+function M:login()
+    if self.codeType == 0 then
+        local uid = self:CheckInputId()
+        if not uid then
+            return
+        end
+        ViewUtil.ShowModalWait2(self._root_view, "正在登录游戏...")
+        local loginCtr = ControllerManager.GetController(LoginController)
+        local passwd = self:CheckInputPasswd()
+        if not passwd then
+            return
+        end
+        loginCtr:IdPasswordLogin(uid, passwd, function(res)
+            ViewUtil.CloseModalWait2()
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "ID或者密码错误")
+                return
+            end
+            self._callback(res)
+        end)
+    else
+        ---[[
+        --直接登入
+        local loginCtr = ControllerManager.GetController(LoginController)
+
+        local phone = self:CheckInputPhone()
+        if not phone then
+            return
+        end
+
+        local code = self:CheckInputPhoneCode()
+        if not code then
+            return
+        end
+
+        loginCtr:PhoneLogin(phone, code, function(res)
+            if res.ReturnCode ~= 0 then
+                local msg_txt = "验证码错误"
+                if (Table_Error_code_Map[res.ReturnCode] ~= nil) then
+                    msg_txt = Table_Error_code_Map[res.ReturnCode].note
+                end
+                local guo_msg = MsgWindow.new(self._root_view, msg_txt, MsgWindow.MsgMode.OnlyOk)
+                guo_msg._new_hide = false
+                guo_msg:Show()
+                return
+            end
+            self._callback(res)
+            self:Destroy()
+        end)
+    end
+end
+
+function M:getCode()
+    local phone = self:CheckInputPhone()
+    if not phone then
+        self.code.selectedIndex = 0
+        return
+    end
+    --发送电话给后端
+    ViewUtil:ShowModalWait2(0.1)
+    local loginCtr = ControllerManager.GetController(LoginController)
+    loginCtr:GetPhoneCode(phone, function(res)
+        ViewUtil.CloseModalWait2()
+        if res.ReturnCode == 0 then
+            self.phone = phone
+            self._left_time = 60
+            DataManager.SelfUser._data_codeTiem = os.time() + 60
+            DataManager.SelfUser._data_codephone = phone
+            UpdateBeat:Add(self.OnUpdate, self)
+        else
+            if res.ReturnCode == 1 then
+                self._left_time = 15
+                DataManager.SelfUser._data_codeTiem = os.time() + 15
+                DataManager.SelfUser._data_codephone = phone
+                UpdateBeat:Add(self.OnUpdate, self)
+                ViewUtil.ErrorTip(self._root_view, "验证码还在有效期")
+            else
+                self.code.selectedIndex = 0
+                ViewUtil.ErrorTip(self._root_view, "网络超时，请重新获取验证码")
+            end
+        end
+    end)
+end
+
+function M:OnUpdate()
+    local deltaTime = Time.deltaTime
+    local _left_time = self._left_time
+    if (_left_time > 0) then
+        _left_time = _left_time - deltaTime
+        _left_time = math.max(0, _left_time)
+        local leftTime = math.floor(_left_time)
+        self._view:GetChild("code_send_text").text = tostring(leftTime)
+        self._left_time = _left_time
+    else
+        self.code.selectedIndex = 0
+        UpdateBeat:Remove(self.OnUpdate, self)
+    end
+end
+
+function M:Destroy()
+    UpdateBeat:Remove(self.OnUpdate, self)
+    getmetatable(M).__index.Destroy(self)
+end
+
+function M:CheckInputId()
+    local uid = self._view:GetChild("phone_input").text
+    if not (string.len(uid) >= 6) then
+        ViewUtil.ShowTips("请输入正确的用户ID")
+        return
+    end
+    return uid
+end
+
+function M:CheckInputPasswd()
+    local tex_passwd = self._view:GetChild("tex_passwd").text
+    if string.len(tex_passwd) < 6 then
+        ViewUtil.ShowTips("密码最少六位")
+        return
+    end
+    return tex_passwd
+end
+
+function M:CheckInputPhone()
+    local phone = self._view:GetChild("phone_input").text
+    if not (string.len(phone) == 11) then
+        ViewUtil.ShowTips("请输入正确的电话号码")
+        return
+    end
+    return phone
+end
+
+function M:CheckInputPhoneCode()
+    local code = self._view:GetChild("code_input").text
+    if string.len(code) ~= 6 then
+        ViewUtil.ShowTips("请输入正确的验证码")
+        return
+    end
+    return code
+end
+
+return M

lua_probject/base_project/Game/View/ResultView.lua

@@ -1,3 +1,5 @@
+local SharePicture = import('.SharePicture')
+
 ResultView = {}
 
 local M = ResultView
@@ -12,9 +14,9 @@ function M:Show(time)
         self._view:GetChild("Frist"):TweenMove(Vector2.New(pos.x, pos.y + 200), time or 1.5)
     end
     if self._root then
-        self._root._view_clearingFather:AddChild(self._view)
-        self._view:AddRelation(self._root._view_clearingFather, RelationType.Size)
         self._view:MakeFullScreen()
+        self._view:AddRelation(self._root._view_clearingFather, RelationType.Size)
+        self._root._view_clearingFather:AddChild(self._view)
     else
         BaseWindow.Show(self)
     end
@@ -102,7 +104,8 @@ end
 function M:init(url, isBigFull)
     self._animation = false
     -- self._scale = true
-    self._full = false
+    self._full = true
+    self._full_offset = false
     if self._root then
         self._view = UIPackage.CreateObjectFromURL(url)
     else
@@ -437,7 +440,7 @@ end
 
 -- 继续游戏
 function M:ContinueGame(gid, pid, game_id)
-    ViewUtil.ShowModalWait(self._root_view, nil, 'join_room')
+    ViewUtil.ShowModalWait2(self._root_view, nil, 'join_room')
     local roomCtr = ControllerManager.GetController(RoomController)
     roomCtr:PublicJoinRoom(
         Protocol.WEB_FG_MATCH_ROOM,
@@ -445,20 +448,20 @@ function M:ContinueGame(gid, pid, game_id)
         false,
         function(response)
             if (response.ReturnCode == -1) then
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
                 RestartGame()
                 return
             end
 
             if response.ReturnCode ~= 0 then
                 ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
-                ViewUtil.CloseModalWait("join_room")
+                ViewUtil.CloseModalWait2("join_room")
                 self:Destroy()
                 ViewManager.ChangeView(ViewManager.View_Lobby)
                 return
             else
                 ViewManager.ChangeView(ViewManager.View_Main, game_id)
-                ViewUtil.CloseModalWait('join_room')
+                ViewUtil.CloseModalWait2('join_room')
             end
         end,
         gid,
@@ -466,6 +469,28 @@ function M:ContinueGame(gid, pid, game_id)
     )
 end
 
+function M:SaveRenderTextureToPNG()
+    local sharePicture = SharePicture.new(function()
+        local json_data = {}
+        json_data["title"] = ""
+        local mediaObject = {}
+        local filename = "share_screenshot"
+        print(Application.persistentDataPath)
+        mediaObject["path"] = string.format("%s/%s", Application.persistentDataPath, "share")
+        mediaObject["filename"] = filename
+        mediaObject["type"] = 1
+        json_data["mediaObject"] = mediaObject
+        json_data["description"] = "一款现实中朋友约局休闲娱乐的场所！速度约朋友一起来玩吧！"
+        json_data["scene"] = 0
+        print("json_data==================")
+        local json_str = json.encode(json_data)
+        pt(json_str)
+
+        GameApplication.Instance:ShareLink(1, json_str, nil, true)
+    end)
+    sharePicture:Show()
+end
+
 function M:Destroy()
     if self._root then
         self._view:RemoveFromParent()

lua_probject/base_project/Game/View/SettingView.lua

@@ -90,8 +90,8 @@ function M:init(url)
                 local _curren_msg = MsgWindow.new(self._root_view, '您是否退出当前账号?', MsgWindow.MsgMode.OkAndCancel)
                 _curren_msg.onOk:Add(
                     function()
-                        PlayerPrefs.DeleteKey('session_id')
-                        PlayerPrefs.Save()
+                        -- PlayerPrefs.DeleteKey('session_id')
+                        -- PlayerPrefs.Save()
                         RestartGame()
                     end
                 )

lua_probject/base_project/Game/View/SharePicture.lua

@@ -0,0 +1,34 @@
+--设置窗口对象
+
+local SharePicture = {}
+
+local M = SharePicture
+setmetatable(M, { __index = BaseWindow })
+
+function SharePicture.new(callback)
+    local self = setmetatable({}, { __index = M })
+    self.class = 'SharePicture'
+    self._close_destroy = true
+    self._close_zone = false
+    self._new_hide = false
+    self._callback = callback
+    self:init('ui://Common/SharePicture')
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+
+    local view = self._view
+    view:GetChild('btn_wx').onClick:Add(function()
+        self:Close()
+        self._callback()
+        self:Destroy()
+    end)
+    -- view:GetChild('btn_moments').onClick:Add(function()
+    --     data.type = 1
+    --     ViewUtil.__share(data)
+    -- end)
+end
+
+return M

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -38,7 +38,7 @@ end
 local modal_wait_win = nil
 -- local modal_wait_win_url = "ui://Common/GlobalModalWaiting"
 function ViewUtil.ShowModalWait(blur_view, title, time)
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
     ViewUtil.continue = coroutine.start(
         function()
             coroutine.wait(time or 1)
@@ -59,7 +59,7 @@ function ViewUtil.ShowModalWait2(blur_view, time)
     ViewUtil.CloseModalWait2()
     ViewUtil.continue = coroutine.start(
         function()
-            coroutine.wait(time or 0.5)
+            coroutine.wait(tonumber(time) or 0.01)
             ModalWaitingWindow2.ShowModal()
         end
     )
@@ -408,3 +408,25 @@ function ViewUtil.ShowOneInput(data, callback)
         GRoot.inst:RemoveChild(pop_oneInput)
     end)
 end
+
+function ViewUtil.__share(data)
+    local url = "https://ttfenfa.com/index.php/login"
+    local json_data = {}
+    json_data['title'] = data.title
+    local mediaObject = {}
+    mediaObject['url'] = url
+    mediaObject['type'] = 0
+    json_data['mediaObject'] = mediaObject
+    json_data['description'] = data.description
+    json_data['scene'] = data.type
+    local filename = "icon96.png"
+    mediaObject["path"] = Application.persistentDataPath
+    mediaObject["filename"] = filename
+    GameApplication.Instance:ShareLink(1, json.encode(json_data), function(...)
+    end)
+end
+
+function ViewUtil.__openWx()
+    GameApplication.Instance:WXOnlyOpen(1, function(...)
+    end)
+end

lua_probject/base_project/Game/View/WitnessView.lua

@@ -458,7 +458,7 @@ function M:Destroy()
     ControllerManager.resetJionRoom = false
     self._popEvent = false
     GRoot.inst:HidePopup()
-    ViewUtil.CloseModalWait()
+    ViewUtil.CloseModalWait2()
     GameApplication.Instance.StopMusic = 0
     coroutine.stopAll()
     UpdateBeat:Remove(self.OnUpdate, self)

lua_probject/base_project/Game/ViewManager.lua

@@ -77,7 +77,7 @@ local function __OnGameConnectAction(state)
   else
     NetResetConnectWindow.ShowNetReset()
   end
-  ViewUtil.CloseModalWait()
+  ViewUtil.CloseModalWait2()
 end
 
 function ViewManager.Init()
@@ -93,7 +93,7 @@ function ViewManager.Init()
       PlayerPrefs.Save()
     end
     if response.ReturnCode == -1 or response.ReturnCode == Table_Error_code.ERR_LOGOUT then
-      ViewUtil.CloseModalWait()
+      ViewUtil.CloseModalWait2()
       NetResetConnectWindow.CloseNetReset()
       RestartGame()
       return true