This commit is contained in:
chenxi 2023-05-18 20:24:04 +08:00
parent 88631429fe
commit a783d2120c
12 changed files with 1002 additions and 117 deletions

View File

@ -67,14 +67,16 @@ BIReport.ITEM_GET_TYPE = {
BOUNTY_UNLOCK_LEVEL = "BountyUnlockLevel",
BOUNTY_REWARD = "BountyReward",
BOUNTY = "Bounty",
IDLE_DROP = "IdleDrop"
IDLE_DROP = "IdleDrop",
IDLE_QUICK_DROP = "IdleQuickDrop",
}
BIReport.ADS_CLICK_TYPE = {
BATTLE_SKILL_REFRESH = "BattleSkillRefresh",
AD_ENERGY = "AdEnergy",
TASK_DAILY_REFRESH = "TaskDailyRefresh",
TASK_DAILY_TASK = "TaskDailyTask"
TASK_DAILY_TASK = "TaskDailyTask",
IDLE_QUICK_DROP = "IdleQuickDrop",
}
BIReport.FIGHT_OPT_TYPE = {

View File

@ -236,7 +236,6 @@ local buff = {
[33]={
["name"]="stun",
["buff_type"]=8,
["stack"]=2,
["decr"]=2,
["icon"]="stun",
["control_priority"]=2,
@ -500,6 +499,12 @@ local buff = {
["fx_disappear"]={
14
}
},
[74]={
["name"]="remove_skill",
["buff_type"]=7,
["stack"]=2,
["decr"]=3
}
}
local keys = {
@ -576,12 +581,13 @@ local keys = {
["be_sucked"]=buff[70],
["be_dmg_to_heal"]=buff[71],
["death_summon"]=buff[72],
["shield_rebound_400"]=buff[73]
["shield_rebound_400"]=buff[73],
["remove_skill"]=buff[74]
}
}
local config = {
data=buff,
keys=keys,
count=73
count=74
}
return config

View File

@ -125,14 +125,14 @@ local hero = {
1300213
},
["base_skill"]=1300220,
["rouge_skill"]=1300100,
["rouge_skill_1"]=1300101,
["rouge_skill_2"]=1300102,
["rouge_skill_3"]=1300103,
["rouge_skill_4"]=1300104,
["rouge_skill_5"]=1300105,
["rouge_skill_6"]=1300106,
["rouge_skill_7"]=1300107,
["rouge_skill"]=1300200,
["rouge_skill_1"]=1300201,
["rouge_skill_2"]=1300202,
["rouge_skill_3"]=1300203,
["rouge_skill_4"]=1300204,
["rouge_skill_5"]=1300205,
["rouge_skill_6"]=1300206,
["rouge_skill_7"]=1300207,
["begin_lv"]=3,
["hp"]={
2000000,
@ -183,14 +183,14 @@ local hero = {
1400113
},
["base_skill"]=1400120,
["rouge_skill"]=1300100,
["rouge_skill_1"]=1300101,
["rouge_skill_2"]=1300102,
["rouge_skill_3"]=1300103,
["rouge_skill_4"]=1300104,
["rouge_skill_5"]=1300105,
["rouge_skill_6"]=1300106,
["rouge_skill_7"]=1300107,
["rouge_skill"]=1400100,
["rouge_skill_1"]=1400101,
["rouge_skill_2"]=1400102,
["rouge_skill_3"]=1400103,
["rouge_skill_4"]=1400104,
["rouge_skill_5"]=1400105,
["rouge_skill_6"]=1400106,
["rouge_skill_7"]=1400107,
["begin_lv"]=5,
["hp"]={
2000000,

View File

@ -206,6 +206,7 @@ local skill = {
["fx_target_delay"]=900
},
[1200121]={
["position"]=1,
["effect_type"]=2,
["trigger"]=3,
["effect"]={
@ -220,6 +221,7 @@ local skill = {
["skill_position"]=1
},
[1200122]={
["position"]=1,
["effect_type"]=2,
["trigger"]=3,
["effect"]={
@ -328,7 +330,7 @@ local skill = {
["fx_target_delay"]=333
},
[1300120]={
["energy"]=2,
["energy"]=10,
["link"]=1,
["position"]=1,
["method"]=1,
@ -363,8 +365,8 @@ local skill = {
},
["block_time"]={
360,
390,
1210
1360,
2500
},
["skill_position"]=1,
["shake_time"]=200,
@ -376,6 +378,7 @@ local skill = {
["fx_target_delay"]=900
},
[1300121]={
["position"]=1,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
@ -390,7 +393,7 @@ local skill = {
},
[1300122]={
["position"]=1,
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -400,7 +403,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -416,7 +419,7 @@ local skill = {
["round"]=1
}
},
["obj"]=5
["obj"]=1
},
[1300123]={
["energy"]=10,
@ -454,8 +457,8 @@ local skill = {
},
["block_time"]={
360,
390,
1210
1360,
2500
},
["skill_position"]=1,
["shake_time"]=200,
@ -467,6 +470,7 @@ local skill = {
["fx_target_delay"]=900
},
[1300124]={
["position"]=1,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
@ -480,6 +484,7 @@ local skill = {
["obj"]=2
},
[1300125]={
["position"]=1,
["effect_type"]=2,
["trigger"]=9,
["effect"]={
@ -492,6 +497,34 @@ local skill = {
},
["obj"]=1
},
[1300126]={
["position"]=1,
["effect_type"]=2,
["trigger"]=3,
["effect"]={
{
["type"]="dmg_addition_all_add",
["num"]=3000,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=1
},
[1300127]={
["position"]=1,
["effect_type"]=2,
["trigger"]=3,
["effect"]={
{
["type"]="dmg_addition_all_add",
["num"]=3000,
["ratio"]=10000,
["round"]=3
}
},
["obj"]=1
},
[1300210]={
["position"]=1,
["effect_type"]=1,
@ -596,6 +629,118 @@ local skill = {
["range"]=2
}
},
["battle_icon"]="5",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt_red",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=5000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=20000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="burn",
["num"]=5000,
["ratio"]=5000,
["round"]=2
}
},
["obj"]=2,
["effect_block"]={
1,
2,
3,
4,
6
},
["block_time"]={
760,
1010,
1260,
1510,
1810
},
["skill_position"]=1,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=1200114,
["name_act"]="skill01",
["fx_self"]=300020,
["fx_target"]=2,
["fx_target_delay"]=333
},
[1300221]={
["position"]=1,
["buff_condition"]={
{
{
["type"]="state",
["attr"]="imprison",
["op"]=">",
["v"]=0
}
}
},
["condition_rel"]={
{
1,
1
}
},
["effect_type"]=2,
["trigger"]=7,
["effect"]={
{
["type"]="dmg_addition_red_add",
["num"]=2000,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=1
},
[1300222]={
["energy"]=10,
["link"]=1,
["position"]=1,
["method"]=2,
["skill_type"]=4,
["boardrange"]={
{
["type"]=1,
["range"]=2
},
{
["type"]=2,
["range"]=2
}
},
["battle_icon"]="5",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
@ -753,15 +898,23 @@ local skill = {
["link"]=1,
["position"]=1,
["method"]=2,
["skill_type"]=4,
["skill_type"]=2,
["boardrange"]={
{
["type"]=1,
["range"]=1
},
{
["type"]=2,
["range"]=1
},
{
["type"]=3,
["range"]=2
["range"]=1
},
{
["type"]=4,
["range"]=2
["range"]=1
}
},
["battle_icon"]="5",
@ -770,12 +923,26 @@ local skill = {
["effect"]={
{
["type"]="hurt_red",
["num"]=10000,
["num"]=20000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=40000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["effect_block"]={
1,
2
},
["block_time"]={
250,
1400
},
["skill_position"]=1,
["shake_time"]=200,
["shake_type"]=5,
@ -785,6 +952,99 @@ local skill = {
["fx_target"]=2,
["fx_target_delay"]=900
},
[1400121]={
["position"]=1,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="burn",
["num"]=5000,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=2
},
[1400122]={
["position"]=1,
["buff_condition"]={
{
{
["type"]="state",
["attr"]="stun",
["op"]=">",
["v"]=0
}
}
},
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="stun",
["num"]=0,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=2
},
[1400123]={
["position"]=1,
["buff_condition"]={
{
{
["type"]="state",
["attr"]="bleed",
["op"]=">",
["v"]=0
}
}
},
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="hurt_red",
["num"]=30000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2
},
[1400124]={
["position"]=1,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="stun",
["num"]=0,
["ratio"]=5000,
["round"]=2
}
},
["obj"]=2
},
[1400125]={
["position"]=1,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="burn",
["num"]=10000,
["ratio"]=10000,
["round"]=3
}
},
["obj"]=2
},
[1400126]={
["position"]=1
},
[2200110]={
["position"]=2,
["effect_type"]=1,
@ -910,7 +1170,7 @@ local skill = {
},
[2200121]={
["position"]=2,
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -920,7 +1180,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -936,7 +1196,7 @@ local skill = {
["round"]=1
}
},
["obj"]=4,
["obj"]=1,
["skill_position"]=2
},
[2200122]={
@ -951,7 +1211,7 @@ local skill = {
["round"]=1
}
},
["obj"]=4,
["obj"]=1,
["skill_position"]=2
},
[2300110]={
@ -1180,7 +1440,7 @@ local skill = {
}
},
[2300123]={
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -1190,7 +1450,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -1232,10 +1492,10 @@ local skill = {
["round"]=999
}
},
["obj"]=4
["obj"]=1
},
[2300126]={
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -1245,7 +1505,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -1377,7 +1637,7 @@ local skill = {
}
},
[2400121]={
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -1387,7 +1647,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -1396,6 +1656,12 @@ local skill = {
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="hurt_yellow",
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="stun",
["num"]=0,
@ -1406,7 +1672,7 @@ local skill = {
["obj"]=2
},
[2400122]={
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -1416,7 +1682,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -1425,6 +1691,12 @@ local skill = {
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="hurt_yellow",
["num"]=30000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="stun",
["num"]=0,
@ -1434,6 +1706,84 @@ local skill = {
},
["obj"]=2
},
[2400123]={
["energy"]=10,
["link"]=1,
["position"]=2,
["method"]=2,
["skill_type"]=4,
["boardrange"]={
},
["battle_icon"]="7",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt_yellow",
["num"]=63400,
["ratio"]=10000,
["round"]=0
},
{
["type"]="imprison",
["num"]=0,
["ratio"]=5000,
["round"]=2
}
},
["obj"]=2,
["skill_position"]=2,
["shake_time"]=200,
["shake_type"]=6,
["sound_hit"]=2300120,
["name_act"]="skill01",
["fx_self"]=300034,
["bullet_time"]={
2033,
3000,
400
}
},
[2400124]={
["energy"]=10,
["link"]=1,
["position"]=2,
["method"]=2,
["skill_type"]=4,
["boardrange"]={
},
["battle_icon"]="7",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt_yellow",
["num"]=63400,
["ratio"]=10000,
["round"]=0
},
{
["type"]="imprison",
["num"]=0,
["ratio"]=7000,
["round"]=2
}
},
["obj"]=2,
["skill_position"]=2,
["shake_time"]=200,
["shake_type"]=6,
["sound_hit"]=2300120,
["name_act"]="skill01",
["fx_self"]=300034,
["bullet_time"]={
2033,
3000,
400
}
},
[3200110]={
["position"]=3,
["effect_type"]=1,
@ -1573,7 +1923,7 @@ local skill = {
},
[3200122]={
["position"]=3,
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -1583,7 +1933,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -1599,7 +1949,7 @@ local skill = {
["round"]=1
}
},
["obj"]=5
["obj"]=1
},
[3200123]={
["position"]=3,
@ -1763,6 +2113,34 @@ local skill = {
},
["obj"]=1
},
[3300123]={
["position"]=3,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="skill_hurt_add",
["num"]=1500,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=1
},
[3300124]={
["position"]=3,
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="skill_hurt_add",
["num"]=1500,
["ratio"]=10000,
["round"]=3
}
},
["obj"]=1
},
[4200110]={
["position"]=4,
["effect_type"]=1,
@ -1890,7 +2268,7 @@ local skill = {
},
[4200122]={
["position"]=4,
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -1900,7 +2278,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -1920,7 +2298,7 @@ local skill = {
},
[4200123]={
["position"]=4,
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -1930,7 +2308,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -2074,7 +2452,7 @@ local skill = {
}
},
[4400121]={
["buff_trigger"]={
["buff_condition"]={
{
{
["type"]="state",
@ -2084,7 +2462,7 @@ local skill = {
}
}
},
["trigger_rel"]={
["condition_rel"]={
{
1,
1
@ -2100,7 +2478,7 @@ local skill = {
["round"]=1
}
},
["obj"]=6
["obj"]=1
},
[4400122]={
["effect_type"]=2,
@ -3923,6 +4301,6 @@ local skill = {
}
}
local config = {
data=skill,count=189
data=skill,count=203
}
return config

View File

@ -781,6 +781,12 @@ local skill_rogue = {
},
["skill_position"]=1,
["effect"]={
{
["type"]="remove_skill",
["num"]=1200121,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=1200122,
@ -813,6 +819,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=3,
["icon"]="43"
},
[1300102]={
@ -829,6 +836,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=3,
["icon"]="44"
},
[1300103]={
@ -850,6 +858,12 @@ local skill_rogue = {
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="remove_skill",
["num"]=1300121,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=1300124,
@ -857,6 +871,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=3,
["icon"]="43"
},
[1300105]={
@ -870,12 +885,13 @@ local skill_rogue = {
["skill_position"]=1,
["effect"]={
{
["type"]="dmg_addition_all_add",
["num"]=3000,
["type"]="add_skill",
["num"]=1300126,
["ratio"]=10000,
["round"]=2
["round"]=1
}
},
["obj"]=8,
["icon"]="45"
},
[1300106]={
@ -890,12 +906,19 @@ local skill_rogue = {
["skill_position"]=1,
["effect"]={
{
["type"]="dmg_addition_all_add",
["num"]=3000,
["type"]="remove_skill",
["num"]=1300126,
["ratio"]=10000,
["round"]=3
["round"]=1
},
{
["type"]="add_skill",
["num"]=1300127,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=8,
["icon"]="45"
},
[1300107]={
@ -912,6 +935,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=3,
["icon"]="45"
},
[1300200]={
@ -921,6 +945,258 @@ local skill_rogue = {
["type"]=6,
["skill_position"]=1
},
[1300201]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=2,
["skill_position"]=1,
["boardrange"]={
{
["type"]=3,
["range"]=2
},
{
["type"]=4,
["range"]=2
}
},
["icon"]="36"
},
[1300202]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="add_skill",
["num"]=1300221,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="44"
},
[1300203]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=1,
["parameter"]={
1300222
},
["skill_position"]=1,
["icon"]="36"
},
[1300204]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=2,
["skill_position"]=1,
["boardrange"]={
{
["type"]=1,
["range"]=1
},
{
["type"]=2,
["range"]=1
}
},
["icon"]="36"
},
[1300205]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=7,
["parameter"]={
6,
5000
},
["skill_position"]=1,
["icon"]="36"
},
[1300206]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=9,
["skill_position"]=1,
["effect"]={
{
["type"]="atkp_red_add",
["num"]=1500,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=3,
["icon"]="45"
},
[1300207]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="skill_fire_times",
["num"]=1300220,
["ratio"]=10000,
["round"]=1
},
{
["type"]="skill_fire_times",
["num"]=1300222,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="36"
},
[1400100]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=6,
["skill_position"]=1
},
[1400101]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="add_skill",
["num"]=1400121,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="36"
},
[1400102]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="add_skill",
["num"]=1400122,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="45"
},
[1400103]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="add_skill",
["num"]=1400123,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="36"
},
[1400104]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="add_skill",
["num"]=1400124,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="45"
},
[1400105]={
["unlock"]=1400101,
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=12,
["skill_position"]=1,
["effect"]={
{
["type"]="remove_skill",
["num"]=1400122,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=1400125,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="36"
},
[1400106]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=9,
["skill_position"]=1,
["effect"]={
{
["type"]="atkp_red_add",
["num"]=1500,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=3,
["icon"]="45"
},
[1400107]={
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=15,
["parameter"]={
4
},
["skill_position"]=1,
["effect"]={
{
["type"]="add_skill",
["num"]=1400126,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=3,
["icon"]="36"
},
[2200100]={
["limit_times"]=1,
["weight"]=30000,
@ -1122,6 +1398,12 @@ local skill_rogue = {
["type"]=12,
["skill_position"]=2,
["effect"]={
{
["type"]="remove_skill",
["num"]=2400121,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=2300124,
@ -1157,6 +1439,12 @@ local skill_rogue = {
["type"]=12,
["skill_position"]=2,
["effect"]={
{
["type"]="remove_skill",
["num"]=2300123,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=2300126,
@ -1236,12 +1524,19 @@ local skill_rogue = {
["icon"]="50"
},
[2400103]={
["unlock"]=2400102,
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=12,
["skill_position"]=2,
["effect"]={
{
["type"]="remove_skill",
["num"]=2400121,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=2400122,
@ -1273,23 +1568,11 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=1000,
["qlt"]=4,
["type"]=12,
["skill_position"]=2,
["effect"]={
{
["type"]="hurt_yellow",
["num"]=33400,
["ratio"]=10000,
["round"]=0
},
{
["type"]="imprison",
["num"]=0,
["ratio"]=5000,
["round"]=2
}
["type"]=1,
["parameter"]={
2400123
},
["obj"]=2,
["skill_position"]=2,
["icon"]="49"
},
[2400106]={
@ -1297,23 +1580,11 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=1000,
["qlt"]=3,
["type"]=12,
["skill_position"]=2,
["effect"]={
{
["type"]="hurt_yellow",
["num"]=33400,
["ratio"]=10000,
["round"]=0
},
{
["type"]="imprison",
["num"]=0,
["ratio"]=10000,
["round"]=2
}
["type"]=1,
["parameter"]={
2400124
},
["obj"]=2,
["skill_position"]=2,
["icon"]="50"
},
[2400107]={
@ -1447,6 +1718,12 @@ local skill_rogue = {
["type"]=12,
["skill_position"]=3,
["effect"]={
{
["type"]="remove_skill",
["num"]=3200123,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=3200124,
@ -1541,14 +1818,14 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=9,
["type"]=12,
["skill_position"]=3,
["effect"]={
{
["type"]="skill_hurt_add",
["num"]=5000,
["type"]="add_skill",
["num"]=3300123,
["ratio"]=10000,
["round"]=2
["round"]=1
}
},
["obj"]=8,
@ -1576,14 +1853,20 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=2,
["type"]=9,
["type"]=12,
["skill_position"]=3,
["effect"]={
{
["type"]="skill_hurt_add",
["num"]=5000,
["type"]="remove_skill",
["num"]=3300123,
["ratio"]=10000,
["round"]=3
["round"]=1
},
{
["type"]="add_skill",
["num"]=3300124,
["ratio"]=10000,
["round"]=1
}
},
["obj"]=8,
@ -1721,6 +2004,12 @@ local skill_rogue = {
["type"]=12,
["skill_position"]=4,
["effect"]={
{
["type"]="remove_skill",
["num"]=4200122,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=4200123,
@ -1836,6 +2125,12 @@ local skill_rogue = {
["type"]=12,
["skill_position"]=4,
["effect"]={
{
["type"]="remove_skill",
["num"]=4400122,
["ratio"]=10000,
["round"]=1
},
{
["type"]="add_skill",
["num"]=4400123,
@ -1963,6 +2258,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=125
data=skill_rogue,count=140
}
return config

View File

@ -29,7 +29,7 @@ local struct = {
["parameter2"]="minnum:int",
["parameter3"]="maxnum:int"
},
["trigger"]={
["condition"]={
["parameter1"]="type:string",
["parameter2"]="attr:string",
["parameter3"]="op:string",

View File

@ -578,7 +578,7 @@ function GFunc.showItemNotEnough(itemId)
end
end
function GFunc.checkCost(id, num, showToast, giftType)
function GFunc.checkCost(id, num, showToast)
if num <= 0 then
return true
end

View File

@ -32,8 +32,35 @@ function IdleManager:onGetIdleRewrad(result)
end
end
function IdleManager:getHangUpQuickRewrad()
function IdleManager:getIdleQuickRewrad(isAd)
if isAd then
SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.IDLE_QUICK_DROP, function ()
local args = {
ad = true
}
self:sendMessage(ProtoMsgType.FromMsgEnum.IdleQuickReq, args, {}, self.onGetIdleQuickRewrad, BIReport.ITEM_GET_TYPE.IDLE_QUICK_DROP)
end)
else
local cost = DataManager.IdleData:getQuickIdleCost()
local costId = GFunc.getRewardId(cost)
local costNum = GFunc.getRewardNum(cost)
if not GFunc.checkCost(costId, costNum, true) then
return
end
local args = {
ad = false
}
self:sendMessage(ProtoMsgType.FromMsgEnum.IdleQuickReq, args, {}, self.onGetIdleQuickRewrad, BIReport.ITEM_GET_TYPE.IDLE_QUICK_DROP)
end
end
function IdleManager:onGetIdleQuickRewrad(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
if result.rewards then
GFunc.showRewardBox(result.rewards)
end
DataManager.IdleData:onGetIdleQuickRewrad(result)
end
end
return IdleManager

View File

@ -3,7 +3,9 @@ local ItemConst = {}
ItemConst.ITEM_ID_GOLD = 1
ItemConst.ITEM_ID_GEM = 2
ItemConst.ITEM_ID_VIT = 3
ItemConst.ITEM_ID_HERO_FRAGMENT_2 = 4
ItemConst.ITEM_ID_BOUNTY_EXP = 7
ItemConst.ITEM_ID_EXP = 12
ItemConst.ITEM_TYPE = {
RES = 1,

View File

@ -14,6 +14,18 @@ function IdleDropUI:ctor()
self.canRefreshReward = false
end
function IdleDropUI:onCover()
if self.cdSid then
self:pauseScheduleGlobal(self.cdSid)
end
end
function IdleDropUI:onReshow()
if self.cdSid then
self:resumeScheduleGlobal(self.cdSid)
end
end
function IdleDropUI:onLoadRootComplete()
local uiMap = self.root:genAllChildren()
self.uiMap = uiMap
@ -45,7 +57,7 @@ function IdleDropUI:onLoadRootComplete()
self:initRewards()
self:bindData()
self:refreshCD()
self:scheduleGlobal(function()
self.cdSid = self:scheduleGlobal(function()
self:refreshCD()
end, 1)
end
@ -118,7 +130,7 @@ function IdleDropUI:refreshBtns()
self.getBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2")
self.getBtn:setTouchEnable(false)
end
local quickTimes = DataManager.IdleData:getQuickIdleTimes()
local quickTimes = DataManager.IdleData:getQuickIdleRemainTimes()
if quickTimes > 0 then
self.quickBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_2")
self.quickBtn:setTouchEnable(true)

View File

@ -10,6 +10,30 @@ end
function IdleQuickDropUI:ctor()
self.rewardList = {}
local rewards = DataManager.IdleData:getIdleQuickDropPreviewRewards()
for _, item in pairs(rewards) do
if item.num > 0 then
table.insert(self.rewardList, item)
end
end
if #self.rewardList > 1 then
local cfg = ConfigManager:getConfig("item")
local infoA
local infoB
table.sort(self.rewardList, function(a, b)
infoA = cfg[a.id]
infoB = cfg[b.id]
if infoA.type == infoB.type then
if infoA.qlt == infoB.qlt then
return infoA.qlt > infoB.qlt
else
return a.id < b.id
end
else
return infoA.type < infoB.type
end
end)
end
end
function IdleQuickDropUI:onLoadRootComplete()
@ -23,6 +47,7 @@ function IdleQuickDropUI:onLoadRootComplete()
self:initRewards()
self:initBtns()
self:bindData()
end
function IdleQuickDropUI:initRewards()
@ -31,22 +56,85 @@ function IdleQuickDropUI:initRewards()
return GConst.TYPEOF_LUA_CLASS.REWARD_CELL
end)
self.scrollRect:addRefreshCallback(function(index, cell)
-- cell:refreshByConfig(self.list[index])
cell:refreshByConfig(self.rewardList[index])
end)
self.scrollRect:clearCells()
self.scrollRect:refillCells(#self.rewardList)
end
function IdleQuickDropUI:initBtns()
self.uiMap["idle_quick_drop_ui.bg.ad_btn"]:addClickListener(function()
self.adBtn = self.uiMap["idle_quick_drop_ui.bg.ad_btn"]
self.adBtn:addClickListener(function()
ModuleManager.IdleManager:getIdleQuickRewrad(true)
end)
self.uiMap["idle_quick_drop_ui.bg.ad_btn.text"]:setText("临时文本:免费")
self.uiMap["idle_quick_drop_ui.bg.gem_btn"]:addClickListener(function()
self.itemBtn = self.uiMap["idle_quick_drop_ui.bg.item_btn"]
self.itemBtn:addClickListener(function()
ModuleManager.IdleManager:getIdleQuickRewrad(false)
end)
local gemBtnIcon = self.uiMap["idle_quick_drop_ui.bg.gem_btn.icon"]
local gemBtnTx = self.uiMap["idle_quick_drop_ui.bg.gem_btn.text"]
gemBtnTx:setText("50")
GFunc.centerImgAndTx(gemBtnIcon, gemBtnTx)
local cost = DataManager.IdleData:getQuickIdleCost()
local itemBtnIcon = self.uiMap["idle_quick_drop_ui.bg.item_btn.icon"]
local itemBtnTx = self.uiMap["idle_quick_drop_ui.bg.item_btn.text"]
local iconName = ConfigManager:getConfig("item")[cost.id].icon
itemBtnIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, iconName)
itemBtnTx:setText(tostring(cost.num))
GFunc.centerImgAndTx(itemBtnIcon, itemBtnTx)
self.descTx2 = self.uiMap["idle_quick_drop_ui.bg.desc_tx_2"]
self.descTx3 = self.uiMap["idle_quick_drop_ui.bg.desc_tx_3"]
end
function IdleQuickDropUI:bindData()
self:bind(DataManager.IdleData, "adCount", function()
self:onRefresh()
end)
self:bind(DataManager.IdleData, "energyCount", function()
self:onRefresh()
end)
local cost = DataManager.IdleData:getQuickIdleCost()
local costId = GFunc.getRewardId(cost)
local itemEntity = DataManager.BagData.ItemData:getItemById(costId)
if itemEntity then
self:bind(itemEntity, "num", function()
self:onRefresh()
end)
end
end
function IdleQuickDropUI:onRefresh()
local adRemainTimes = DataManager.IdleData:getQuickIdleAdRemainTimes()
if adRemainTimes <= 0 then
adRemainTimes = 0
self.adBtn:setTouchEnable(false)
self.adBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2")
self.adBtn:removeRedPoint()
else
self.adBtn:setTouchEnable(true)
self.adBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_2")
self.adBtn:addRedPoint(94, 42, 0.8)
end
self.descTx2:setText(string.format("临时文本:今日剩余%s次", adRemainTimes))
local vitRemainTimes = DataManager.IdleData:getQuickIdleVitRemainTimes()
if vitRemainTimes <= 0 then
vitRemainTimes = 0
self.itemBtn:setTouchEnable(false)
self.itemBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_2")
self.itemBtn:removeRedPoint()
else
self.itemBtn:setTouchEnable(true)
self.itemBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_2")
local cost = DataManager.IdleData:getQuickIdleCost()
local costId = GFunc.getRewardId(cost)
local costNum = GFunc.getRewardNum(cost)
if GFunc.checkCost(costId, costNum) then
self.itemBtn:addRedPoint(94, 42, 0.8)
else
self.itemBtn:removeRedPoint()
end
end
self.descTx3:setText(string.format("临时文本:今日剩余%s次", vitRemainTimes))
end
return IdleQuickDropUI

View File

@ -3,6 +3,7 @@ local IdleData = class("IdleData", BaseData)
function IdleData:ctor()
self.data.dirty = false
self.idleRewardMap = {}
self.idleQuickPreviewRewardMap = {}
end
function IdleData:init(data)
@ -62,6 +63,58 @@ function IdleData:onGetIdleRewrad(time)
self:markDirty()
end
function IdleData:onGetIdleQuickRewrad(data)
self.data.adCount = data.ad_count or 0
self.data.energyCount = data.energy_count or 0
self:markDirty()
end
function IdleData:getIdleQuickDropPreviewRewards()
for k, v in pairs(self.idleQuickPreviewRewardMap) do
self.idleQuickPreviewRewardMap[k].num = 0
end
local chapterId = DataManager.ChapterData:getMaxChapterId()
local cfg = ConfigManager:getConfig("chapter")[chapterId]
if cfg == nil then
return self.idleQuickPreviewRewardMap
end
local constCfg = ConfigManager:getConfig("const")
local coinPerTime = constCfg.idle_exp_drop_time.value
local expPerTime = constCfg.idle_gold_drop_time.value
local itemPerTime = constCfg.idle_item_drop_time.value
local time = self:getQuickIdleTime()
local itemGold = self.idleQuickPreviewRewardMap[GConst.ItemConst.ITEM_ID_GOLD]
if itemGold == nil then
itemGold = {}
itemGold.id = GConst.ItemConst.ITEM_ID_GOLD
itemGold.type = GConst.REWARD_TYPE.ITEM
self.idleQuickPreviewRewardMap[GConst.ItemConst.ITEM_ID_GOLD] = itemGold
end
itemGold.num = math.floor(cfg.idle_gold * (time // coinPerTime))
local itemExp = self.idleQuickPreviewRewardMap[GConst.ItemConst.ITEM_ID_EXP]
if itemExp == nil then
itemExp = {}
itemExp.id = GConst.ItemConst.ITEM_ID_EXP
itemExp.type = GConst.REWARD_TYPE.ITEM
self.idleQuickPreviewRewardMap[GConst.ItemConst.ITEM_ID_EXP] = itemExp
end
itemExp.num = math.floor(cfg.idle_exp * (time // expPerTime))
local itemCard = self.idleQuickPreviewRewardMap[GConst.ItemConst.ITEM_ID_HERO_FRAGMENT_2]
if itemCard == nil then
itemCard = {}
itemCard.id = GConst.ItemConst.ITEM_ID_HERO_FRAGMENT_2
itemCard.type = GConst.REWARD_TYPE.ITEM
self.idleQuickPreviewRewardMap[GConst.ItemConst.ITEM_ID_HERO_FRAGMENT_2] = itemCard
end
itemCard.num = math.floor((time // itemPerTime))
return self.idleQuickPreviewRewardMap
end
function IdleData:getIsOpen()
return ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.IDLE_DROP, true)
end
@ -106,6 +159,10 @@ function IdleData:getQuickIdleMaxAdTimes()
return self.quickIdleMaxAdTimes
end
function IdleData:getQuickIdleAdRemainTimes()
return self:getQuickIdleMaxAdTimes() - self.data.adCount
end
function IdleData:getQuickIdleMaxVitTimes()
if self.quickIdleMaxVitTimes == nil then
self.quickIdleMaxVitTimes = ConfigManager:getConfig("const")["idle_drop_fast_times_2"].value
@ -113,8 +170,26 @@ function IdleData:getQuickIdleMaxVitTimes()
return self.quickIdleMaxVitTimes
end
function IdleData:getQuickIdleTimes()
function IdleData:getQuickIdleVitRemainTimes()
return self:getQuickIdleMaxVitTimes() - self.data.energyCount
end
function IdleData:getQuickIdleRemainTimes()
return self:getQuickIdleMaxAdTimes() + self:getQuickIdleMaxVitTimes() - self.data.adCount - self.data.energyCount
end
function IdleData:getQuickIdleCost()
if self.quickIdleCost == nil then
self.quickIdleCost = ConfigManager:getConfig("const")["idle_drop_fast_cost"].reward
end
return self.quickIdleCost
end
function IdleData:getQuickIdleTime()
if self.quickIdleTime == nil then
self.quickIdleTime = ConfigManager:getConfig("const")["idle_drop_fast_time"].value
end
return self.quickIdleTime
end
return IdleData