fix: 修复查看角色属性功能测试未限制来源的问题

Author: tinymins

MY_!Base/lang/BgMsgCenter/zhcn.jx3dat

@@ -1,5 +1,7 @@
 return {
 	['[%s] wants to get your location, would you like to share?'] = '[%s] ϣ��ȡ���㵱ǰ���ڵ�ͼλ�ã����Ƿ�Ը�⹲����ǰλ����Ϣ��',
+	['Block'] = '������',
+	['[%s] wants to see your detailed character info, OK?'] = '[%s] ��֪��������ϸ��ɫ������Ϣ���Ƿ��֪��',
 	['[%s] want to see your info, OK?'] = '�ų� [%s] ��֪������װ�����ķ����Ƿ��֪��',
 	['I\'ve installed %s v%s'] = '���Ѱ�װ%s v%s��',
 }

MY_!Base/lang/BgMsgCenter/zhtw.jx3dat

@@ -1,5 +1,7 @@
 return {
 	['[%s] wants to get your location, would you like to share?'] = '[%s] 希望取得你當前所在地圖位置，你是否願意共享當前位置信息？',
+	['Block'] = '屏蔽他',
+	['[%s] wants to see your detailed character info, OK?'] = '[%s] 想知曉您的詳細角色屬性信息，是否告知？',
 	['[%s] want to see your info, OK?'] = '團長 [%s] 想知曉您的裝備、心法，是否告知？',
 	['I\'ve installed %s v%s'] = '我已安裝%s v%s。',
 }

MY_!Base/src/BgMsgCenter.lua

@@ -99,23 +99,54 @@ X.RegisterBgMsg('RL', function(_, data, nChannel, dwTalkerID, szTalkerName, bIsS
 end)
 
 -- 查看完整属性
+local CHAR_INFO_BLOCK_LIST = {}
 X.RegisterBgMsg('CHAR_INFO', function(_, data, nChannel, dwTalkerID, szTalkerName, bIsSelf)
 	if not bIsSelf and data[2] == X.GetClientPlayerID() then
 		local nReplyChannel = X.IsTeammate(dwTalkerID)
 			and PLAYER_TALK_CHANNEL.RAID
 			or D.GetReplyChannel(nChannel, szTalkerName)
-		if data[1] == 'ASK'  then
-			if not _G.MY_CharInfo or _G.MY_CharInfo.bEnable or data[3] == 'DEBUG' then
+		if data[1] == 'ASK' then
+			local bAcquaintance = X.IsTeammate(dwTalkerID) or X.IsFellowship(dwTalkerID) or X.IsAuthorPlayer(dwTalkerID, szTalkerName)
+			local bDebug = data[3] == 'DEBUG' and bAcquaintance
+			local bConfirm = not bAcquaintance and not bDebug
+			local function fnResolve()
 				local aInfo = X.GetClientPlayerCharInfo()
-				if not X.IsTeammate(dwTalkerID) and not data[3] == 'DEBUG' then
+				if not X.IsTeammate(dwTalkerID) and not bDebug then
 					for _, v in ipairs(aInfo) do
 						v.tip = nil
 					end
 				end
 				X.SendBgMsg(nReplyChannel, 'CHAR_INFO', {'ACCEPT', dwTalkerID, aInfo}, true)
-			else
+			end
+			local function fnReject()
 				X.SendBgMsg(nReplyChannel, 'CHAR_INFO', {'REFUSE', dwTalkerID}, true)
 			end
+			if not CHAR_INFO_BLOCK_LIST[dwTalkerID] and (not _G.MY_CharInfo or _G.MY_CharInfo.bEnable or bDebug) then
+				if bConfirm then
+					X.MessageBox('MY_CharInfo', {
+						szMessage = _L('[%s] wants to see your detailed character info, OK?', szTalkerName),
+						{
+							szOption = g_tStrings.STR_HOTKEY_SURE,
+							fnAction = fnResolve,
+						}, {
+							szOption = g_tStrings.STR_HOTKEY_CANCEL,
+							fnAction = fnReject,
+						},
+						{
+							szOption = _L('Block'),
+							bCheck = true,
+							fnAction = function()
+								fnReject()
+								CHAR_INFO_BLOCK_LIST[dwTalkerID] = true
+							end,
+						}
+					})
+				else
+					fnResolve()
+				end
+			else
+				fnReject()
+			end
 		end
 	end
 end)

MY_TeamTools/lang/zhcn.jx3dat

@@ -6,6 +6,7 @@ return {
 	['Option'] = '����',
 	['Open Panel'] = '�򿪽���',
 	['Please unlock talk lock first.'] = '���Ƚ����������',
+	['[%s] will see your detailed character info request, sure to send request?'] = '�鿴 [%s] ����ϸ������Ϣ��Ҫ�Է�ȷ�ϣ�Ҫ��������������',
 	['Raid Stat'] = '�Ŷ�ͳ��',
 	['Room Stat'] = '����ͳ��',
 	-- MY_TeamTools_DeathLog

MY_TeamTools/lang/zhtw.jx3dat

@@ -6,6 +6,7 @@ return {
 	['Option'] = '設置',
 	['Open Panel'] = '打開界面',
 	['Please unlock talk lock first.'] = '請先解除聊天鎖。',
+	['[%s] will see your detailed character info request, sure to send request?'] = '查看 [%s] 的詳細屬性信息需要對方確認，要繼續發送請求嗎？',
 	['Raid Stat'] = '團隊統計',
 	['Room Stat'] = '房間統計',
 	-- MY_TeamTools_DeathLog

MY_TeamTools/src/MY_CharInfo.lua

@@ -181,8 +181,16 @@ function D.ViewCharInfoToPlayer(dwID)
 	if not nChannel or not szName then
 		X.Alert(_L['Party limit'])
 	else
-		CharInfo.CreateFrame(dwID, szName)
-		X.SendBgMsg(nChannel, 'CHAR_INFO', {'ASK', dwID, X.IsRestricted('MY_CharInfo.Daddy') and 'DEBUG'})
+		local bAcquaintance = X.IsTeammate(dwID) or X.IsFellowship(dwID) or X.IsAuthorPlayer(X.GetClientPlayerID(), X.GetClientPlayerName())
+		local function onAccept()
+			CharInfo.CreateFrame(dwID, szName)
+			X.SendBgMsg(nChannel, 'CHAR_INFO', {'ASK', dwID, X.IsRestricted('MY_CharInfo.Daddy') and 'DEBUG'})
+		end
+		if bAcquaintance then
+			onAccept()
+		else
+			X.Confirm(_L('[%s] will see your detailed character info request, sure to send request?', szName), onAccept)
+		end
 	end
 end