puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-06-15 14:07:13 +08:00
commit b951d8d2b7
17 changed files with 783 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lua/app/common/pay_manager.lua
View File

@ -1,7 +1,5 @@
local PayManager = class("PayManager", BaseModule) local PayManager = class("PayManager", BaseModule)
local BLESSING_GIFT_ID = 30001
PayManager.PURCHARSE_TYPE = { PayManager.PURCHARSE_TYPE = {
ACT_GIFT = 1, ACT_GIFT = 1,
ACT_GOLD_PIG = 2, ACT_GOLD_PIG = 2,
@ -146,7 +144,7 @@ function PayManager:purchasePackage(id, purchaseType)
end end
function PayManager:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback) function PayManager:requestRewards(purchaseToken, orderId, originOrderId, productId, notShowRewardsBox, callback)
self:sendMsgToServer(purchaseToken, orderId, originOrderId, function(binder, msgData) self:sendMsgToServer(purchaseToken, orderId, originOrderId, productId, function(binder, msgData)
if msgData.status == 0 then if msgData.status == 0 then
local showRewards = not notShowRewardsBox local showRewards = not notShowRewardsBox
if DataManager.TutorialData and DataManager.TutorialData:getIsInTutorial() then -- 引导时不弹 if DataManager.TutorialData and DataManager.TutorialData:getIsInTutorial() then -- 引导时不弹
@ -269,23 +267,8 @@ function PayManager:checkAndPay(productId, id, purchaseType, rechargeId)
end) end)
end end
function PayManager:sendMsgToServer(purchaseToken, orderId, originOrderId, callback) function PayManager:sendMsgToServer(purchaseToken, uuid, originOrderId, productId, callback)
local args = { local args = SDKManager:getPurchaseArgs(purchaseToken, uuid, originOrderId, productId)
uuid = {orderId},
channel = SDKManager:getSDKPayType(),
}
if Platform:isIosPlatform() then
local purchaseTokenObj = json.decode(purchaseToken)
if purchaseTokenObj == nil then
return -- 解析错误
end
args.pay_token = purchaseTokenObj.Payload
else
args.pay_token = purchaseToken
end
if EDITOR_MODE then
args.channel = SDKManager.PAY_TYPE.DEBUG
end
self:sendMessage(ProtoMsgType.FromMsgEnum.ActPaidResultReq, args, {}, callback) self:sendMessage(ProtoMsgType.FromMsgEnum.ActPaidResultReq, args, {}, callback)
end end

10
lua/app/common/sdk_manager.lua
View File

@ -40,8 +40,9 @@ SDKManager.LOGIN_TYPE = {
SDKManager.PAY_TYPE = { SDKManager.PAY_TYPE = {
NONE = 0, NONE = 0,
GOOGLE = 1, GOOGLE = 1,
IOS = 2, APPLE = 2,
DEBUG = 10 DEBUG = 10,
DEPRECATED_APPLE = 11,
} }
local PAY_TYPE_IN_APP = "inapp" local PAY_TYPE_IN_APP = "inapp"
@ -150,6 +151,11 @@ function SDKManager:getIsSupportSDKPay()
return SDKPayMgr:getIsSupportSDKPay() return SDKPayMgr:getIsSupportSDKPay()
end end
-- 获取支付参数
function SDKManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
return SDKPayMgr:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
end
-- sdk将已完成的订单消耗掉 -- sdk将已完成的订单消耗掉
function SDKManager:consumePurchase(token, callback) function SDKManager:consumePurchase(token, callback)
SDKPayMgr:consumePurchase(token, callback) SDKPayMgr:consumePurchase(token, callback)

11
lua/app/common/sdk_pay_default_manager.lua
View File

@ -31,9 +31,20 @@ function SDKPayDefaultManager:getPriceCurrencyCode(skuId)
end end
function SDKPayDefaultManager:getSDKPayType() function SDKPayDefaultManager:getSDKPayType()
if EDITOR_MODE then
return SDKManager.PAY_TYPE.DEBUG
end
return SDKManager.PAY_TYPE.NONE return SDKManager.PAY_TYPE.NONE
end end
function SDKPayDefaultManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
local args = {
channel = self:getSDKPayType(),
params = {uuid}
}
return args
end
-- 获取支付方式,目前只有google支付 -- 获取支付方式,目前只有google支付
function SDKPayDefaultManager:getIsSupportSDKPay() function SDKPayDefaultManager:getIsSupportSDKPay()
return false return false

10
lua/app/common/sdk_pay_google_manager.lua
View File

@ -239,11 +239,15 @@ function SDKPayGoogleManager:getPriceCurrencyCode(skuId)
end end
function SDKPayGoogleManager:getSDKPayType() function SDKPayGoogleManager:getSDKPayType()
if Platform:getIsPublishChannel() then
return SDKManager.PAY_TYPE.GOOGLE return SDKManager.PAY_TYPE.GOOGLE
else
return SDKManager.PAY_TYPE.NONE
end end
function SDKPayGoogleManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
local args = {
channel = self:getSDKPayType(),
params = {purchaseToken, productId}
}
return args
end end
-- 获取支付方式,目前只有google支付 -- 获取支付方式,目前只有google支付

16
lua/app/common/sdk_pay_ios_manager.lua
View File

@ -182,11 +182,19 @@ function SDKPayiOSManager:getPriceCurrencyCode(skuId)
end end
function SDKPayiOSManager:getSDKPayType() function SDKPayiOSManager:getSDKPayType()
if Platform:getIsPublishChannel() then return SDKManager.PAY_TYPE.DEPRECATED_APPLE
return SDKManager.PAY_TYPE.IOS
else
return SDKManager.PAY_TYPE.NONE
end end
function SDKPayiOSManager:getPurchaseArgs(purchaseToken, uuid, channelOrderId, productId)
local purchaseTokenObj = json.decode(purchaseToken)
if purchaseTokenObj == nil then
return -- 解析错误
end
local args = {
channel = self:getSDKPayType(),
params = {purchaseTokenObj.Payload, channelOrderId, uuid}
}
return args
end end
-- 获取支付方式,目前只有google支付 -- 获取支付方式,目前只有google支付

300
lua/app/config/chapter_dungeon_gold.lua
View File

@ -25,7 +25,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_red_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[2]={ [2]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -53,7 +61,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_yellow_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[3]={ [3]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -81,7 +97,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_green_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[4]={ [4]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -109,7 +133,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_blue_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[5]={ [5]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -137,7 +169,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_purple_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[6]={ [6]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -165,7 +205,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_red_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[7]={ [7]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -193,7 +241,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_yellow_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[8]={ [8]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -221,7 +277,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_green_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[9]={ [9]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -249,7 +313,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_blue_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[10]={ [10]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -277,7 +349,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_purple_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[11]={ [11]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -305,7 +385,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_red_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[12]={ [12]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -333,7 +421,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_yellow_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[13]={ [13]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -361,7 +457,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_green_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[14]={ [14]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -389,7 +493,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_blue_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[15]={ [15]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -417,7 +529,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_purple_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[16]={ [16]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -445,7 +565,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_red_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[17]={ [17]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -473,7 +601,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_yellow_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[18]={ [18]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -501,7 +637,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_green_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[19]={ [19]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -529,7 +673,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_blue_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[20]={ [20]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -557,7 +709,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_purple_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[21]={ [21]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -585,7 +745,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_red_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[22]={ [22]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -613,7 +781,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_yellow_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[23]={ [23]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -641,7 +817,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_green_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[24]={ [24]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -669,7 +853,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_blue_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[25]={ [25]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -697,7 +889,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_purple_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[26]={ [26]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -725,7 +925,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_red_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[27]={ [27]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -753,7 +961,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_yellow_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[28]={ [28]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -781,7 +997,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_green_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[29]={ [29]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -809,7 +1033,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_blue_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
}, },
[30]={ [30]={
["scene"]="bg_11", ["scene"]="bg_11",
@ -837,7 +1069,15 @@ local chapter_dungeon_gold = {
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
}, },
["wave_limit"]=15 ["wave_limit"]=40,
["effect"]={
{
["type"]="dec_dmg_purple_add",
["num"]=5000,
["ratio"]=10000,
["round"]=999
}
}
} }
} }
local config = { local config = {

60
lua/app/config/chapter_dungeon_shards.lua
View File

@ -19,7 +19,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_red_add", ["type"]="dec_dmg_green_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -108,7 +108,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_yellow_add", ["type"]="dec_dmg_blue_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -197,7 +197,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_green_add", ["type"]="dec_dmg_purple_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -286,7 +286,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_blue_add", ["type"]="dec_dmg_red_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -375,7 +375,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_purple_add", ["type"]="dec_dmg_yellow_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -464,7 +464,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_red_add", ["type"]="dec_dmg_green_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -553,7 +553,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_yellow_add", ["type"]="dec_dmg_blue_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -642,7 +642,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_green_add", ["type"]="dec_dmg_purple_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -731,7 +731,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_blue_add", ["type"]="dec_dmg_red_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -820,7 +820,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_purple_add", ["type"]="dec_dmg_yellow_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -909,7 +909,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_red_add", ["type"]="dec_dmg_green_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -998,7 +998,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_yellow_add", ["type"]="dec_dmg_blue_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1087,7 +1087,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_green_add", ["type"]="dec_dmg_purple_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1176,7 +1176,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_blue_add", ["type"]="dec_dmg_red_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1265,7 +1265,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_purple_add", ["type"]="dec_dmg_yellow_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1354,7 +1354,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_red_add", ["type"]="dec_dmg_green_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1443,7 +1443,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_yellow_add", ["type"]="dec_dmg_blue_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1532,7 +1532,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_green_add", ["type"]="dec_dmg_purple_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1621,7 +1621,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_blue_add", ["type"]="dec_dmg_red_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1710,7 +1710,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_purple_add", ["type"]="dec_dmg_yellow_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1799,7 +1799,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_red_add", ["type"]="dec_dmg_green_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1888,7 +1888,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_yellow_add", ["type"]="dec_dmg_blue_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -1977,7 +1977,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_green_add", ["type"]="dec_dmg_purple_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -2066,7 +2066,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_blue_add", ["type"]="dec_dmg_red_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -2155,7 +2155,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_purple_add", ["type"]="dec_dmg_yellow_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -2244,7 +2244,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_red_add", ["type"]="dec_dmg_green_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -2333,7 +2333,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_yellow_add", ["type"]="dec_dmg_blue_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -2422,7 +2422,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_green_add", ["type"]="dec_dmg_purple_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -2511,7 +2511,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_blue_add", ["type"]="dec_dmg_red_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
@ -2600,7 +2600,7 @@ local chapter_dungeon_shards = {
}, },
["effect"]={ ["effect"]={
{ {
["type"]="dec_dmg_purple_add", ["type"]="dec_dmg_yellow_add",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999

12
lua/app/config/grid_type.lua
View File

@ -479,12 +479,6 @@ local grid_type = {
[36]={ [36]={
["icon"]="battle_obstacle_lava", ["icon"]="battle_obstacle_lava",
["next_type"]=0, ["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
@ -496,12 +490,6 @@ local grid_type = {
[37]={ [37]={
["icon"]="battle_obstacle_poisonous_mist", ["icon"]="battle_obstacle_poisonous_mist",
["next_type"]=0, ["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,

300
lua/app/config/monster_dungeon_gold.lua
View File

@ -1,9 +1,15 @@
local monster_dungeon_gold = { local monster_dungeon_gold = {
[105]={ [105]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90000000, ["hp"]=900000000,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10008
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -20,9 +26,15 @@ local monster_dungeon_gold = {
}, },
[205]={ [205]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90200000, ["hp"]=1125000000,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10009
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -39,9 +51,15 @@ local monster_dungeon_gold = {
}, },
[305]={ [305]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90400000, ["hp"]=1406250000,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10010
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -58,9 +76,15 @@ local monster_dungeon_gold = {
}, },
[405]={ [405]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90600000, ["hp"]=1757812500,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10011
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -77,9 +101,15 @@ local monster_dungeon_gold = {
}, },
[505]={ [505]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=90800000, ["hp"]=2197265625,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10012
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -96,9 +126,15 @@ local monster_dungeon_gold = {
}, },
[605]={ [605]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91000000, ["hp"]=2746582031,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10008
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -115,9 +151,15 @@ local monster_dungeon_gold = {
}, },
[705]={ [705]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91200000, ["hp"]=3433227539,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10009
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -134,9 +176,15 @@ local monster_dungeon_gold = {
}, },
[805]={ [805]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91400000, ["hp"]=4291534423,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10010
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -153,9 +201,15 @@ local monster_dungeon_gold = {
}, },
[905]={ [905]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91600000, ["hp"]=5364418029,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10011
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -172,9 +226,15 @@ local monster_dungeon_gold = {
}, },
[1005]={ [1005]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=91800000, ["hp"]=6705522537,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10012
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -191,9 +251,15 @@ local monster_dungeon_gold = {
}, },
[1105]={ [1105]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92000000, ["hp"]=8381903171,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10008
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -210,9 +276,15 @@ local monster_dungeon_gold = {
}, },
[1205]={ [1205]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92200000, ["hp"]=10477378964,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10009
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -229,9 +301,15 @@ local monster_dungeon_gold = {
}, },
[1305]={ [1305]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92400000, ["hp"]=13096723705,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10010
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -248,9 +326,15 @@ local monster_dungeon_gold = {
}, },
[1405]={ [1405]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92600000, ["hp"]=16370904631,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10011
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -267,9 +351,15 @@ local monster_dungeon_gold = {
}, },
[1505]={ [1505]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=92800000, ["hp"]=20463630789,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10012
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -286,9 +376,15 @@ local monster_dungeon_gold = {
}, },
[1605]={ [1605]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93000000, ["hp"]=25579538487,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10008
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -305,9 +401,15 @@ local monster_dungeon_gold = {
}, },
[1705]={ [1705]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93200000, ["hp"]=31974423109,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10009
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -324,9 +426,15 @@ local monster_dungeon_gold = {
}, },
[1805]={ [1805]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93400000, ["hp"]=39968028886,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10010
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -343,9 +451,15 @@ local monster_dungeon_gold = {
}, },
[1905]={ [1905]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93600000, ["hp"]=49960036108,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10011
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -362,9 +476,15 @@ local monster_dungeon_gold = {
}, },
[2005]={ [2005]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=93800000, ["hp"]=62450045135,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10012
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -381,9 +501,15 @@ local monster_dungeon_gold = {
}, },
[2105]={ [2105]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94000000, ["hp"]=78062556418,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10008
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -400,9 +526,15 @@ local monster_dungeon_gold = {
}, },
[2205]={ [2205]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94200000, ["hp"]=97578195523,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10009
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -419,9 +551,15 @@ local monster_dungeon_gold = {
}, },
[2305]={ [2305]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94400000, ["hp"]=121972744404,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10010
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -438,9 +576,15 @@ local monster_dungeon_gold = {
}, },
[2405]={ [2405]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94600000, ["hp"]=152465930505,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10011
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -457,9 +601,15 @@ local monster_dungeon_gold = {
}, },
[2505]={ [2505]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=94800000, ["hp"]=190582413132,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10012
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -476,9 +626,15 @@ local monster_dungeon_gold = {
}, },
[2605]={ [2605]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95000000, ["hp"]=238228016415,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10008
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -495,9 +651,15 @@ local monster_dungeon_gold = {
}, },
[2705]={ [2705]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95200000, ["hp"]=297785020519,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10009
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -514,9 +676,15 @@ local monster_dungeon_gold = {
}, },
[2805]={ [2805]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95400000, ["hp"]=372231275648,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10010
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -533,9 +701,15 @@ local monster_dungeon_gold = {
}, },
[2905]={ [2905]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95600000, ["hp"]=465289094561,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10011
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,
@ -552,9 +726,15 @@ local monster_dungeon_gold = {
}, },
[3005]={ [3005]={
["monster_base"]=20003, ["monster_base"]=20003,
["hp"]=95800000, ["hp"]=581611368201,
["atk"]=0, ["atk"]=10000000000,
["atk_times"]=0, ["atk_times"]=0,
["skill"]={
10072
},
["passive_skill"]={
10012
},
["monster_exp"]=440000, ["monster_exp"]=440000,
["monster_hp"]={ ["monster_hp"]={
10000, 10000,

38
lua/app/config/recharge.lua
View File

@ -1,6 +1,6 @@
local recharge = { local recharge = {
[1]={ [1]={
["payId"]="com.knight.connect.rpg.0.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.0.99dollar",
["price"]=0.99, ["price"]=0.99,
["price_cn"]=6, ["price_cn"]=6,
["same_price"]=1, ["same_price"]=1,
@ -8,7 +8,7 @@ local recharge = {
["score"]=1 ["score"]=1
}, },
[2]={ [2]={
["payId"]="com.knight.connect.rpg.1.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.1.99dollar",
["price"]=1.99, ["price"]=1.99,
["price_cn"]=12, ["price_cn"]=12,
["same_price"]=2, ["same_price"]=2,
@ -16,7 +16,7 @@ local recharge = {
["score"]=2 ["score"]=2
}, },
[3]={ [3]={
["payId"]="com.knight.connect.rpg.2.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.2.99dollar",
["price"]=2.99, ["price"]=2.99,
["price_cn"]=18, ["price_cn"]=18,
["same_price"]=3, ["same_price"]=3,
@ -24,7 +24,7 @@ local recharge = {
["score"]=3 ["score"]=3
}, },
[4]={ [4]={
["payId"]="com.knight.connect.rpg.3.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.3.99dollar",
["price"]=3.99, ["price"]=3.99,
["price_cn"]=24, ["price_cn"]=24,
["same_price"]=4, ["same_price"]=4,
@ -32,7 +32,7 @@ local recharge = {
["score"]=4 ["score"]=4
}, },
[5]={ [5]={
["payId"]="com.knight.connect.rpg.4.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.4.99dollar",
["price"]=4.99, ["price"]=4.99,
["price_cn"]=30, ["price_cn"]=30,
["same_price"]=5, ["same_price"]=5,
@ -40,7 +40,7 @@ local recharge = {
["score"]=5 ["score"]=5
}, },
[6]={ [6]={
["payId"]="com.knight.connect.rpg.5.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.5.99dollar",
["price"]=5.99, ["price"]=5.99,
["price_cn"]=38, ["price_cn"]=38,
["same_price"]=6, ["same_price"]=6,
@ -48,7 +48,7 @@ local recharge = {
["score"]=6 ["score"]=6
}, },
[7]={ [7]={
["payId"]="com.knight.connect.rpg.6.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.6.99dollar",
["price"]=6.99, ["price"]=6.99,
["price_cn"]=45, ["price_cn"]=45,
["same_price"]=7, ["same_price"]=7,
@ -56,7 +56,7 @@ local recharge = {
["score"]=7 ["score"]=7
}, },
[8]={ [8]={
["payId"]="com.knight.connect.rpg.7.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.7.99dollar",
["price"]=7.99, ["price"]=7.99,
["price_cn"]=52, ["price_cn"]=52,
["same_price"]=8, ["same_price"]=8,
@ -64,7 +64,7 @@ local recharge = {
["score"]=8 ["score"]=8
}, },
[9]={ [9]={
["payId"]="com.knight.connect.rpg.8.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.8.99dollar",
["price"]=8.99, ["price"]=8.99,
["price_cn"]=60, ["price_cn"]=60,
["same_price"]=9, ["same_price"]=9,
@ -72,7 +72,7 @@ local recharge = {
["score"]=9 ["score"]=9
}, },
[10]={ [10]={
["payId"]="com.knight.connect.rpg.9.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.9.99dollar",
["price"]=9.99, ["price"]=9.99,
["price_cn"]=68, ["price_cn"]=68,
["same_price"]=10, ["same_price"]=10,
@ -80,7 +80,7 @@ local recharge = {
["score"]=10 ["score"]=10
}, },
[11]={ [11]={
["payId"]="com.knight.connect.rpg.11.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.11.99dollar",
["price"]=11.99, ["price"]=11.99,
["price_cn"]=78, ["price_cn"]=78,
["same_price"]=12, ["same_price"]=12,
@ -88,7 +88,7 @@ local recharge = {
["score"]=12 ["score"]=12
}, },
[12]={ [12]={
["payId"]="com.knight.connect.rpg.14.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.14.99dollar",
["price"]=14.99, ["price"]=14.99,
["price_cn"]=98, ["price_cn"]=98,
["same_price"]=15, ["same_price"]=15,
@ -96,7 +96,7 @@ local recharge = {
["score"]=15 ["score"]=15
}, },
[13]={ [13]={
["payId"]="com.knight.connect.rpg.19.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.19.99dollar",
["price"]=19.99, ["price"]=19.99,
["price_cn"]=128, ["price_cn"]=128,
["same_price"]=20, ["same_price"]=20,
@ -104,7 +104,7 @@ local recharge = {
["score"]=20 ["score"]=20
}, },
[14]={ [14]={
["payId"]="com.knight.connect.rpg.24.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.24.99dollar",
["price"]=24.99, ["price"]=24.99,
["price_cn"]=168, ["price_cn"]=168,
["same_price"]=25, ["same_price"]=25,
@ -112,7 +112,7 @@ local recharge = {
["score"]=25 ["score"]=25
}, },
[15]={ [15]={
["payId"]="com.knight.connect.rpg.29.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.29.99dollar",
["price"]=29.99, ["price"]=29.99,
["price_cn"]=198, ["price_cn"]=198,
["same_price"]=30, ["same_price"]=30,
@ -120,7 +120,7 @@ local recharge = {
["score"]=30 ["score"]=30
}, },
[16]={ [16]={
["payId"]="com.knight.connect.rpg.49.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.49.99dollar",
["price"]=49.99, ["price"]=49.99,
["price_cn"]=328, ["price_cn"]=328,
["same_price"]=50, ["same_price"]=50,
@ -128,7 +128,7 @@ local recharge = {
["score"]=50 ["score"]=50
}, },
[17]={ [17]={
["payId"]="com.knight.connect.rpg.69.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.69.99dollar",
["price"]=69.99, ["price"]=69.99,
["price_cn"]=448, ["price_cn"]=448,
["same_price"]=70, ["same_price"]=70,
@ -136,7 +136,7 @@ local recharge = {
["score"]=70 ["score"]=70
}, },
[18]={ [18]={
["payId"]="com.knight.connect.rpg.99.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.99.99dollar",
["price"]=99.99, ["price"]=99.99,
["price_cn"]=648, ["price_cn"]=648,
["same_price"]=100, ["same_price"]=100,
@ -144,7 +144,7 @@ local recharge = {
["score"]=100 ["score"]=100
}, },
[19]={ [19]={
["payId"]="com.knight.connect.rpg.199.99dollar", ["payId"]="com.combo.heroes.puzzle.rpg.199.99dollar",
["price"]=199.99, ["price"]=199.99,
["price_cn"]=1298, ["price_cn"]=1298,
["same_price"]=200, ["same_price"]=200,

121
lua/app/config/skill.lua
View File

@ -2751,6 +2751,7 @@ local skill = {
} }
}, },
[2400221]={ [2400221]={
["position"]=2,
["skill_type"]=11, ["skill_type"]=11,
["skill_type_parameter"]={ ["skill_type_parameter"]={
0, 0,
@ -2761,6 +2762,7 @@ local skill = {
["obj"]=1 ["obj"]=1
}, },
[2400222]={ [2400222]={
["position"]=2,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=5, ["trigger"]=5,
["effect"]={ ["effect"]={
@ -2774,6 +2776,7 @@ local skill = {
["obj"]=2 ["obj"]=2
}, },
[2400223]={ [2400223]={
["position"]=2,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=6, ["trigger"]=6,
["effect"]={ ["effect"]={
@ -2787,6 +2790,7 @@ local skill = {
["obj"]=1 ["obj"]=1
}, },
[2400224]={ [2400224]={
["position"]=2,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=5, ["trigger"]=5,
["effect"]={ ["effect"]={
@ -2800,6 +2804,7 @@ local skill = {
["obj"]=2 ["obj"]=2
}, },
[2400225]={ [2400225]={
["position"]=2,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=6, ["trigger"]=6,
["effect"]={ ["effect"]={
@ -5482,6 +5487,7 @@ local skill = {
["fx_self"]=300017 ["fx_self"]=300017
}, },
[5200123]={ [5200123]={
["position"]=5,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=5, ["trigger"]=5,
["effect"]={ ["effect"]={
@ -6193,6 +6199,7 @@ local skill = {
} }
}, },
[5400121]={ [5400121]={
["position"]=5,
["skill_type"]=11, ["skill_type"]=11,
["skill_type_parameter"]={ ["skill_type_parameter"]={
0, 0,
@ -6203,6 +6210,7 @@ local skill = {
["obj"]=1 ["obj"]=1
}, },
[5400122]={ [5400122]={
["position"]=5,
["skill_type"]=12, ["skill_type"]=12,
["skill_type_parameter"]={ ["skill_type_parameter"]={
5, 5,
@ -6264,6 +6272,7 @@ local skill = {
} }
}, },
[5400124]={ [5400124]={
["position"]=5,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=9, ["trigger"]=9,
["effect"]={ ["effect"]={
@ -6277,6 +6286,7 @@ local skill = {
["obj"]=1 ["obj"]=1
}, },
[5400125]={ [5400125]={
["position"]=5,
["skill_type"]=11, ["skill_type"]=11,
["skill_type_parameter"]={ ["skill_type_parameter"]={
5, 5,
@ -6391,23 +6401,48 @@ local skill = {
["link"]=1, ["link"]=1,
["position"]=5, ["position"]=5,
["method"]=1, ["method"]=1,
["skill_type"]=11,
["skill_type_parameter"]={
0,
2
},
["battle_icon"]="20", ["battle_icon"]="20",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="counterattack", ["type"]="hurt_purple",
["num"]=2500, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=0
},
{
["type"]="hurt_purple",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_purple",
["num"]=5000,
["ratio"]=10000,
["round"]=0
} }
}, },
["obj"]=1, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
2, 2,
0 0
@ -6416,6 +6451,7 @@ local skill = {
["fx_self"]=300089 ["fx_self"]=300089
}, },
[5400221]={ [5400221]={
["position"]=5,
["buff_condition"]={ ["buff_condition"]={
{ {
{ {
@ -6446,35 +6482,25 @@ local skill = {
["obj"]=2 ["obj"]=2
}, },
[5400222]={ [5400222]={
["energy"]=10,
["link"]=1,
["position"]=5, ["position"]=5,
["method"]=1, ["effect_type"]=2,
["skill_type"]=11, ["trigger"]=6,
["skill_type_parameter"]={
0,
4
},
["battle_icon"]="20",
["effect_type"]=1,
["trigger"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="counterattack", ["type"]="counterattack",
["num"]=2500, ["num"]=2500,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=2
} }
}, },
["obj"]=1, ["obj"]=1,
["skill_position"]={ ["skill_position"]={
2, 2,
0 0
}, }
["name_act"]="skill01",
["fx_self"]=300089
}, },
[5400223]={ [5400223]={
["position"]=5,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=5, ["trigger"]=5,
["effect"]={ ["effect"]={
@ -6488,6 +6514,25 @@ local skill = {
["obj"]=2 ["obj"]=2
}, },
[5400224]={ [5400224]={
["position"]=5,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="counterattack",
["num"]=2500,
["ratio"]=10000,
["round"]=3
}
},
["obj"]=1,
["skill_position"]={
2,
0
}
},
[5400225]={
["position"]=5,
["buff_condition"]={ ["buff_condition"]={
{ {
{ {
@ -8919,6 +8964,32 @@ local skill = {
["name_act"]="skill01", ["name_act"]="skill01",
["fx_self"]=200092 ["fx_self"]=200092
}, },
[10072]={
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt",
["num"]=10000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["cd"]=1,
["cd_start"]=40,
["shake_time"]=200,
["shake_type"]=600,
["sound_hit"]={
10063
},
["name_act"]="skill01",
["bullet_time"]={
500,
3000,
400
}
},
[20001]={ [20001]={
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
@ -16450,6 +16521,6 @@ local skill = {
} }
} }
local config = { local config = {
data=skill,count=626 data=skill,count=628
} }
return config return config

55
lua/app/config/skill_rogue.lua
View File

@ -3700,13 +3700,13 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=8, ["type"]=7,
["parameter"]={ ["parameter"]={
1, 1,
1 3000
}, },
["skill_position"]=5, ["skill_position"]=5,
["icon"]="164" ["icon"]="166"
}, },
[5400202]={ [5400202]={
["limit_times"]=1, ["limit_times"]=1,
@ -3728,25 +3728,36 @@ local skill_rogue = {
[5400203]={ [5400203]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=4,
["type"]=1, ["type"]=12,
["parameter"]={
5400222
},
["skill_position"]=5, ["skill_position"]=5,
["icon"]="166" ["effect"]={
{
["type"]="add_skill",
["num"]=5400222,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=7,
["icon"]="164"
}, },
[5400204]={ [5400204]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=3,
["type"]=8, ["type"]=9,
["parameter"]={
1,
1
},
["skill_position"]=5, ["skill_position"]=5,
["icon"]="167" ["effect"]={
{
["type"]="atkp_purple_add",
["num"]=1500,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=7,
["icon"]="169"
}, },
[5400205]={ [5400205]={
["limit_times"]=1, ["limit_times"]=1,
@ -3766,21 +3777,23 @@ local skill_rogue = {
["icon"]="168" ["icon"]="168"
}, },
[5400206]={ [5400206]={
["unlock"]=5400203,
["cover_unlock"]=5400203,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=9, ["type"]=12,
["skill_position"]=5, ["skill_position"]=5,
["effect"]={ ["effect"]={
{ {
["type"]="atkp_purple_add", ["type"]="add_skill",
["num"]=1500, ["num"]=5400224,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
}, },
["obj"]=7, ["obj"]=7,
["icon"]="169" ["icon"]="167"
}, },
[5400207]={ [5400207]={
["unlock"]=5400202, ["unlock"]=5400202,
@ -3793,7 +3806,7 @@ local skill_rogue = {
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
["num"]=5400224, ["num"]=5400225,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }

6
lua/app/config/strings/cn/skill.lua
View File

@ -42,7 +42,7 @@ local skill = {
["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。" ["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。"
}, },
[3400220]={ [3400220]={
["desc"]="法老诅咒：额外造成一次技能伤害，附加<color=#3cff28>诅咒</color>效果，<color=#3cff28>1</color>回合。" ["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。"
}, },
[4200120]={ [4200120]={
["desc"]="元素链接：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。" ["desc"]="元素链接：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"
@ -57,7 +57,7 @@ local skill = {
["desc"]="冰霜剑舞：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害，附加冰霜效果，<color=#3cff28>1</color>回合。" ["desc"]="冰霜剑舞：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害，附加冰霜效果，<color=#3cff28>1</color>回合。"
}, },
[4400220]={ [4400220]={
["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="法老诅咒：额外造成一次技能伤害，附加<color=#3cff28>诅咒</color>效果，<color=#3cff28>1</color>回合。"
}, },
[5200120]={ [5200120]={
["desc"]="护盾术：为团队附加一个护盾，<color=#3cff28>1</color>回合。" ["desc"]="护盾术：为团队附加一个护盾，<color=#3cff28>1</color>回合。"
@ -72,7 +72,7 @@ local skill = {
["desc"]="蝶舞斩：额外造成多次技能伤害。" ["desc"]="蝶舞斩：额外造成多次技能伤害。"
}, },
[5400220]={ [5400220]={
["desc"]="脉动反击：随机增加一个技能<color=#3cff28>2</color>点能量，并为团队附加<color=#3cff28>反击</color>效果，<color=#3cff28>1</color>回合。" ["desc"]="幻影连击：额外造成多次技能伤害。"
} }
} }
local config = { local config = {

82
lua/app/config/strings/cn/skill_rogue.lua
View File

@ -141,7 +141,7 @@ local skill_rogue = {
["desc"]="舞步消散使用时本次普攻伤害提升<color=#3cff28>10%</color>。" ["desc"]="舞步消散使用时本次普攻伤害提升<color=#3cff28>10%</color>。"
}, },
[1200103]={ [1200103]={
["desc"]="舞步消散对冰霜敌人的伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:舞步消散对冰霜敌人的伤害增加<color=#3cff28>50%</color>。"
}, },
[1200104]={ [1200104]={
["desc"]="舞步消散纵向可额外消除<color=#3cff28>4</color>格。" ["desc"]="舞步消散纵向可额外消除<color=#3cff28>4</color>格。"
@ -162,7 +162,7 @@ local skill_rogue = {
["desc"]="巨剑旋风可附加灼烧效果，<color=#3cff28>2</color>回合。" ["desc"]="巨剑旋风可附加灼烧效果，<color=#3cff28>2</color>回合。"
}, },
[1300102]={ [1300102]={
["desc"]="巨剑旋风对流血敌人的伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:巨剑旋风对流血敌人的伤害增加<color=#3cff28>50%</color>。"
}, },
[1300103]={ [1300103]={
["desc"]="巨剑旋风技能伤害提升。" ["desc"]="巨剑旋风技能伤害提升。"
@ -186,7 +186,7 @@ local skill_rogue = {
["desc"]="炎拳沿横向可额外消除<color=#3cff28>4</color>格。" ["desc"]="炎拳沿横向可额外消除<color=#3cff28>4</color>格。"
}, },
[1300202]={ [1300202]={
["desc"]="炎拳对禁锢敌人的伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:炎拳对禁锢敌人的伤害增加<color=#3cff28>50%</color>。"
}, },
[1300203]={ [1300203]={
["desc"]="炎拳的灼烧概率提高到<color=#3cff28>100%</color>。" ["desc"]="炎拳的灼烧概率提高到<color=#3cff28>100%</color>。"
@ -213,7 +213,7 @@ local skill_rogue = {
["desc"]="钢铁重击附加眩晕效果，<color=#3cff28>1</color>回合。" ["desc"]="钢铁重击附加眩晕效果，<color=#3cff28>1</color>回合。"
}, },
[1400103]={ [1400103]={
["desc"]="钢铁重击对流血敌人额外造成<color=#3cff28>1</color>次伤害。" ["desc"]="<color=#acae16>Combo</color>:钢铁重击对流血敌人额外造成<color=#3cff28>1</color>次伤害。"
}, },
[1400104]={ [1400104]={
["desc"]="钢铁重击附加的眩晕，回合数<color=#3cff28>+1</color>。" ["desc"]="钢铁重击附加的眩晕，回合数<color=#3cff28>+1</color>。"
@ -234,7 +234,7 @@ local skill_rogue = {
["desc"]="熊猫爆竹可附加灼烧效果，<color=#3cff28>2</color>回合。" ["desc"]="熊猫爆竹可附加灼烧效果，<color=#3cff28>2</color>回合。"
}, },
[1400202]={ [1400202]={
["desc"]="熊猫爆竹对<color=#3cff28>冻结</color>敌人的伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:熊猫爆竹对<color=#3cff28>冻结</color>敌人的伤害增加<color=#3cff28>50%</color>。"
}, },
[1400203]={ [1400203]={
["desc"]="熊猫爆竹横向可额外消除<color=#3cff28>4</color>个格。" ["desc"]="熊猫爆竹横向可额外消除<color=#3cff28>4</color>个格。"
@ -243,7 +243,7 @@ local skill_rogue = {
["desc"]="潘达普攻时有<color=#3cff28>10%</color>概率附加灼烧效果，<color=#3cff28>2</color>回合。" ["desc"]="潘达普攻时有<color=#3cff28>10%</color>概率附加灼烧效果，<color=#3cff28>2</color>回合。"
}, },
[1400205]={ [1400205]={
["desc"]="熊猫爆竹命中<color=#3cff28>冻结</color>敌人时，为团队附加<color=#3cff28>亢奋</color>效果，<color=#3cff28>3</color>回合。" ["desc"]="<color=#acae16>Combo</color>:熊猫爆竹命中<color=#3cff28>冻结</color>敌人时，为团队附加<color=#3cff28>亢奋</color>效果，<color=#3cff28>3</color>回合。"
}, },
[1400206]={ [1400206]={
["desc"]="潘达攻击提升<color=#3cff28>15%</color>。" ["desc"]="潘达攻击提升<color=#3cff28>15%</color>。"
@ -261,7 +261,7 @@ local skill_rogue = {
["desc"]="拔刀斩纵向可额外消除<color=#3cff28>4</color>格。" ["desc"]="拔刀斩纵向可额外消除<color=#3cff28>4</color>格。"
}, },
[2200103]={ [2200103]={
["desc"]="拔刀斩对灼烧敌人的伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:拔刀斩对灼烧敌人的伤害增加<color=#3cff28>50%</color>。"
}, },
[2200104]={ [2200104]={
["desc"]="刀妹攻击提升<color=#3cff28>15%</color>。" ["desc"]="刀妹攻击提升<color=#3cff28>15%</color>。"
@ -285,7 +285,7 @@ local skill_rogue = {
["desc"]="旋风骨技能伤害提升。" ["desc"]="旋风骨技能伤害提升。"
}, },
[2300103]={ [2300103]={
["desc"]="旋风骨对易伤敌人有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。" ["desc"]="<color=#acae16>Combo</color>:旋风骨对易伤敌人有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。"
}, },
[2300104]={ [2300104]={
["desc"]="旋风骨附加的流血效果，回合数<color=#3cff28>+1</color>。" ["desc"]="旋风骨附加的流血效果，回合数<color=#3cff28>+1</color>。"
@ -330,7 +330,7 @@ local skill_rogue = {
["desc"]="巨剑轰击沿X方向可额外消除<color=#3cff28>4</color>格。" ["desc"]="巨剑轰击沿X方向可额外消除<color=#3cff28>4</color>格。"
}, },
[2400102]={ [2400102]={
["desc"]="巨剑轰击对冻结敌人伤害大幅增加，并有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。" ["desc"]="<color=#acae16>Combo</color>:巨剑轰击对冻结敌人伤害大幅增加，并有<color=#3cff28>50%</color>概率附加眩晕效果，<color=#3cff28>1</color>回合。"
}, },
[2400103]={ [2400103]={
["desc"]="巨剑轰击附加眩晕效果的概率提高到<color=#3cff28>70%</color>。" ["desc"]="巨剑轰击附加眩晕效果的概率提高到<color=#3cff28>70%</color>。"
@ -378,7 +378,7 @@ local skill_rogue = {
["desc"]="长枪突刺可恢复一定量生命。" ["desc"]="长枪突刺可恢复一定量生命。"
}, },
[3200102]={ [3200102]={
["desc"]="长枪突刺对中毒敌人的伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:长枪突刺对中毒敌人的伤害增加<color=#3cff28>50%</color>。"
}, },
[3200103]={ [3200103]={
["desc"]="长枪突刺伤害提升。" ["desc"]="长枪突刺伤害提升。"
@ -432,7 +432,7 @@ local skill_rogue = {
["desc"]="狼袭瞬杀伤害提升。" ["desc"]="狼袭瞬杀伤害提升。"
}, },
[3300204]={ [3300204]={
["desc"]="狼袭瞬杀对中毒敌人有<color=#3cff28>50%</color>概率附加中毒效果，<color=#3cff28>2</color>回合。" ["desc"]="<color=#acae16>Combo</color>:狼袭瞬杀对中毒敌人有<color=#3cff28>50%</color>概率附加中毒效果，<color=#3cff28>2</color>回合。"
}, },
[3300205]={ [3300205]={
["desc"]="狼袭瞬杀附加的中毒效果，伤害提升。" ["desc"]="狼袭瞬杀附加的中毒效果，伤害提升。"
@ -468,28 +468,28 @@ local skill_rogue = {
["desc"]="流星追月链接<color=#3cff28>4</color>个元素或以上时，流星追月攻击将释放<color=#3cff28>2</color>次。" ["desc"]="流星追月链接<color=#3cff28>4</color>个元素或以上时，流星追月攻击将释放<color=#3cff28>2</color>次。"
}, },
[3400200]={ [3400200]={
["desc"]="解锁法老诅咒：额外造成一次技能伤害，附加<color=#3cff28>诅咒</color>效果，<color=#3cff28>1</color>回合。" ["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。"
}, },
[3400201]={ [3400201]={
["desc"]="法老诅咒纵向可额外消除<color=#3cff28>4</color>格。" ["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
}, },
[3400202]={ [3400202]={
["desc"]="法老诅咒使用时本次普攻伤害提升<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:美丽梦魇对<color=#3cff28>虚弱</color>敌人伤害增加<color=#3cff28>50%</color>。"
}, },
[3400203]={ [3400203]={
["desc"]="法老诅咒附加的<color=#3cff28>诅咒</color>效果，回合数<color=#3cff28>+1</color>。" ["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
}, },
[3400204]={ [3400204]={
["desc"]="法老诅咒附加的<color=#3cff28>诅咒</color>效果，<color=#3cff28>效果提升</color>。" ["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>100%</color>。"
}, },
[3400205]={ [3400205]={
["desc"]="艳后普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="<color=#acae16>Combo</color>:梦魔普攻<color=#3cff28>昏睡</color>敌人将附加<color=#3cff28>禁锢</color>效果，<color=#3cff28>2</color>回合。"
}, },
[3400206]={ [3400206]={
["desc"]="法老诅咒横向可额外消除<color=#3cff28>4</color>格。" ["desc"]="梦魔攻击提升<color=#3cff28>15%</color>。"
}, },
[3400207]={ [3400207]={
["desc"]="艳后普攻有<color=#3cff28>20%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="美丽梦魇激活所需能量<color=#3cff28>-2</color>。"
}, },
[4200100]={ [4200100]={
["desc"]="解锁元素链接：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。" ["desc"]="解锁元素链接：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"
@ -507,7 +507,7 @@ local skill_rogue = {
["desc"]="元素链接随机消除元素<color=#3cff28>+2</color>。" ["desc"]="元素链接随机消除元素<color=#3cff28>+2</color>。"
}, },
[4200105]={ [4200105]={
["desc"]="元素链接对冰霜敌人有<color=#3cff28>20%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。" ["desc"]="<color=#acae16>Combo</color>:元素链接对冰霜敌人有<color=#3cff28>20%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。"
}, },
[4200106]={ [4200106]={
["desc"]="冰心攻击提升<color=#3cff28>15%</color>。" ["desc"]="冰心攻击提升<color=#3cff28>15%</color>。"
@ -522,7 +522,7 @@ local skill_rogue = {
["desc"]="霜冻冰晶横向可额外消除<color=#3cff28>4</color>格。" ["desc"]="霜冻冰晶横向可额外消除<color=#3cff28>4</color>格。"
}, },
[4300102]={ [4300102]={
["desc"]="霜冻冰晶对灼烧敌人的伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:霜冻冰晶对灼烧敌人的伤害增加<color=#3cff28>50%</color>。"
}, },
[4300103]={ [4300103]={
["desc"]="霜冻冰晶附加的冰霜效果，回合数<color=#3cff28>+1</color>。" ["desc"]="霜冻冰晶附加的冰霜效果，回合数<color=#3cff28>+1</color>。"
@ -531,7 +531,7 @@ local skill_rogue = {
["desc"]="霜冻冰晶伤害提升。" ["desc"]="霜冻冰晶伤害提升。"
}, },
[4300105]={ [4300105]={
["desc"]="霜冻冰晶对冰霜敌人有50%概率附加冻结效果，<color=#3cff28>1</color>回合。" ["desc"]="<color=#acae16>Combo</color>:霜冻冰晶对冰霜敌人有50%概率附加冻结效果，<color=#3cff28>1</color>回合。"
}, },
[4300106]={ [4300106]={
["desc"]="霜冻冰晶后为团队附加冰盾效果，<color=#3cff28>2</color>回合。" ["desc"]="霜冻冰晶后为团队附加冰盾效果，<color=#3cff28>2</color>回合。"
@ -546,7 +546,7 @@ local skill_rogue = {
["desc"]="腐败利刃附加的腐败效果，回合数<color=#3cff28>+1</color>." ["desc"]="腐败利刃附加的腐败效果，回合数<color=#3cff28>+1</color>."
}, },
[4300202]={ [4300202]={
["desc"]="腐败利刃对易伤敌人附加冰霜效果，<color=#3cff28>1</color>回合。" ["desc"]="<color=#acae16>Combo</color>:腐败利刃对易伤敌人附加冰霜效果，<color=#3cff28>1</color>回合。"
}, },
[4300203]={ [4300203]={
["desc"]="腐败利刃使用时本次普攻伤害提升<color=#3cff28>15%</color>。" ["desc"]="腐败利刃使用时本次普攻伤害提升<color=#3cff28>15%</color>。"
@ -570,7 +570,7 @@ local skill_rogue = {
["desc"]="冰霜剑舞附加的冰霜效果，回合数<color=#3cff28>+1</color>" ["desc"]="冰霜剑舞附加的冰霜效果，回合数<color=#3cff28>+1</color>"
}, },
[4400102]={ [4400102]={
["desc"]="冰霜剑舞对灼烧敌人伤害增加<color=#3cff28>50%</color>。" ["desc"]="<color=#acae16>Combo</color>:冰霜剑舞对灼烧敌人伤害增加<color=#3cff28>50%</color>。"
}, },
[4400103]={ [4400103]={
["desc"]="冰霜剑舞随机消除元素<color=#3cff28>+3</color>" ["desc"]="冰霜剑舞随机消除元素<color=#3cff28>+3</color>"
@ -588,28 +588,28 @@ local skill_rogue = {
["desc"]="冰霜剑舞附加冻结效果概率提升到<color=#3cff28>70%</color>。" ["desc"]="冰霜剑舞附加冻结效果概率提升到<color=#3cff28>70%</color>。"
}, },
[4400200]={ [4400200]={
["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="解锁法老诅咒：额外造成一次技能伤害，附加<color=#3cff28>诅咒</color>效果，<color=#3cff28>1</color>回合。"
}, },
[4400201]={ [4400201]={
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。" ["desc"]="法老诅咒纵向可额外消除<color=#3cff28>4</color>格。"
}, },
[4400202]={ [4400202]={
["desc"]="<color=#acae16>Combo</color>:美丽梦魇对<color=#3cff28>虚弱</color>敌人伤害增加<color=#3cff28>50%</color>。" ["desc"]="法老诅咒使用时本次普攻伤害提升<color=#3cff28>50%</color>。"
}, },
[4400203]={ [4400203]={
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。" ["desc"]="法老诅咒附加的<color=#3cff28>诅咒</color>效果，回合数<color=#3cff28>+1</color>。"
}, },
[4400204]={ [4400204]={
["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>100%</color>。" ["desc"]="法老诅咒附加的<color=#3cff28>诅咒</color>效果，<color=#3cff28>效果提升</color>。"
}, },
[4400205]={ [4400205]={
["desc"]="<color=#acae16>Combo</color>:梦魔普攻<color=#3cff28>昏睡</color>敌人将附加<color=#3cff28>禁锢</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="艳后普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。"
}, },
[4400206]={ [4400206]={
["desc"]="梦魔攻击提升<color=#3cff28>15%</color>。" ["desc"]="法老诅咒横向可额外消除<color=#3cff28>4</color>格。"
}, },
[4400207]={ [4400207]={
["desc"]="美丽梦魇激活所需能量<color=#3cff28>-2</color>。" ["desc"]="艳后普攻有<color=#3cff28>20%</color>概率附加<color=#3cff28>腐败</color>效果，<color=#3cff28>2</color>回合。"
}, },
[5200100]={ [5200100]={
["desc"]="解锁护盾术：为团队附加一个护盾，<color=#3cff28>1</color>回合。" ["desc"]="解锁护盾术：为团队附加一个护盾，<color=#3cff28>1</color>回合。"
@ -666,7 +666,7 @@ local skill_rogue = {
["desc"]="灵魂爆破横向可额外消除<color=#3cff28>4</color>格。" ["desc"]="灵魂爆破横向可额外消除<color=#3cff28>4</color>格。"
}, },
[5300202]={ [5300202]={
["desc"]="灵魂爆破对冰霜敌人有<color=#3cff28>50%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。" ["desc"]="<color=#acae16>Combo</color>:灵魂爆破对冰霜敌人有<color=#3cff28>50%</color>概率附加冻结效果，<color=#3cff28>1</color>回合。"
}, },
[5300203]={ [5300203]={
["desc"]="灵魂爆破伤害提升。" ["desc"]="灵魂爆破伤害提升。"
@ -708,28 +708,28 @@ local skill_rogue = {
["desc"]="蝶舞斩击杀敌人后将增加蝴蝶技能能量<color=#3cff28>2</color>点。" ["desc"]="蝶舞斩击杀敌人后将增加蝴蝶技能能量<color=#3cff28>2</color>点。"
}, },
[5400200]={ [5400200]={
["desc"]="解锁脉动反击：随机增加一个技能<color=#3cff28>2</color>点能量，并为团队附加<color=#3cff28>反击</color>效果，<color=#3cff28>1</color>回合。" ["desc"]="解锁幻影连击：额外造成多次技能伤害。"
}, },
[5400201]={ [5400201]={
["desc"]="脉动反击附加的<color=#3cff28>反击</color>效果，回合数<color=#3cff28>+1</color>。" ["desc"]="幻影连击伤害提升。"
}, },
[5400202]={ [5400202]={
["desc"]="<color=#acae16>Combo</color>:闪烁法师对<color=#3cff28>诅咒</color>敌人额外造成<color=#3cff28>50%</color>伤害。" ["desc"]="<color=#acae16>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成<color=#3cff28>50%</color>伤害。"
}, },
[5400203]={ [5400203]={
["desc"]="脉动反击增加技能的能量扩充到<color=#3cff28>4</color>点。" ["desc"]="幻影连击释放后将为团队附加<color=#3cff28>反击</color>效果，<color=#3cff28>2</color>回合。"
}, },
[5400204]={ [5400204]={
["desc"]="脉动反击附加的<color=#3cff28>反击</color>效果，回合数<color=#3cff28>+1</color>。" ["desc"]="闪烁法师攻击提升<color=#3cff28>15%</color>。"
}, },
[5400205]={ [5400205]={
["desc"]="闪烁法师造成伤害时有<color=#3cff28>10%</color>概率附加<color=#3cff28>中毒</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="闪烁法师的普攻和反击伤害有<color=#3cff28>10%</color>概率附加<color=#3cff28>中毒</color>效果，<color=#3cff28>2</color>回合。"
}, },
[5400206]={ [5400206]={
["desc"]="闪烁攻击提升<color=#3cff28>15%</color>。" ["desc"]="幻影连击附加的<color=#3cff28>反击</color>效果，回合数<color=#3cff28>+1</color>。"
}, },
[5400207]={ [5400207]={
["desc"]="<color=#acae16>Combo</color>:闪烁法师对<color=#3cff28>诅咒</color>敌人额外造成<color=#3cff28>100%</color>伤害。" ["desc"]="<color=#acae16>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成伤害提高至<color=#3cff28>100%</color>。"
} }
} }
local config = { local config = {

10
lua/app/ui/dungeon/dungeon_difficulty_ui.lua
View File

@ -38,7 +38,6 @@ function DungeonDifficultyUI:onLoadRootComplete()
self.txLevel = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.tx_level"] self.txLevel = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.tx_level"]
self.arrowLeft = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_left"] self.arrowLeft = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_left"]
self.arrowRight = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_right"] self.arrowRight = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_right"]
self.txDesc = self.uiMap["dungeon_difficulty_ui.bg.tx_desc"]
self.txTitle = self.uiMap["dungeon_difficulty_ui.bg.title.title_text"] self.txTitle = self.uiMap["dungeon_difficulty_ui.bg.title.title_text"]
self.buffObj = self.uiMap["dungeon_difficulty_ui.bg.boss_buff"] self.buffObj = self.uiMap["dungeon_difficulty_ui.bg.boss_buff"]
self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"] self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"]
@ -120,24 +119,17 @@ function DungeonDifficultyUI:refreshDifficulty()
self.btnSweep:setActive(self:isCanSweepId()) self.btnSweep:setActive(self:isCanSweepId())
self.txLevel:setText(tostring(self.curId)) self.txLevel:setText(tostring(self.curId))
-- buff or desc -- buff
local buff = DataManager.DungeonData:getBossBuff(self.module, self.curId) local buff = DataManager.DungeonData:getBossBuff(self.module, self.curId)
local desc = DataManager.DungeonData:getRule(self.module)
if buff then if buff then
local cfg = ConfigManager:getConfigWithOtherKey("buff", "name")[buff.type] local cfg = ConfigManager:getConfigWithOtherKey("buff", "name")[buff.type]
self.txDesc:setActive(false)
self.buffObj:setActive(true) self.buffObj:setActive(true)
self.txbuff:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_DESC)) self.txbuff:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_DESC))
self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, cfg.icon) self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, cfg.icon)
self.iconBuff:addClickListener(function() self.iconBuff:addClickListener(function()
ModuleManager.TipsManager:showDescTips(GFunc.getBuffDesc(buff.type, buff.num), self.iconBuff) ModuleManager.TipsManager:showDescTips(GFunc.getBuffDesc(buff.type, buff.num), self.iconBuff)
end) end)
elseif desc then
self.txDesc:setActive(true)
self.buffObj:setActive(false)
self.txDesc:setText(desc)
else else
self.txDesc:setActive(false)
self.buffObj:setActive(false) self.buffObj:setActive(false)
end end

4
lua/app/userdata/dungeon/dungeon_base_entity.lua
View File

@ -26,12 +26,12 @@ function DungeonBaseEntity:getTitleString()
return nil return nil
end end
-- 获取副本规则描述(金币副本) -- 获取副本规则描述
function DungeonBaseEntity:getRuleString() function DungeonBaseEntity:getRuleString()
return nil return nil
end end
-- 获取副本boss抗性(碎片副本) -- 获取副本boss抗性
function DungeonBaseEntity:getBossBuff(id) function DungeonBaseEntity:getBossBuff(id)
return nil return nil
end end

4
lua/app/userdata/dungeon/dungeon_gold_entity.lua
View File

@ -48,6 +48,10 @@ function DungeonGoldEntity:getOpenWeekString()
return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_OPEN) return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_GOLD_OPEN)
end end
function DungeonGoldEntity:getBossBuff(id)
return self:getConfig()[id].effect[1]
end
function DungeonGoldEntity:getIcon() function DungeonGoldEntity:getIcon()
if self.dungeonIcon == nil then if self.dungeonIcon == nil then
self.dungeonIcon = {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_1"} self.dungeonIcon = {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_1"}