Merge branch '360test' of http://43.226.57.217:3000/yishanyou/GongFuServer into 360test

script/module/chengjiu/ChengjiuLogic.lua

@@ -376,6 +376,11 @@ function checkTaskState(human)
             human.db.chengjiu.task = human.db.chengjiu.task or {}
             human.db.chengjiu.task[k] = CJ_TASK_STATE_1
             RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2001)
+            -- 同时刷新秘宝/圣遗物/精灵入口的红点（强制发送，确保可解封时客户端能看到提示）
+            RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2002,true)
+            RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2006, true)
+            RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2021, true)
+            RoleSystemLogic.onDot(human, RoleSystemDefine.ROLE_SYS_ID_2031, true)
             local msgRet = Msg.gc.GC_DAILYSHARE_SET
             msgRet.type = 2
             msgRet.desc = v.desc

script/module/elf/ElfLogic.lua

@@ -257,8 +257,8 @@ end
 local function updateDot(human, targetQuality)
     local cfgHtbl = generateCfgByQuality(targetQuality)
 
-    -- 该品质的所有精灵不能升星和升级了
-    if not dotJudgment(human, cfgHtbl) then
+    -- 如果该品质的精灵存在可激活或可升级的情况，发送红点
+    if dotJudgment(human, cfgHtbl) then
         local dotID = 0
         if targetQuality == 1 then
             dotID = RoleSystemDefine.ROLE_SYS_ID_2032

script/module/scene/Handler.lua

@@ -37,6 +37,23 @@ local function isBan(uuid, channelId, account, appId)
 	return BanLogic.CheckBan(uuid, channelId, account, appId)
 end
 
+-- 判断是否属于白名单IP
+local function isWhiteIp(ip)
+	if not ip then
+		return false
+	end
+
+	if not Config.WHITEIP_LIST or #Config.WHITEIP_LIST == 0 then
+		return true
+	end
+
+	if table.find(Config.WHITEIP_LIST, ip) then
+		return true
+	end
+
+	return false
+end
+
 
 --在线玩家列表不再从 ObjHuman.onlineAccount 获取, 改为从 ObjHuman.onlineNewUniqueTag 获取
 function CG_TEST_PROTO(fd,msg)
@@ -220,6 +237,10 @@ function CG_ASK_LOGIN(fd, msg)
 		return sendDisconnect(fd, CommonDefine.DISCONNECT_AUTH_FAIL)
 	end
 
+	if Config.IS_CHECK_IP == true and not isWhiteIp(msg.ip) then
+		return
+	end
+
 
 	--如果在线人数大于最大可容纳在线人数时，断开链接
 	local onlineCnt = ObjHuman.getOnlineCnt()