From 56415dd16810617a618802da51cb1beba3834142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Sat, 30 Aug 2025 21:23:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=9C=88=E5=8D=8F=E8=AE=AE=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Game/Controller/LoginController.lua       |  1 +
 .../Game/Controller/NewGroupController.lua    | 35 +++++++++++++++++++
 lua_probject/base_project/Game/Protocol.lua   |  2 ++
 .../Game/View/Lobby/IDPasswordAlone.lua       | 10 +++++-
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/lua_probject/base_project/Game/Controller/LoginController.lua b/lua_probject/base_project/Game/Controller/LoginController.lua
index ca6d9052..7ff8b236 100644
--- a/lua_probject/base_project/Game/Controller/LoginController.lua
+++ b/lua_probject/base_project/Game/Controller/LoginController.lua
@@ -164,6 +164,7 @@ end
 function M:QuickLogin(session_id, callback)
     local _data = {}
     _data.data = RSAHelper.Encrypt(json.encode({
+        quick = 1,
         deviceCode = UnityEngine.SystemInfo.deviceUniqueIdentifier
     }))
     local _client = ControllerManager.WebClient
diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua
index 41df4f38..375e89e8 100644
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@@ -1146,7 +1146,42 @@ function M:FG_GroupSetVip(group_id, member_id, isvip, callback)
 	end)
 end
 
+--信息包加密进入圈子
 function M:FG_EnterGroup(group_id, callback)
+	local _client = ControllerManager.GroupClient
+	local _data = {}
+	_data.id = group_id
+	_data.data = RSAHelper.Encrypt(json.encode({
+		id = group_id,
+		deviceCode = UnityEngine.SystemInfo.deviceUniqueIdentifier
+	}))
+	printlog("FG_EnterGroup===>>>", _data.id)
+	_client:send(Protocol.WEB_ENTER_GROUP_2, _data, function(res)
+		if res.ReturnCode == 0 then
+			-- 获取玩法列表
+			local group = DataManager.groups:get(group_id)
+			group:clear()
+			group.notice = res.Data.notice
+			group.hide_action = res.Data.hide_action
+
+			self.mgr_ctr = ControllerManager.GetController(GroupMgrController)
+			self.mgr_ctr:connect(res.Data.host, group_id, function(res1)
+				pt(res1)
+				if res1.ReturnCode == 0 then
+					callback(res)
+				else
+					callback(res1)
+				end
+			end)
+		else
+			Application.Quit()
+			callback(res)
+		end
+	end)
+end
+
+--正常进入圈子
+function M:FG_EnterGroup2(group_id, callback)
 	local _client = ControllerManager.GroupClient
 	local _data = {}
 	_data.id = group_id
diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua
index a3c30f47..b92b42e5 100644
--- a/lua_probject/base_project/Game/Protocol.lua
+++ b/lua_probject/base_project/Game/Protocol.lua
@@ -183,6 +183,8 @@ Protocol = {
     WEB_FG_BAN_PLAY                       = "group/ban_play",
     -- 进入圈子
     WEB_ENTER_GROUP                       = "group/enter_group",
+    -- 进入圈子，信息包加密
+    WEB_ENTER_GROUP_2                     = "group/enter_group_3",
     -- 获取上级合伙人
     WEB_GET_SUPERIOR_PARTNERS             = "group/get_member_parents",
     --获取积分转移限制
diff --git a/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua b/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua
index 0b3c0759..b4439d32 100644
--- a/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua
+++ b/lua_probject/base_project/Game/View/Lobby/IDPasswordAlone.lua
@@ -114,7 +114,15 @@ function M:Retrieve()
         ViewUtil.CloseModalWait()
         if res.ReturnCode == 0 then
             PlayerPrefs.DeleteKey('session_id')
-            Application.Quit()
+            ViewUtil.CloseModalWait()
+            local _curren_msg = MsgWindow.new(self._root_view, "您的账号已经切换，请重新登录", MsgWindow.MsgMode.OnlyOk, nil, nil,
+                { closeZone = true })
+            _curren_msg.onOk:Add(
+                function()
+                    Application.Quit()
+                end
+            )
+            _curren_msg:Show()
         else
             ViewUtil.ErrorTip(res.ReturnCode, "找回账号失败，请联系客服人员")
         end