同步360test分支修改

script/common/CommonDefine.lua

@@ -2,23 +2,28 @@ local Lang = require("common.Lang")
 
 ---------------------------------------------渠道标识--------------------------
 
-CHANNEL_TAG_MUZI = 1             -- 木子/tap
+CHANNEL_TAG_MUZI = 1             -- 木子/tap安卓
 CHANNEL_TAG_SANLI_ANDROID = 2    -- 三狸安卓
 CHANNEL_TAG_SANLI_IOS = 3        -- 三狸iOS
 CHANNEL_TAG_SANLI_QQ = 4         -- 三狸QQ大厅
 CHANNEL_TAG_SANLI_H5= 5          -- 三狸H5
 CHANNEL_TAG_SANLI_H5_4399 = 6    -- 三狸H5-4399
+CHANNEL_TAG_SANLI_360 = 7        -- 三狸360小游戏
+CHANNEL_TAG_SANLI_AIQI_H5 = 8    -- 艾七H5
+CHANNEL_TAG_MUZI_IOS = 9         -- 木子/tap IOS
+CHANNEL_TAG_SANLI_SHIYOU = 10    -- 三狸视游
+
 CHANNEL_TAG_WX = 11              -- 微信小程序，抖音游戏, 圣扬IOS
 CHANNEL_TAG_HP = 14              -- 虎扑
 CHANNEL_TAG_720 = 15             -- 720
 CHANNEL_TAG_MINNIGAME = 17       -- 美团, 华为, 淘宝
-
-
 CHANNEL_TAG_FT = 18             -- 繁体
 
+CHANNEL_TAG_GUILD1 = 23         -- 公会渠道1
+CHANNEL_TAG_GUILD2 = 24         -- 公会渠道2
 
 
-SEA_CHANNEL_ARR = {13, 18}  -- 海外渠道
+SEA_CHANNEL_ARR = {13, 18}  -- 海外渠道列表
 
 ----------------------------------------------------------------------------
 

script/common/ProtoID.lua

@@ -1818,6 +1818,10 @@ _ENV[1852]="CG_UNION_CREATE_COND_QUERY" -- 1折版本特有功能
 _ENV[1853]="GC_UNION_CREATE_COND_QUERY"
 
 
+-- _ENV[1852]="CG_UNION_CREATE_COND_QUERY" -- 1折版本特有功能
+-- _ENV[1853]="GC_UNION_CREATE_COND_QUERY"
+
+_ENV[1854]="GC_POWERRANK_TOPONE_LOGIN"
 
 _ENV[1896]="CG_ZHUANPAN_SUBSCRIBE_REWARD_QUERY"
 _ENV[1897]="GC_ZHUANPAN_SUBSCRIBE_REWARD_QUERY"

script/core/ObjHuman.lua

@@ -106,6 +106,7 @@ local AnotherWorldBattleNS = require("anotherWorldBattle.AnotherWorldBattleNS")
 local RoleStorageBox = require("roleSystem.RoleStorageBox")
 local BreakThroughTheme = require("battle.BreakThroughTheme")
 local BattleGift = require("battle.BattleGift")
+local BigRPlayerShow = require("broadcast.BigRPlayerShow")
 
 
 local Json = require("common.Json")
@@ -853,6 +854,8 @@ function onLogin(human, isNew)
 		msgRet.param2 = 0
 		Msg.send(msgRet,human.fd)
 	end
+
+	BigRPlayerShow.onLogin(human)
 	
 	-- 注意 这个函数写在doLogin的最后
 	MiddleLogic.onLogin(human)

script/core/Timer.lua

@@ -126,7 +126,7 @@ function doZhengDian(hour)
         BillboardLogic.onZero()
         ChatRecord.CHAT_RECORD_REPETITION = {}
         HeroGrowUp.actLoop()
-        LostTempleLogic.onZero()
+        -- LostTempleLogic.onZero()
 	    VoucherShopLogic.VoucherShop_OnZero()
         MainDianLogic.MaiDian_OnTime()
         ServerCommerceMiddle.CommerceMiddle_OnZero()

script/module/broadcast/BigRPlayerShow.lua

@@ -0,0 +1,101 @@
+-- 大R玩家实力显示
+
+local Msg = require("core.Msg")
+local ObjHuman = require("core.ObjHuman")
+local BillboardLogic = require("billboard.BillboardLogic")
+local BillboardDefine = require("billboard.BillboardDefine")
+local Util = require("common.Util")
+-- local CommonDB = require("common.CommonDB")
+
+-- local pRank1lastBroadcastTime
+
+
+-- local function getBigRPlayerData()
+--     return CommonDB.getValueByKey(CommonDB.KEY_BIGRPLAYER_SHOW_DATA)
+-- end
+
+-- local function updateBigRPlayerData(newData)
+--     CommonDB.updateValue(CommonDB.KEY_BIGRPLAYER_SHOW_DATA, newData)
+-- end
+
+-- local function getpRank1LastBroadcastTime()
+--     local data = getBigRPlayerData()
+--     return data and data.pRank1lastBroadcastTime
+-- end
+
+-- local function updatepRank1LastBroadcastTime()
+--     local data = getBigRPlayerData()
+--     data = data or {}
+--     local now  = os.time()
+--     data.pRank1lastBroadcastTime = now
+--     updateBigRPlayerData(data)
+
+--     -- 更新缓存
+--     pRank1lastBroadcastTime = now
+-- end
+
+local function isShowTips(human)
+    local bl = true
+    if not human.db.showTipsData then
+        return bl
+    end
+
+    if human.db.lv < 10 then
+        return bl
+    end
+
+    local showTipsData = human.db.showTipsData
+    local pRank1LoginShowTime = showTipsData.pRank1LoginShowTime
+    if not pRank1LoginShowTime then
+        return bl
+    end
+
+    if Util.isSameDay(pRank1LoginShowTime) then
+        bl = false
+    end
+
+    return bl
+end
+
+local function updateShowTipsData(human)
+    human.db.showTipsData = human.db.showTipsData or {}
+    human.db.showTipsData.pRank1LoginShowTime = os.time()
+end
+
+
+
+-- 战力排行榜排名第一的玩家上线的处理
+local function powerRankTopOneLogin(human)
+    -- if not pRank1lastBroadcastTime then
+    --     pRank1lastBroadcastTime = getpRank1LastBroadcastTime()
+    -- end
+
+    -- if pRank1lastBroadcastTime and Util.isSameDay(pRank1lastBroadcastTime) then
+    --     return
+    -- end
+
+    local rankList = BillboardLogic.GetRankList(BillboardDefine.TYPE_ZHANDOULI)
+    if not rankList or not rankList[1] or rankList[1].uuid ~= human.db._id then
+        return
+    end
+
+    local msg = Msg.gc.GC_POWERRANK_TOPONE_LOGIN
+    msg.playerName = human.db.name
+
+    for uuid, h in pairs(ObjHuman.onlineUuid) do
+        if uuid ~= human.db._id and isShowTips(h) then
+            Msg.send(msg, h.fd)
+
+            updateShowTipsData(h)
+        end
+    end
+
+    -- updatepRank1LastBroadcastTime()
+end
+
+
+
+
+function onLogin(human)
+    powerRankTopOneLogin(human)
+end

script/module/broadcast/Proto.lua

@@ -3,3 +3,8 @@ GC_BROADCAST = {
 	{"displayTime",		1,	 "int"},
 	{"msg",			1,	 "string"},
 }
+
+
+GC_POWERRANK_TOPONE_LOGIN = {
+	{"playerName",			1,	 "string"},
+}

script/module/combat/Skill.lua

@@ -659,11 +659,11 @@ function CMD.hurt(obj,skillConfig,skillTargets)
 		hp = calcHp(obj,target,calcType,rate,limit)
 		if hp ~= 0 then
 			local d, _, extraHandleTb = CombatObj.updateHp(target,-hp,nil,true, obj.pos,CombatObj.EXTRA_HP_TYPE)
-			if d ~= 0 then
+			-- if d ~= 0 then
 				CombatImpl.setExtraHit(target,-hp,CMD2ID["hurt"])
 				CombatObj.onHpCB(target,d, obj.pos)
 				ret[#ret+1] = target
-			end
+			-- end
 
 			if extraHandleTb then
 				ExtraHandle(target, extraHandleTb)

script/module/elf/ElfLogic.lua

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

script/module/lostTemple/lostTempleLogic.lua

@@ -46,6 +46,13 @@ DAY_1s = 86400
 --跳过战斗需要的战力
 local SHOWQUICKPOWER = 0 --2000000
 
+local function resetDB(human)
+    local query = { _id = human.db._id }
+    LuaMongo.remove(DB.db_lost_temple, query)
+end
+
+
+
 function initAfterHot()
 
 end
@@ -113,7 +120,7 @@ function onZero()
     -- LuaMongo.remove(DB.db_lost_temple)
 
     -- 修改: 延迟60s再清除数据
-    Timer.addLater(60, LuaMongo.remove, DB.db_lost_temple)
+    -- Timer.addLater(60, LuaMongo.remove, DB.db_lost_temple)
 
     -- 已经关闭
     -- if (openDay - 7 + 1) % 2 ~= 0 then
@@ -127,6 +134,8 @@ function updateDaily(human)
         return
     end
 
+    resetDB(human)
+
     print("[lostTempleLogic - updateDaily] 天数刷新 玩家移除lostTemple数据 name = "..human.db.name)
     human.lostTemple = nil
     

script/module/mail/MailManager.lua

@@ -170,7 +170,20 @@ function getMails(receiverUuid,mailType)
     local mailCnt = 0
 	while true do
 		local mail = {}
-		if not LuaMongo.next(mail) then
+		-- if not LuaMongo.next(mail) then
+		-- 	break
+		-- end
+
+		local res, err = pcall(function ()
+			return LuaMongo.next(mail)
+		end)
+
+		if not res then
+			Log.write(Log.LOGID_DEBUG, "MailManager.getMails err = ".. err)
+			break
+		end
+
+		if not err then
 			break
 		end
 

script/module/role/CreateRole.lua

@@ -42,9 +42,20 @@ local NEW_ROLE_MAIL_ID = 7023
 -- 特定渠道列表
 local TARGET_CHANNEL_ARRAY = {1, 9}
 
-local function sendMail(human)
-	local mailCfg = MailExcel.mail[NEW_ROLE_MAIL_ID]
-    MailManager.add(MailManager.SYSTEM, human.db._id, mailCfg.title, mailCfg.content, nil, mailCfg.senderName or "GM")
+-- 用于公会渠道创角时发送奖励邮件的邮件Id
+local CHANNEL_GUILD_MAIL_ID = 7037
+
+-- 公会渠道创角奖励
+local channel_guild_createRole_rewards = {{102,8888}, {124,20}, {1208,2}, {111,1000000}, {112,1000}, {101,2000000}, {510,4}}
+
+
+local function sendMail(human, mailId, items)
+	local mailCfg = MailExcel.mail[mailId]
+	if not mailCfg then
+		return
+	end
+
+    MailManager.add(MailManager.SYSTEM, human.db._id, mailCfg.title, mailCfg.content, items, mailCfg.senderName or "GM")
 end
 
 
@@ -101,6 +112,19 @@ function creatFakeDb(account, serverTag)
     return db
 end
 
+-- 创角时针对渠道的额外处理
+local function channelHandle(human)
+	-- 特定渠道用户创角时发送的邮件
+	if table.find(TARGET_CHANNEL_ARRAY, human.phpChanelID) then
+		sendMail(human, NEW_ROLE_MAIL_ID)
+	end
+
+	-- 公会渠道创角时发送奖励邮件
+	if human.phpChanelID == CommonDefine.CHANNEL_TAG_GUILD1 or human.phpChanelID == CommonDefine.CHANNEL_TAG_GUILD2 then
+		sendMail(human, CHANNEL_GUILD_MAIL_ID, channel_guild_createRole_rewards)
+	end
+end
+
 
 function createNewRole(human)
 	if _G.is_middle == true then
@@ -141,11 +165,7 @@ function createNewRole(human)
 
 	DataCache.Insert_PlayerUuidList(human.db._id, human.db.lv)
 
-	-- 特定渠道用户创角时发送的邮件
-	if table.find(TARGET_CHANNEL_ARRAY, human.phpChanelID) then
-		sendMail(human)
-	end
-
+	channelHandle(human)
 
 	ReportManager.register(human)
 end

script/module/scene/Handler.lua

@@ -58,6 +58,7 @@ end
 --在线玩家列表不再从 ObjHuman.onlineAccount 获取, 改为从 ObjHuman.onlineNewUniqueTag 获取
 function CG_TEST_PROTO(fd,msg)
 	-- print("============ CG_TEST_PROTO============", msg.param)
+	Log.write(Log.LOGID_DEBUG, "[CG_TEST_PROTO]=" .. tostring(msg.param))
 	local param = Json.Decode(msg.param)
 	local uTag
 	if param.type == "UseCDKV2" or param.type == "UseCDK" or param.type == "UseFixCDK" then

script/module/serverCommerce/ServerCommerceActDefine.lua

@@ -9,8 +9,8 @@ COMMERCEACT_BEGINTIME = 0               -- 开启时间
 COMMERCEACT_ENDTIME = 23                -- 结束时间
 COMMERCEACT_LASTDAY = 7                 -- 持续时间
 COMMERCEACT_BEGINDELATTIME = 10 * 60    -- 延迟10分钟开始
-COMMERCEACT_INITSERVERTIME =4 * 60     -- 普通服 起服3分钟请求活动是否开始
-COMMERCEACT_INITOPENDAY = 3 * 60        -- 中心服2分钟后请求普通服开服时间
+COMMERCEACT_INITSERVERTIME = 10 * 60 --4 * 60     -- 普通服 起服3分钟请求活动是否开始
+COMMERCEACT_INITOPENDAY = 9 * 60 -- 3 * 60        -- 中心服2分钟后请求普通服开服时间
 COMMERCEACT_RANKUPDATE = 150            -- 普通服 5 分钟请求排行榜数据
 COMMERCEACT_ENDBATCH = 3                -- 结束批次
 

webServer/src/channels/factory/ChannelFactory.ts

@@ -60,6 +60,8 @@ class ChannelFactory {
     this.registerHandler(20, new ZeroOneChannelHandler()); // 0.1渠道
     this.registerHandler(21, new QingtianChannelHandler()); // 晴天SDK
     this.registerHandler(22, new ZeroOneChannelHandler()); // 1折渠道
+    this.registerHandler(23, new ZeroOneChannelHandler()); // 逍遥浪人
+    this.registerHandler(24, new ZeroOneChannelHandler()); // 逍遥浪人50倍返利
   }
 
   /**

webServer/src/channels/handlers/ZeroOneChannelHandler.ts

@@ -25,14 +25,15 @@ export class ZeroOneChannelHandler implements ChannelHandler {
         const data = ctx.request.body as any;
         const {token, uid, channel_code, product_code} = data || {};
         const finalProductCode = product_code || config.loginConfig?.productCode;
+        const tag = `[渠道${config.channelId}]`;
 
         if (!token || !uid) {
-            logger.warn("0.1渠道登录验证失败: 缺少必要参数", {token, uid});
+            logger.warn(`${tag}登录验证失败: 缺少必要参数`, {token, uid});
             return {code: 0, msg: "缺少必要参数 token 或 uid"};
         }
 
         if (!finalProductCode) {
-            logger.error("0.1渠道登录验证失败: 未配置productCode");
+            logger.error(`${tag}登录验证失败: 未配置productCode`);
             return {code: 0, msg: "服务器未配置productCode"};
         }
 
@@ -46,20 +47,20 @@ export class ZeroOneChannelHandler implements ChannelHandler {
             params.channel_code = channel_code;
         }
 
-        logger.info("0.1渠道登录验证请求", {url: requestUrl, params});
+        logger.info(`${tag}登录验证请求`, {url: requestUrl, params});
 
         try {
             const response = await axios.get(requestUrl, {params, timeout: 8000});
-            logger.info("0.1渠道登录验证响应", {data: response.data});
+            logger.info(`${tag}登录验证响应`, {data: response.data});
 
             if (response.data == "1") {
                 return {code: 1, msg: "success"};
             }
 
-            logger.warn("0.1渠道登录验证失败: 接口返回非1", {data: response.data});
+            logger.warn(`${tag}登录验证失败: 接口返回非1`, {data: response.data});
             return {code: 0, msg: "登录验证失败"};
         } catch (error) {
-            logger.error("0.1渠道登录验证异常", error);
+            logger.error(`${tag}登录验证异常`, error);
             return {code: 0, msg: "登录验证异常"};
         }
     }
@@ -71,11 +72,12 @@ export class ZeroOneChannelHandler implements ChannelHandler {
      */
     async handlePayment(ctx: Context, config: ChannelConfig): Promise<PaymentResult> {
         const data = ctx.request.body as any;
-        logger.info("0.1渠道支付回调参数", {url: ctx.href, params: data});
+        const tag = `[渠道${config.channelId}]`;
+        logger.info(`${tag}支付回调参数`, {url: ctx.href, params: data});
 
         const {nt_data, sign, md5Sign} = data || {};
         if (!nt_data || !sign || !md5Sign) {
-            logger.warn("0.1渠道支付回调失败: 缺少必要参数", {nt_data, sign, md5Sign});
+            logger.warn(`${tag}支付回调失败: 缺少必要参数`, {nt_data, sign, md5Sign});
             return {code: 0, msg: "缺少必要参数"};
         }
 
@@ -83,12 +85,12 @@ export class ZeroOneChannelHandler implements ChannelHandler {
         const callbackKey = config.paymentConfig?.callbackKey;
 
         if (!md5Key || !callbackKey) {
-            logger.error("0.1渠道支付回调失败: 未配置QuickSDK密钥");
+            logger.error(`${tag}支付回调失败: 未配置QuickSDK密钥`);
             return {code: 0, msg: "服务器未配置渠道密钥"};
         }
 
         if (!SignatureVerifier.verifyQuickSign(data, md5Key)) {
-            logger.warn("0.1渠道支付回调失败: 签名验证失败");
+            logger.warn(`${tag}支付回调失败: 签名验证失败`);
             return {code: 0, msg: "签名验证失败"};
         }
 
@@ -103,12 +105,12 @@ export class ZeroOneChannelHandler implements ChannelHandler {
             const amountStr = message.amount?.[0];
 
             if (!orderId || !outTradeNo || typeof status === "undefined" || !amountStr) {
-                logger.error("0.1渠道支付回调失败: XML缺少必要字段", {message});
+                logger.error(`${tag}支付回调失败: XML缺少必要字段`, {message});
                 return {code: 0, msg: "回调数据不完整"};
             }
 
             if (status !== "0") {
-                logger.warn("0.1渠道支付状态非成功", {status});
+                logger.warn(`${tag}支付状态非成功`, {status});
                 return {code: 0, msg: "支付状态失败"};
             }
 
@@ -124,7 +126,7 @@ export class ZeroOneChannelHandler implements ChannelHandler {
 
             const orderInfo = validation.orderInfo;
             if (Number(orderInfo.amount) !== amount) {
-                logger.warn("0.1渠道支付金额不匹配", {
+                logger.warn(`${tag}支付金额不匹配`, {
                     orderId,
                     requestAmount: amount,
                     orderAmount: orderInfo.amount
@@ -132,17 +134,17 @@ export class ZeroOneChannelHandler implements ChannelHandler {
                 return {code: 0, msg: "订单金额不一致"};
             }
 
-            logger.info(`0.1渠道支付订单${orderId}开始发货`);
+            logger.info(`${tag}支付订单${orderId}开始发货`);
             const result = await PaymentHelper.deliverOrder(
                 orderInfo,
                 ctx.request.ip,
                 validation.url,
                 outTradeNo
             );
-            logger.info(`0.1渠道支付订单${orderId}发货完成`, {result});
+            logger.info(`${tag}支付订单${orderId}发货完成`, {result});
             return result;
         } catch (error) {
-            logger.error("0.1渠道支付回调解析异常", error);
+            logger.error(`${tag}支付回调解析异常`, error);
             return {code: 0, msg: "回调解析异常"};
         }
     }

webServer/src/config/channelConfig.ts

@@ -49,7 +49,9 @@ import {
     HKT_IOS_CALLBACK_KEY,
     HKT_DOMAIN, TAOBAO_CALLBACK_SECRET, TAOBAO_APP_ID, TAOBAO_APP_SECRET,
     ZERO_ONE_QUICK_MD5_KEY, ZERO_ONE_QUICK_CALLBACK_KEY, ZERO_ONE_QUICK_PRODUCT_CODE,
-    QINGTIAN_MD5_KEY, QINGTIAN_CALLBACK_KEY, QINGTIAN_PRODUCT_CODE
+    QINGTIAN_MD5_KEY, QINGTIAN_CALLBACK_KEY, QINGTIAN_PRODUCT_CODE,
+    XIAOYAO_QUICK_MD5_KEY, XIAOYAO_QUICK_CALLBACK_KEY, XIAOYAO_QUICK_PRODUCT_CODE,
+    XIAOYAO50_QUICK_MD5_KEY, XIAOYAO50_QUICK_CALLBACK_KEY, XIAOYAO50_QUICK_PRODUCT_CODE
 } from "./thirdParams";
 
 // 渠道配置接口定义
@@ -375,4 +377,30 @@ export const channelConfigs: Record<number, ChannelConfig> = {
             productCode: ZERO_ONE_QUICK_PRODUCT_CODE,
         },
     },
+    23: {
+        // 逍遥浪人 QuickSDK
+        channelId: 23,
+        name: "逍遥浪人",
+        platform: "",
+        paymentConfig: {
+            signKey: XIAOYAO_QUICK_MD5_KEY,
+            callbackKey: XIAOYAO_QUICK_CALLBACK_KEY,
+        },
+        loginConfig: {
+            productCode: XIAOYAO_QUICK_PRODUCT_CODE,
+        },
+    },
+    24: {
+        // 逍遥浪人50倍返利 QuickSDK
+        channelId: 24,
+        name: "逍遥浪人50倍",
+        platform: "",
+        paymentConfig: {
+            signKey: XIAOYAO50_QUICK_MD5_KEY,
+            callbackKey: XIAOYAO50_QUICK_CALLBACK_KEY,
+        },
+        loginConfig: {
+            productCode: XIAOYAO50_QUICK_PRODUCT_CODE,
+        },
+    },
 };

webServer/src/config/thirdParams.ts

@@ -154,6 +154,18 @@ export const QINGTIAN_CALLBACK_KEY = "63878163435949505046358619235401";
 export const QINGTIAN_MD5_KEY = "ntyf5ezxywtqt4r16uhqrx5zwix2mzez";
 export const QINGTIAN_GAME_ID = "1007";
 
+// 逍遥浪人渠道（渠道23）
+export const XIAOYAO_QUICK_MD5_KEY = "yiggjf92qibwczxddjoxqjhnl638jaeh";
+export const XIAOYAO_QUICK_CALLBACK_KEY = "77756454315558905031309394863250";
+export const XIAOYAO_QUICK_PRODUCT_CODE = "17185838183889697860233357135277";
+export const XIAOYAO_QUICK_PRODUCT_KEY = "98557938";
+
+// 逍遥浪人50倍返利渠道（渠道24）
+export const XIAOYAO50_QUICK_MD5_KEY = "lotikkteclyc6ns7yqcwxdwh4kauwtji";
+export const XIAOYAO50_QUICK_CALLBACK_KEY = "87669945324907280135575078884672";
+export const XIAOYAO50_QUICK_PRODUCT_CODE = "50723129629881286488573382954330";
+export const XIAOYAO50_QUICK_PRODUCT_KEY = "40281578";
+
 // 港台渠道（Quick海外SDK）
 // 安卓配置
 export const HKT_ANDROID_PRODUCT_CODE = "34455834768674171358576585112815";

webServer/src/controller/ApiController.ts

@@ -612,9 +612,21 @@ class ApiController {
                 }
                 break;
             case 14:
+            case 20:
+                ctx.body = result.code === 1 ? "SUCCESS" : "Fail";
+                break;
             case 21:
                 ctx.body = result.code === 1 ? "SUCCESS" : "Fail";
                 break;
+            case 22:
+                ctx.body = result.code === 1 ? "SUCCESS" : "Fail";
+                break;
+            case 23:
+                ctx.body = result.code === 1 ? "SUCCESS" : "Fail";
+                break;
+            case 24:
+                ctx.body = result.code === 1 ? "SUCCESS" : "Fail";
+                break;
             default:
                 ctx.body = result;
         }
@@ -1191,6 +1203,11 @@ class ApiController {
                 "VIP777",
                 "VIP888",
                 "QINGMINGLB",
+                "yxlb666",
+                "yxlb777",
+                "yxlb888",
+                "yxlb999",
+                "WUYILB"
             ];
             let param: string = "";
 

webServer/src/utils/msg.ts

@@ -256,7 +256,7 @@ export default class Msg {
   }
 
   CG_TEST_PROTO(account: string, param: string, server_id = 1) {
-    console.log("发送CDK道具消息", this.websocket.readyState, this.isConnect);
+    console.log("发送CDK道具消息", this.websocket.readyState, this.isConnect,param,server_id,account);
     if (this.isConnect != true || this.websocket.readyState != 1) return false;
     this.sendBufLen = 4;
     this.writeString(account);