提交CDK代码

script/common/CDK.lua

@@ -3,6 +3,7 @@ local DB = require("common.DB")
 local CommonDB = require("common.CommonDB")
 local CdkFixExcel = require("excel.cdkFix")
 local LuaMongo = _G.lua_mongo
+local Lang = require("common.Lang")
 
 local Code = {"0","7","9","8","1","4","3","2","5","6"}
 local batchList = {6,7,8} -- 批次位置 
@@ -113,17 +114,17 @@ function checkCDK(cdk)
     local num,batch = deCDKCode(cdk)
     local curBatch = assert(CommonDB.getCDKBatch(),"assert : cdk batch not found")
     if curBatch < batch then
-        return "batch error"
+        return Lang.CDK_BATCH_ERR
     end
     QueryCDK = { batch = { ["$eq"] = batch} }
     LuaMongo.find(DB.db_cdk,QueryCDK)
     local cdkBatchData = {}
     LuaMongo.next(cdkBatchData)
     if cdkBatchData.cnt < num then 
-        return "invalid cdk"
+        return Lang.CDK_INVALID_ERR
     end
     if cdkBatchData.useCDKList[num] then 
-        return "cdk used"
+        return Lang.CDK_ERR4
     end
     return nil, cdkBatchData
 end

script/common/Lang.lua

@@ -209,6 +209,10 @@ CDK_ERR4 = [[该礼包卡激活码已使用过]]
 CDK_ERR5 = [[已达到礼包卡使用上限]]
 CDK_TITLE = [[礼包兑换]]
 CDK_CONTENT = [[你成功兑换了一个礼包,奖励见附件,请注意查收]]
+CDK_BATCH_ERR = [[激活码批次错误]]
+CDK_INVALID_ERR = [[非法的激活码]]
+
+
 
 COMBAT_ERR_IS_VIDEO = [[此战斗是录像战斗,无法保存]]
 COMBAT_ERR_NOT_VIDEO = [[这场战斗已经丢失在历史银河中了]]

script/module/present/CDK.lua

@@ -200,22 +200,23 @@ end
 function cdkDo(human,code)
 	local err,cdkBatchData = CDKLogic.checkCDK(code)
 	if err then
-		print("check cdk error : ",err)
+		Broadcast.sendErr(human,err)
 		return
 	end
 	 local cdkInfo = human.db.cdk[cdkBatchData.batch] or 0
     if cdkInfo >= cdkBatchData.useCnt then 
-        print("use cdk limit")
+        Broadcast.sendErr(human,Lang.CDK_ERR3)
         return
     end
     local cdkCfg = CdkFixExcel.cdkFix[cdkBatchData.info]
     if not cdkCfg then 
-        print("batch cdk error")
+        Broadcast.sendErr(human,Lang.CDK_INVALID_ERR)
         return
     end
     local nowTime = os.time()
     if nowTime > transTime(cdkCfg.endDate) then 
-        print("cdk over time")
+        --print("cdk over time")
+		Broadcast.sendErr(human,Lang.CDK_ERR2)
         return
     end
 	if next(cdkCfg.serverIndexs) then