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

新加任务

Browse Source
This commit is contained in:
puxuan 2025-10-07 19:59:53 +08:00
parent d83268f66e
commit 45e600be69
51 changed files with 6443 additions and 4242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lua/app/common/data_manager.lua
View File

@ -121,6 +121,7 @@ function DataManager:initWithServerData(data)
Time:setServerTimeZone(0)
Time:updateServerTime(data.now_ts)
Time:updateServerTimeToday(data.today_ts)
self.loginCount = data.stat and data.stat.login_day_count or 1
if EDITOR_MODE then
Logger.logHighlight("initWithServerData")
@ -323,6 +324,7 @@ function DataManager:scheduleGlobal()
self.crossDayTS = Time:getDayOverTimeStamp()
self.weekOverTime = Time:getWeekOverTimeStamp()
self.monthOverTime = Time:getMonthOverTimeStamp()
self.loginCount = self.loginCount + 1
-- 跨天先刷新活动时间
DataManager.ActTimeData:refreshActTime(true)
Logger.logHighlight("跨天===========================================================================")
@ -471,28 +473,6 @@ function DataManager:clearTryOpenFunc()
end
end
function DataManager:getSignInfo()
local nowTime = Time:getServerTime()
local lastSignTime = self.signInfo.latest_at // 1000
local todayBeginTime = nowTime - nowTime % 86400
local canSign = lastSignTime < todayBeginTime
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SIGNIN) then
canSign = false
end
return self.signInfo.count or 0, canSign, self.hasSigned
end
function DataManager:setSignCount(count)
self.hasSigned = true
self.signInfo.count = count
self.signInfo.latest_at = Time:getServerTime() * 1000
--Logger.logHighlight("签到成功次数："..count)
end
function DataManager:resetSignInInfo()
self.hasSigned = false
end
function DataManager:setLoginSuccess(success)
self.loginSuccess = success
end
@ -501,4 +481,9 @@ function DataManager:getLoginSuccess()
return self.loginSuccess
end
-- 获取登录天数
function DataManager:getLoginCount()
return self.loginCount or 1
end
return DataManager

6
lua/app/config/act_sevenday_quest.lua
View File

@ -324,7 +324,7 @@ local act_sevenday_quest = {
[215]={
["day"]=3,
["type"]=31,
["number"]=2,
["number"]=1000,
["reward"]={
{
["type"]=1,
@ -531,7 +531,7 @@ local act_sevenday_quest = {
[224]={
["day"]=5,
["type"]=31,
["number"]=4,
["number"]=1200,
["reward"]={
{
["type"]=1,
@ -784,7 +784,7 @@ local act_sevenday_quest = {
[235]={
["day"]=7,
["type"]=31,
["number"]=7,
["number"]=1800,
["reward"]={
{
["type"]=1,

4
lua/app/config/buff.lua
View File

@ -328,7 +328,7 @@ local buff = {
["buff_type"]=1,
["stack"]=2,
["decr"]=1,
["icon"]="normal_attack_add",
["icon"]="high",
["show_name"]=true,
["fx_get"]={
30
@ -972,7 +972,7 @@ local buff = {
["buff_type"]=1,
["stack"]=2,
["decr"]=1,
["icon"]="normal_attack_add",
["icon"]="high",
["show_name"]=true,
["fx_get"]={
30

1576
lua/app/config/chapter_daily_challenge.lua
View File

File diff suppressed because it is too large Load Diff

84
lua/app/config/daily_challenge_level.lua
View File

@ -76,10 +76,10 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
@ -100,8 +100,8 @@ local daily_challenge_level = {
}
},
["daily_challenge_difficulty"]={
73333,
8333
272222,
73333
}
},
[2]={
@ -181,10 +181,10 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
@ -205,8 +205,8 @@ local daily_challenge_level = {
}
},
["daily_challenge_difficulty"]={
146667,
24556
335556,
146667
}
},
[3]={
@ -286,10 +286,10 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
@ -310,8 +310,8 @@ local daily_challenge_level = {
}
},
["daily_challenge_difficulty"]={
226667,
34889
438889,
226667
}
},
[4]={
@ -391,10 +391,10 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
@ -415,8 +415,8 @@ local daily_challenge_level = {
}
},
["daily_challenge_difficulty"]={
374444,
46222
552222,
374444
}
},
[5]={
@ -496,10 +496,10 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
@ -520,8 +520,8 @@ local daily_challenge_level = {
}
},
["daily_challenge_difficulty"]={
633333,
55222
642222,
633333
}
},
[6]={
@ -601,10 +601,10 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
@ -625,8 +625,8 @@ local daily_challenge_level = {
}
},
["daily_challenge_difficulty"]={
985556,
64889
738889,
985556
}
},
[7]={
@ -706,10 +706,10 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
@ -730,8 +730,8 @@ local daily_challenge_level = {
}
},
["daily_challenge_difficulty"]={
2140000,
92222
1012222,
2140000
}
}
}

65
lua/app/config/fx.lua
View File

@ -759,34 +759,6 @@ local fx = {
["res"]="sfx_c1_p45001_05",
["bind"]="root"
},
[300074]={
["res"]="sfx_c1_p44001_01",
["bind"]="root"
},
[300075]={
["res"]="sfx_c1_p44001_02",
["bind"]="root"
},
[300076]={
["res"]="sfx_c1_p24001_01",
["bind"]="root"
},
[300077]={
["res"]="sfx_c1_p24001_02",
["bind"]="root"
},
[300078]={
["res"]="sfx_c1_p24001_03",
["bind"]="root"
},
[300079]={
["res"]="sfx_c1_p24001_04",
["bind"]="root"
},
[300080]={
["res"]="sfx_c1_p24001_05",
["bind"]="root"
},
[400001]={
["res"]="sfx_c1_p45002_01",
["bind"]="root",
@ -1121,44 +1093,9 @@ local fx = {
["res"]="sfx_c1_p45001_05",
["bind"]="root",
["flip"]=1
},
[400074]={
["res"]="sfx_c1_p44001_01",
["bind"]="root",
["flip"]=1
},
[400075]={
["res"]="sfx_c1_p44001_02",
["bind"]="root",
["flip"]=1
},
[400076]={
["res"]="sfx_c1_p24001_01",
["bind"]="root",
["flip"]=1
},
[400077]={
["res"]="sfx_c1_p24001_02",
["bind"]="root",
["flip"]=1
},
[400078]={
["res"]="sfx_c1_p24001_03",
["bind"]="root",
["flip"]=1
},
[400079]={
["res"]="sfx_c1_p24001_04",
["bind"]="root",
["flip"]=1
},
[400080]={
["res"]="sfx_c1_p24001_05",
["bind"]="root",
["flip"]=1
}
}
local config = {
data=fx,count=267
data=fx,count=253
}
return config

2530
lua/app/config/monster_chapter.lua
View File

File diff suppressed because it is too large Load Diff

3803
lua/app/config/monster_daily_challenge.lua
View File

File diff suppressed because it is too large Load Diff

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

@ -1030,7 +1030,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1059,7 +1059,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1088,7 +1088,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1117,7 +1117,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1178,7 +1178,7 @@ local skill = {
},
["skill_position"]={
1,
100
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -1784,7 +1784,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1796,6 +1796,7 @@ local skill = {
"suffer02"
},
["fx_self"]=300049,
["fx_target"]=300054,
["fx_self_mirror"]=400049
},
[2300111]={
@ -1813,7 +1814,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1825,6 +1826,7 @@ local skill = {
"suffer02"
},
["fx_self"]=300050,
["fx_target"]=300054,
["fx_self_mirror"]=400050
},
[2300112]={
@ -1842,7 +1844,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1854,6 +1856,7 @@ local skill = {
"suffer01"
},
["fx_self"]=300051,
["fx_target"]=300054,
["fx_self_mirror"]=400051
},
[2300113]={
@ -1871,7 +1874,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -1883,6 +1886,7 @@ local skill = {
"suffer01"
},
["fx_self"]=300052,
["fx_target"]=300054,
["fx_self_mirror"]=400052
},
[2300120]={
@ -1908,7 +1912,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -1919,6 +1923,7 @@ local skill = {
"suffer03"
},
["fx_self"]=300053,
["fx_target"]=300054,
["bullet_time"]={
891,
3000,
@ -1959,7 +1964,7 @@ local skill = {
["obj"]=1,
["skill_position"]={
1,
100
140
}
},
[2300122]={
@ -1995,7 +2000,7 @@ local skill = {
["obj"]=1,
["skill_position"]={
1,
100
140
}
},
[2300123]={
@ -2031,7 +2036,7 @@ local skill = {
["obj"]=1,
["skill_position"]={
1,
100
140
}
},
[2300124]={
@ -2063,7 +2068,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2074,8 +2079,7 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300076,
["fx_self_mirror"]=400076
["fx_self_mirror"]=100000
},
[2400111]={
["position"]=2,
@ -2092,7 +2096,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2103,8 +2107,7 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300077,
["fx_self_mirror"]=400077
["fx_self_mirror"]=100000
},
[2400112]={
["position"]=2,
@ -2121,7 +2124,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2132,8 +2135,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300078,
["fx_self_mirror"]=400078
["fx_self_mirror"]=100000
},
[2400113]={
["position"]=2,
@ -2150,7 +2152,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2161,8 +2163,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300079,
["fx_self_mirror"]=400079
["fx_self_mirror"]=100000
},
[2400120]={
["energy"]=10,
@ -2187,7 +2188,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -2197,13 +2198,12 @@ local skill = {
["name_hit"]={
"suffer03"
},
["fx_self"]=300080,
["bullet_time"]={
693,
3000,
400
},
["fx_self_mirror"]=400080
["fx_self_mirror"]=100000
},
[2400121]={
["position"]=2,
@ -2355,7 +2355,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2380,7 +2380,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2405,7 +2405,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2430,7 +2430,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -2494,7 +2494,7 @@ local skill = {
},
["skill_position"]={
1,
100
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -3067,7 +3067,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3095,7 +3095,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3123,7 +3123,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3151,7 +3151,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3197,7 +3197,7 @@ local skill = {
},
["skill_position"]={
1,
100
120
},
["shake_time"]=200,
["shake_type"]=5,
@ -3840,7 +3840,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -3868,7 +3868,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -3896,7 +3896,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -3924,7 +3924,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -3984,7 +3984,7 @@ local skill = {
},
["skill_position"]={
1,
120
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -4079,7 +4079,7 @@ local skill = {
["obj"]=1,
["skill_position"]={
1,
120
140
}
},
[3500125]={
@ -4115,7 +4115,7 @@ local skill = {
["obj"]=1,
["skill_position"]={
1,
120
140
}
},
[3500126]={
@ -4151,7 +4151,7 @@ local skill = {
["obj"]=1,
["skill_position"]={
1,
120
140
}
},
[3500127]={
@ -4697,7 +4697,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
}
},
[4300125]={
@ -4733,7 +4733,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
}
},
[4300126]={
@ -4769,7 +4769,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
}
},
[4400110]={
@ -4786,8 +4786,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -4798,8 +4798,7 @@ local skill = {
["name_hit"]={
"suffer01"
},
["fx_self"]=300074,
["fx_self_mirror"]=400074
["fx_self_mirror"]=100000
},
[4400111]={
["position"]=4,
@ -4815,8 +4814,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -4827,8 +4826,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300074,
["fx_self_mirror"]=400074
["fx_self_mirror"]=100000
},
[4400112]={
["position"]=4,
@ -4844,8 +4842,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -4856,8 +4854,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300074,
["fx_self_mirror"]=400074
["fx_self_mirror"]=100000
},
[4400113]={
["position"]=4,
@ -4873,8 +4870,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -4885,8 +4882,7 @@ local skill = {
["name_hit"]={
"suffer02"
},
["fx_self"]=300074,
["fx_self_mirror"]=400074
["fx_self_mirror"]=100000
},
[4400120]={
["energy"]=10,
@ -4910,8 +4906,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -4921,13 +4917,12 @@ local skill = {
["name_hit"]={
"suffer03"
},
["fx_self"]=300075,
["bullet_time"]={
1000,
3000,
400
},
["fx_self_mirror"]=400075
["fx_self_mirror"]=100000
},
[4400121]={
["position"]=4,
@ -5110,7 +5105,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5139,7 +5134,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5168,7 +5163,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5197,7 +5192,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5243,7 +5238,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -5276,7 +5271,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
}
},
[4500122]={
@ -5294,7 +5289,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
}
},
[4500123]={
@ -5312,7 +5307,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
120
140
}
},
[4500124]={
@ -5471,7 +5466,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
80
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5502,7 +5497,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
80
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5533,7 +5528,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
80
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5564,7 +5559,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
80
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5612,7 +5607,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
80
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -5771,7 +5766,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5800,7 +5795,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5829,7 +5824,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -5858,7 +5853,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
100
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -6530,8 +6525,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -6558,8 +6553,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -6586,8 +6581,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -6614,8 +6609,8 @@ local skill = {
},
["obj"]=2,
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=100,
["shake_type"]=1,
@ -6681,8 +6676,8 @@ local skill = {
5
},
["skill_position"]={
2,
0
1,
140
},
["shake_time"]=200,
["shake_type"]=5,
@ -9814,7 +9809,7 @@ local skill = {
["sound_hit"]={
10024
},
["name_act"]="skill02",
["name_act"]="skill01",
["name_hit"]={
"suffer03"
},

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

File diff suppressed because it is too large Load Diff

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

@ -328,6 +328,71 @@ local attr = {
["id"]=66,
["desc"]="全体紫色快递员攻击+{0}%",
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["desc"]="全体攻击",
["name"]="atk_all"
},
[68]={
["id"]=68,
["desc"]="全体生命",
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["desc"]="全体减伤",
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["desc"]="全体暴击率",
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["desc"]="全体暴击伤害",
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["desc"]="全体普攻增伤",
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["desc"]="全体技能增伤",
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["desc"]="全体攻击",
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["desc"]="攻击",
["name"]="attr_atk"
},
[76]={
["id"]=76,
["desc"]="生命",
["name"]="attr_hp"
},
[77]={
["id"]=77,
["desc"]="普攻伤害",
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["desc"]="技能伤害",
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["desc"]="减伤",
["name"]="dmgdec"
}
}
local keys = {
@ -397,12 +462,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

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

@ -240,22 +240,22 @@ local skill_rogue = {
["rougedesc"]="过热小莫技能100%概率附加<color=#3cff28>灼烧</color>2回合"
},
[1400131]={
["desc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%",
["desc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%"
["rougedesc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%"
},
[1400132]={
["desc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%",
["desc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加20%"
["rougedesc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤20%"
},
[1400133]={
["desc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加10%",
["desc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：过热小莫技能对<color=#3cff28>禁锢</color>敌人伤害增加30%"
["rougedesc"]="过热小莫技能combo<color=#3cff28>禁锢</color>增伤30%"
},
[1400141]={
["desc"]="过热小莫攻击提升5%",
@ -276,58 +276,58 @@ local skill_rogue = {
["rougedesc"]="过热小莫攻击提升15%"
},
[1500111]={
["desc"]="火花姬周围变色元素+2",
["desc"]="火花姬周围变色元素+2;",
["entry_1"]="变色元素+2",
["entry_2"]="变色元素+2",
["rougedesc"]="火花姬周围变色元素+2"
["rougedesc"]="火花姬周围变色元素+2;"
},
[1500112]={
["desc"]="火花姬周围变色元素+2",
["desc"]="火花姬周围变色元素+2;",
["entry_1"]="变色元素+2",
["entry_2"]="变色元素+2",
["rougedesc"]="火花姬周围变色元素+4"
["rougedesc"]="火花姬周围变色元素+4;"
},
[1500113]={
["desc"]="火花姬周围变色元素+2",
["desc"]="火花姬周围变色元素+2;",
["entry_1"]="变色元素+2",
["entry_2"]="变色元素+2",
["rougedesc"]="火花姬周围变色元素+6"
["rougedesc"]="火花姬周围变色元素+6;"
},
[1500121]={
["desc"]="火花姬技能附加1回合自愈效果",
["desc"]="火花姬技能附加1回合自愈效果；",
["entry_1"]="治愈回合提升至2",
["entry_2"]="治愈回合提升至3",
["rougedesc"]="火花姬技能附加1回合自愈效果"
["rougedesc"]="火花姬技能附加1回合自愈效果；"
},
[1500122]={
["desc"]="火花姬技能附加1回合自愈效果",
["desc"]="火花姬技能附加1回合自愈效果；",
["entry_1"]="治愈回合提升至2",
["entry_2"]="治愈回合提升至3",
["rougedesc"]="火花姬技能附加2回合自愈效果"
["rougedesc"]="火花姬技能附加2回合自愈效果；"
},
[1500123]={
["desc"]="火花姬技能附加1回合自愈效果",
["desc"]="火花姬技能附加1回合自愈效果；",
["entry_1"]="治愈回合提升至2",
["entry_2"]="治愈回合提升至3",
["rougedesc"]="火花姬技能附加3回合自愈效果"
["rougedesc"]="火花姬技能附加3回合自愈效果；"
},
[1500131]={
["desc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%",
["desc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%"
["rougedesc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%"
},
[1500132]={
["desc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%",
["desc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加20%"
["rougedesc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤20%"
},
[1500133]={
["desc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加10%",
["desc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：火花姬普攻对<color=#3cff28>流血</color>敌人伤害增加30%"
["rougedesc"]="火花姬普攻combo<color=#3cff28>流血</color>增伤30%"
},
[1500141]={
["desc"]="火花姬攻击提升5%",
@ -420,22 +420,22 @@ local skill_rogue = {
["rougedesc"]="废铁老爹攻击提升15%"
},
[1600111]={
["desc"]="血祭修女技能可左右消除2格",
["desc"]="血祭修女技能可左右消除2格；",
["entry_1"]="左右消除增加2格",
["entry_2"]="链接超6个元素可额外释放1次技能攻击效果",
["rougedesc"]="血祭修女技能可左右消除2格"
["rougedesc"]="血祭修女技能可左右消除2格；"
},
[1600112]={
["desc"]="血祭修女技能可左右消除2格",
["desc"]="血祭修女技能可左右消除2格；",
["entry_1"]="左右消除增加2格",
["entry_2"]="链接超6个元素可额外释放1次技能攻击效果",
["rougedesc"]="血祭修女技能可左右消除4格"
["rougedesc"]="血祭修女技能可左右消除4格；"
},
[1600113]={
["desc"]="血祭修女技能可左右消除2格",
["desc"]="血祭修女技能可左右消除2格；",
["entry_1"]="左右消除增加2格",
["entry_2"]="链接超6个元素可额外释放1次技能攻击效果",
["rougedesc"]="血祭修女技能可左右消除4格，技能链接超6个元素可额外释放1次大招"
["rougedesc"]="血祭修女技能可左右消除4格；技能链接超6个元素可额外释放1次大招"
},
[1600121]={
["desc"]="血祭修女技能命中附加<color=#3cff28>灼烧</color>效果2回合",
@ -456,22 +456,22 @@ local skill_rogue = {
["rougedesc"]="血祭修女技能命中附加<color=#3cff28>灼烧</color>效果2回合，队伍附加<color=#3cff28>亢奋</color>效果2回合，如果敌人有<color=#3cff28>灼烧</color>效果则技能伤害增加。"
},
[1600131]={
["desc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%",
["desc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%"
["rougedesc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%"
},
[1600132]={
["desc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%",
["desc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加20%"
["rougedesc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤20%"
},
[1600133]={
["desc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加10%",
["desc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤10%",
["entry_1"]="增伤提升至20%",
["entry_2"]="增伤提升至30%",
["rougedesc"]="Combo：血祭修女普攻对<color=#3cff28>灼烧</color>敌人伤害增加30%"
["rougedesc"]="血祭修女普攻combo<color=#3cff28>灼烧</color>增伤30%"
},
[1600141]={
["desc"]="血祭修女普攻有20%概率直接附加<color=#3cff28>灼烧</color>效果1回合",
@ -599,24 +599,6 @@ local skill_rogue = {
["entry_2"]="暴击伤害提升回合数+1",
["rougedesc"]="平底锅战神技能链接超过4个元素，暴击提升30%，持续2回合"
},
[2400131]={
["desc"]="平底锅战神攻击提升5%",
["entry_1"]="攻击提升至10%",
["entry_2"]="攻击提升至15%",
["rougedesc"]="平底锅战神攻击提升5%"
},
[2400132]={
["desc"]="平底锅战神攻击提升5%",
["entry_1"]="攻击提升至10%",
["entry_2"]="攻击提升至15%",
["rougedesc"]="平底锅战神攻击提升10%"
},
[2400133]={
["desc"]="平底锅战神攻击提升5%",
["entry_1"]="攻击提升至10%",
["entry_2"]="攻击提升至15%",
["rougedesc"]="平底锅战神攻击提升15%"
},
[2400141]={
["desc"]="平底锅战神技能释放时目标生命低于50%则本回合暴击伤害提高50%",
["entry_1"]="暴击伤害提高提升至80%",
@ -671,24 +653,6 @@ local skill_rogue = {
["entry_2"]="禁锢回合数+1",
["rougedesc"]="科技狼人技能命中有70%几率附加<color=#3cff28>禁锢</color>2回合"
},
[2500131]={
["desc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%",
["entry_1"]="30%概率附加眩晕2回合",
["entry_2"]="60%概率附加眩晕2回合",
["rougedesc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%"
},
[2500132]={
["desc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%",
["entry_1"]="30%概率附加眩晕2回合",
["entry_2"]="60%概率附加眩晕2回合",
["rougedesc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%。且有30%几率附加<color=#3cff28>眩晕</color>2回合"
},
[2500133]={
["desc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%",
["entry_1"]="30%概率附加眩晕2回合",
["entry_2"]="60%概率附加眩晕2回合",
["rougedesc"]="Combo：科技狼人技能对<color=#3cff28>冻结</color>敌人伤害增加30%。且有60%几率附加<color=#3cff28>眩晕</color>2回合"
},
[2500141]={
["desc"]="科技狼人攻击提升5%",
["entry_1"]="攻击提升至10%",
@ -867,22 +831,22 @@ local skill_rogue = {
["desc"]="荒野镖客技能可上下消除2格",
["entry_1"]="上下消除增加2格",
["entry_2"]="技能链接时伤害增加15%",
["rougedesc"]="荒野镖客技能可上下消除2格，链接增伤15%"
["rougedesc"]="荒野镖客技能可上下消除2格；链接增伤15%"
},
[3300121]={
["desc"]="荒野镖客技能攻击后可恢复团队一定量生命",
["desc"]="荒野镖客技能攻击后可恢复团队一定量生命。",
["entry_1"]="30%概率附加眩晕1回合",
["entry_2"]="50%概率附眩晕1回合",
["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命"
["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命。"
},
[3300122]={
["desc"]="荒野镖客技能攻击后可恢复团队一定量生命",
["desc"]="荒野镖客技能攻击后可恢复团队一定量生命。",
["entry_1"]="30%概率附加眩晕1回合",
["entry_2"]="50%概率附眩晕1回合",
["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命，30%几率附加<color=#3cff28>眩晕</color>1回合"
["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命。30%几率附加<color=#3cff28>眩晕</color>1回合"
},
[3300123]={
["desc"]="荒野镖客技能攻击后可恢复团队一定量生命",
["desc"]="荒野镖客技能攻击后可恢复团队一定量生命。",
["entry_1"]="30%概率附加眩晕1回合",
["entry_2"]="50%概率附眩晕1回合",
["rougedesc"]="荒野镖客技能攻击后可恢复团队一定量生命。50%几率附加<color=#3cff28>眩晕</color>1回合"
@ -951,13 +915,13 @@ local skill_rogue = {
["desc"]="光合特工技能回血量提升50%",
["entry_1"]="释放后附加技能伤害提升1回合",
["entry_2"]="释放后附加技能伤害提升2回合",
["rougedesc"]="光合特工技能回血量提升50%，技能附加技能伤害提升15%1回合"
["rougedesc"]="光合特工技能回血量提升50%；技能附加技能伤害提升15%1回合"
},
[3400123]={
["desc"]="光合特工技能回血量提升50%",
["entry_1"]="释放后附加技能伤害提升1回合",
["entry_2"]="释放后附加技能伤害提升2回合",
["rougedesc"]="光合特工技能回血量提升50%，技能附加技能伤害提升15%2回合"
["rougedesc"]="光合特工技能回血量提升50%；技能附加技能伤害提升15%2回合"
},
[3400131]={
["desc"]="光合特工技能链接超过5个元素，回血量提升10%",
@ -1083,7 +1047,7 @@ local skill_rogue = {
["desc"]="快递仙人技能可上下消除2格",
["entry_1"]="上下消除增加2格",
["entry_2"]="技能链接时伤害增加10%",
["rougedesc"]="快递仙人技能可上下消除4格，链接增伤10%"
["rougedesc"]="快递仙人技能可上下消除4格；链接增伤10%"
},
[3500221]={
["desc"]="快递仙人技能命中附加<color=#3cff28>易伤</color>1回合",
@ -1140,22 +1104,22 @@ local skill_rogue = {
["rougedesc"]="快递仙人普攻有20%几率附加<color=#3cff28>流血</color>3回合，<color=#3cff28>流血</color>伤害提升"
},
[4300111]={
["desc"]="气泡柴犬技能可随机消除2格",
["desc"]="气泡柴犬技能可随机消除2格.",
["entry_1"]="消除数+2",
["entry_2"]="消除数+2",
["rougedesc"]="气泡柴犬技能可随机消除2格"
["rougedesc"]="气泡柴犬技能可随机消除2格."
},
[4300112]={
["desc"]="气泡柴犬技能可随机消除2格",
["desc"]="气泡柴犬技能可随机消除2格.",
["entry_1"]="消除数+2",
["entry_2"]="消除数+2",
["rougedesc"]="气泡柴犬技能可随机消除4格"
["rougedesc"]="气泡柴犬技能可随机消除4格."
},
[4300113]={
["desc"]="气泡柴犬技能可随机消除2格",
["desc"]="气泡柴犬技能可随机消除2格.",
["entry_1"]="消除数+2",
["entry_2"]="消除数+2",
["rougedesc"]="气泡柴犬技能可随机消除6格"
["rougedesc"]="气泡柴犬技能可随机消除6格."
},
[4300121]={
["desc"]="气泡柴犬技能命中50%几率附加<color=#3cff28>冰霜</color>1回合",
@ -1717,6 +1681,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/de/attr.lua
View File

@ -262,6 +262,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -331,12 +383,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/de/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/en/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/en/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/es/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/es/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/fr/attr.lua
View File

@ -262,6 +262,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -331,12 +383,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/fr/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/id/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/id/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/ja/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/ja/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/ko/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/ko/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/pt/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/pt/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/ru/attr.lua
View File

@ -262,6 +262,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -331,12 +383,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/ru/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/th/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/th/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/vi/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/vi/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

69
lua/app/config/strings/zh/attr.lua
View File

@ -323,6 +323,58 @@ local attr = {
[66]={
["id"]=66,
["name"]="attr_atkp_purple_all"
},
[67]={
["id"]=67,
["name"]="atk_all"
},
[68]={
["id"]=68,
["name"]="attr_hp_all"
},
[69]={
["id"]=69,
["name"]="attr_dmgdec_all"
},
[70]={
["id"]=70,
["name"]="attr_crit_all"
},
[71]={
["id"]=71,
["name"]="attr_crit_time_all"
},
[72]={
["id"]=72,
["name"]="attr_normal_hurtp_all"
},
[73]={
["id"]=73,
["name"]="attr_skill_hurtp_all"
},
[74]={
["id"]=74,
["name"]="attr_atkp_all"
},
[75]={
["id"]=75,
["name"]="attr_atk"
},
[76]={
["id"]=76,
["name"]="attr_hp"
},
[77]={
["id"]=77,
["name"]="attr_normal_hurt"
},
[78]={
["id"]=78,
["name"]="attr_skill_hurt"
},
[79]={
["id"]=79,
["name"]="dmgdec"
}
}
local keys = {
@ -392,12 +444,25 @@ local keys = {
["attr_atkp_yellow_all"]=attr[63],
["attr_atkp_green_all"]=attr[64],
["attr_atkp_blue_all"]=attr[65],
["attr_atkp_purple_all"]=attr[66]
["attr_atkp_purple_all"]=attr[66],
["atk_all"]=attr[67],
["attr_hp_all"]=attr[68],
["attr_dmgdec_all"]=attr[69],
["attr_crit_all"]=attr[70],
["attr_crit_time_all"]=attr[71],
["attr_normal_hurtp_all"]=attr[72],
["attr_skill_hurtp_all"]=attr[73],
["attr_atkp_all"]=attr[74],
["attr_atk"]=attr[75],
["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
}
}
local config = {
data=attr,
keys=keys,
count=66
count=79
}
return config

20
lua/app/config/strings/zh/skill_rogue.lua
View File

@ -364,15 +364,6 @@ local skill_rogue = {
},
[2400123]={
},
[2400131]={
},
[2400132]={
},
[2400133]={
},
[2400141]={
@ -400,15 +391,6 @@ local skill_rogue = {
},
[2500123]={
},
[2500131]={
},
[2500132]={
},
[2500133]={
},
[2500141]={
@ -925,6 +907,6 @@ local skill_rogue = {
}
}
local config = {
data=skill_rogue,count=308
data=skill_rogue,count=302
}
return config

144
lua/app/config/task_daily_challenge.lua
View File

@ -2,29 +2,21 @@ local task_daily_challenge = {
[1]={
["param"]=1,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=500,
["num_for_nothing"]="Uwhc"
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["number"]=1
@ -35,26 +27,18 @@ local task_daily_challenge = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=21,
["id_for_nothing"]="VAk=",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
["number"]=2
@ -65,26 +49,18 @@ local task_daily_challenge = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=21,
["id_for_nothing"]="VAk=",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
["number"]=2
@ -98,24 +74,24 @@ local task_daily_challenge = {
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["num"]=30,
["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["num_for_nothing"]="Vwhc"
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=2,
["num_for_nothing"]="VA=="
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
}
},
["number"]=3
@ -128,24 +104,24 @@ local task_daily_challenge = {
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["num"]=30,
["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["num_for_nothing"]="Vwhc"
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=2,
["num_for_nothing"]="VA=="
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
}
},
["number"]=3
@ -159,24 +135,24 @@ local task_daily_challenge = {
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
["num"]=30,
["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["num_for_nothing"]="Vwhc"
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=2,
["num_for_nothing"]="VA=="
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
}
},
["number"]=3

8
lua/app/global/global_func.lua
View File

@ -372,8 +372,10 @@ end
function GFunc.getTaskDesc(taskType, taskTarget)
if taskType == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then
-- 段位显示文本
local grading = DataManager.ArenaData:getGradingName(DataManager.ArenaData:getGradingIdFromScore(taskTarget))
return I18N:getText("task_type", taskType, "desc", grading)
-- local grading = DataManager.ArenaData:getGradingName(DataManager.ArenaData:getGradingIdFromScore(taskTarget))
-- return I18N:getText("task_type", taskType, "desc", grading)
-- local curScore = DataManager.ArenaData:getGradingScore(taskTarget)
return I18N:getText("task_type", taskType, "desc", taskTarget)
elseif taskType == GConst.TaskConst.TASK_TYPE.X_DUNGEON_ARMOR then
-- 防具副本显示章节和关卡
local cfg = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR):getConfig(taskTarget)
@ -586,7 +588,7 @@ function GFunc.showItemNotEnough(itemId)
okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),
okFunc = function()
UIManager:closeAllUIExceptMainUI()
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.ShopConst.PAGE_TYPE.MAIN, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD})
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD_STORE})
end
}
GFunc.showMessageBox(params)

9
lua/app/module/hero/hero_manager.lua
View File

@ -37,6 +37,15 @@ function HeroManager:upgradeHeroFinish(result)
DataManager.HeroData:setDirty()
DataManager.HeroData:calcPower()
local heroes = DataManager.HeroData:getAllHeroes()
local count = 0
for i,v in ipairs(heroes) do
if v:getLv() >= 5 then
count = count + 1
end
end
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_HERO_LVUP_5, count)
AudioManager:playEffect(AudioManager.EFFECT_ID.HERO_UP)
end
end

8
lua/app/module/shop/shop_const.lua
View File

@ -124,4 +124,12 @@ ShopConst.CORE_SOUL_TYPE = {
ShopConst.CORE_SOUL_NORMAL_MAX_COUNT = 10 -- 魂芯普通宝箱自适应抽取数量限制
ShopConst.CORE_SOUL_ELITE_MULTI_COUNT = 10 -- 史诗宝箱多抽的次数
-- 商店主要商品页面的类型
ShopConst.MAIN_PAGE_TYPE = {
CHAPTER_GIFT = 1,
DAILY_STORE = 2,
GEM_STORE = 3,
GOLD_STORE = 4,
}
return ShopConst

10
lua/app/module/shop/shop_manager.lua
View File

@ -2,13 +2,9 @@ local ShopManager = class("ShopManager", BaseModule)
ShopManager.COMMERCE_TYPE = {
CHAPTER_GIFT = 1,
SUMMON = 2,
DAILY_STORE = 3,
EMBLEM = 4,
GEM_STORE = 5,
GOLD_STORE = 6,
FORCE_SKIN = 7,
CORE_SOUL_STORE = 8,
DAILY_STORE = 2,
GEM_STORE = 3,
GOLD_STORE = 4,
}
ShopManager.SUMMON_ID = {

1
lua/app/module/talent/talent_manager.lua
View File

@ -16,6 +16,7 @@ end
function TalentManager:onTalentUpgradeRsp(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.TalentData:onUpgrade(result)
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_TALENT_UP, 1)
end
end

4
lua/app/module/task/task_const.lua
View File

@ -55,10 +55,14 @@ TaskConst.TASK_TYPE = {
X_SUMMON_HERO_3 = 46, -- 获得X个稀有英雄（蓝色）
X_SUMMON_HERO = 47, -- 招聘X次
X_STAR_HERO_5 = 48, -- 传说英雄（橙色)最高星达X 历史最高记录，从建号起记录
X_LOGIN = 49, -- 登录即可达成 给活动用，比如七天乐
X_HERO_LVUP_5 = 50, -- 5名英雄升至X级 历史最高记录的5名英雄，从建号起记录
X_TALENT_UP = 51, -- 研究所（天赋）升级X次 从创号开始记录
}
TaskConst.RELPACE_TASK_TYPE = {
TaskConst.TASK_TYPE.X_HERO_MAX_LV_REACH,
TaskConst.TASK_TYPE.X_HERO_LVUP_5,
}
return TaskConst

20
lua/app/module/task/task_manager.lua
View File

@ -370,6 +370,14 @@ function TaskManager:xStarHero5(count)
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5, count)
end
function TaskManager:xHeroLvUp5(count)
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_HERO_LVUP_5, count)
end
function TaskManager:xTalentUp(count)
self:dispatchTask(GConst.TaskConst.TASK_TYPE.X_TALENT_UP, count)
end
---- 没有特殊说明，方法均返回任务增量
TaskManager.TYPE_DEAL_FUNC = {
[GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.xWatchAd,
@ -418,6 +426,8 @@ TaskManager.TYPE_DEAL_FUNC = {
[GConst.TaskConst.TASK_TYPE.X_SUMMON_HERO_3] = TaskManager.xSummonHero3,
[GConst.TaskConst.TASK_TYPE.X_SUMMON_HERO] = TaskManager.xSummonHero,
[GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5] = TaskManager.xStarHero5,
[GConst.TaskConst.TASK_TYPE.X_HERO_LVUP_5] = TaskManager.xHeroLvUp5,
[GConst.TaskConst.TASK_TYPE.X_TALENT_UP] = TaskManager.xTalentUp,
}
function TaskManager:taskGoto(taskType)
@ -440,11 +450,11 @@ function TaskManager:gotoMainShopUI()
end
function TaskManager:gotoMainShopGemUI()
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, storeIdx = GConst.ShopConst.MAIN_PAGE_TYPE.GEM})
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GEM_STORE})
end
function TaskManager:gotoMainShopGoldUI()
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, storeIdx = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD})
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD_STORE})
end
function TaskManager:gotoMainHeroUI()
@ -463,6 +473,10 @@ function TaskManager:gotoDailyChallengeUI()
ModuleManager.DailyChallengeManager:showDailyChallengeUI()
end
function TaskManager:gotoTalentUI()
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.COMPANY, companyIdx = 1})
end
TaskManager.gotoFunc = {
[GConst.TaskConst.TASK_TYPE.X_WATCH_AD] = TaskManager.gotoMainShopUI,
[GConst.TaskConst.TASK_TYPE.X_GOLD_GOT] = TaskManager.gotoMainShopGoldUI,
@ -487,6 +501,8 @@ TaskManager.gotoFunc = {
[GConst.TaskConst.TASK_TYPE.X_SUMMON_HERO_3] = TaskManager.gotoSummonUI,
[GConst.TaskConst.TASK_TYPE.X_SUMMON_HERO] = TaskManager.gotoSummonUI,
[GConst.TaskConst.TASK_TYPE.X_STAR_HERO_5] = TaskManager.gotoMainHeroUI,
[GConst.TaskConst.TASK_TYPE.X_HERO_LVUP_5] = TaskManager.gotoMainHeroUI,
[GConst.TaskConst.TASK_TYPE.X_TALENT_UP] = TaskManager.gotoTalentUI,
}
function TaskManager:dealTaskType(taskType, callback, onlyGet)

16
lua/app/ui/activity/act_seven_day/cell/task_cell.lua
View File

@ -6,12 +6,18 @@ function TaskCell:refresh(id, period)
local taskInfo = DataManager.ActSevenDayData:getTaskData(id)
local slider = uiMap["task_cell.slider_bg.slider"]
local progress = math.max(taskInfo.progress, 0)
progress = math.min(progress, cfg.number)
local targetCount = cfg.number
if cfg.type == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then
targetCount = DataManager.ArenaData:getGradingScore(targetCount)
progress = DataManager.ArenaData:getGradingScore(progress)
end
progress = math.min(progress, targetCount)
progress = math.max(progress, 0)
slider:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = progress / cfg.number
uiMap["task_cell.progress"]:setText(progress .. "/" .. cfg.number)
slider:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = progress / targetCount
uiMap["task_cell.progress"]:setText(progress .. "/" .. targetCount)
local desc = uiMap["task_cell.desc"]
local condition = cfg.number
local condition = targetCount
local str = GFunc.getTaskDesc(cfg.type, condition)
desc:setText(str)
if not self.rewardCell then
@ -45,7 +51,7 @@ function TaskCell:onClick(id, period)
ModuleManager.ActSevenDayManager:onGetRewardTask(id, period)
else
if cfg.type then
ModuleManager.TaskManager:goToTask(cfg.type)
ModuleManager.TaskManager:taskGoto(cfg.type)
end
end
end

4
lua/app/ui/currency_bar/cell/currency_cell.lua
View File

@ -39,12 +39,12 @@ function ResourceCell:show(itemId, hideAddImg)
self.timeTx:setVisible(true)
elseif itemId == GConst.ItemConst.ITEM_ID_GOLD then
self.baseObject:addClickListener(function()
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.ShopConst.PAGE_TYPE.MAIN, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD})
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GOLD_STORE})
end)
self.addImg:setVisible(true)
elseif itemId == GConst.ItemConst.ITEM_ID_GEM then
self.baseObject:addClickListener(function()
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.ShopConst.PAGE_TYPE.MAIN, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GEM})
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_SHOP, {page = GConst.MainCityConst.BOTTOM_PAGE.SHOP, subType = GConst.ShopConst.MAIN_PAGE_TYPE.GEM_STORE})
end)
self.addImg:setVisible(true)
elseif itemId == GConst.ItemConst.ITEM_ID_ARENA_TICKET then

19
lua/app/ui/main_city/main_city_ui.lua
View File

@ -153,14 +153,8 @@ function MainCityUI:_addListeners()
self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function(params)
if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.MALL, false) then
local page = params and params.page or GConst.ShopConst.PAGE_TYPE.MAIN -- 默认主要商品
local subType = params.subType
if self.selectedIndex == GConst.MainCityConst.BOTTOM_PAGE.SHOP then
if self.subComps and self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP] then
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:switchPage(page)
if page == GConst.ShopConst.PAGE_TYPE.MAIN and subType then
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:goSubType(subType)
end
end
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:refresh(params.subType)
return
end
-- self.bottomBtnSpines[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:playAnimComplete("born1", false, false, function()
@ -170,10 +164,7 @@ function MainCityUI:_addListeners()
-- end)
self:refreshBottom(GConst.MainCityConst.BOTTOM_PAGE.SHOP, true)
if self.subComps and self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP] then
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:switchPage(page)
if page == GConst.ShopConst.PAGE_TYPE.MAIN and subType then
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:goSubType(subType)
end
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:refresh(params.subType)
end
end
end)
@ -194,9 +185,13 @@ function MainCityUI:_addListeners()
if page == GConst.MainCityConst.BOTTOM_PAGE.SHOP then
if self.selectedIndex == page then -- 直接跳转
if self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP] then
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:switchPage(params.storeIdx)
self.subComps[GConst.MainCityConst.BOTTOM_PAGE.SHOP]:refresh(params.subType)
end
end
elseif page == GConst.MainCityConst.BOTTOM_PAGE.COMPANY then
if params.companyIdx == 1 then
ModuleManager.TalentManager:showMainUI()
end
-- elseif page == GConst.MainCityConst.BOTTOM_PAGE.DUNGEON then
-- if self.selectedIndex == page then -- 直接跳转
-- if self.dungeonComp then

20
lua/app/ui/shop/shop_comp.lua
View File

@ -125,7 +125,7 @@ end
function ShopComp:refresh(showIdx, noShowIdx)
-- if showIdx ~= nil then
-- if showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.FORCE_SKIN then
-- if showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.FORCE_SKIN then
-- self.curPage = PAGE_TYPE.SKIN
-- else
-- self.curPage = PAGE_TYPE.SHOP
@ -160,13 +160,13 @@ function ShopComp:refreshShop(showIdx, noShowIdx)
self:updateList(noShowIdx)
-- if self.showIdx then -- 指定跳转
-- if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.CHAPTER_GIFT then
-- if self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.CHAPTER_GIFT then
-- BIReportV2:postOperation(BIReportV2.OPERATION_UI_NAME.SHOP_CHAPTER)
-- elseif self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.DAILY_STORE then
-- elseif self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.DAILY_STORE then
-- BIReportV2:postOperation(BIReportV2.OPERATION_UI_NAME.SHOP_DAILY_STORE)
-- elseif self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.GEM_STORE then
-- elseif self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.GEM_STORE then
-- BIReportV2:postOperation(BIReportV2.OPERATION_UI_NAME.SHOP_GEM_STORE)
-- elseif self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.GOLD_STORE then
-- elseif self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.GOLD_STORE then
-- BIReportV2:postOperation(BIReportV2.OPERATION_UI_NAME.SHOP_GOLD_STORE)
-- else
-- BIReportV2:postOperation(BIReportV2.OPERATION_UI_NAME.MAIN_SHOP)
@ -246,7 +246,7 @@ function ShopComp:updateChapterList(offsetY)
self.chapterScrollrect:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_SCROLL_RECT).enabled = true
end
if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.CHAPTER_GIFT then
if self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.CHAPTER_GIFT then
self.beginPosY = math.abs(offsetY)
end
@ -281,7 +281,7 @@ end
-- end
-- self.coreSoulTitleBg:setActive(true)
-- self.coreSoulMainCell:setActive(true)
-- if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.CORE_SOUL_STORE then
-- if self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.CORE_SOUL_STORE then
-- self.beginPosY = math.abs(offsetY)
-- end
-- if self.rpPosY == nil then
@ -307,7 +307,7 @@ function ShopComp:updateDailyCell(offsetY)
end
self.dailyTitleBg:setActive(true)
self.dailyCell:setActive(true)
if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.DAILY_STORE then
if self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.DAILY_STORE then
self.beginPosY = math.abs(offsetY)
end
if self.rpPosY == nil then
@ -326,7 +326,7 @@ function ShopComp:updateDailyCell(offsetY)
end
function ShopComp:updateGemCell(offsetY)
if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.GEM_STORE then
if self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.GEM_STORE then
self.beginPosY = math.abs(offsetY)
end
@ -347,7 +347,7 @@ end
function ShopComp:updateGoldCell(offsetY)
self.goldTitleBg:setActive(true)
self.goldCell:setActive(true)
if self.showIdx == ModuleManager.ShopManager.COMMERCE_TYPE.GOLD_STORE then
if self.showIdx == GConst.ShopConst.MAIN_PAGE_TYPE.GOLD_STORE then
self.beginPosY = math.abs(offsetY)
end
if self.rpPosY == nil then

6
lua/app/ui/task/cell/achievement_task_cell.lua
View File

@ -30,6 +30,12 @@ function AchievementTaskCell:refresh(taskId)
local taskTarget = DataManager.DailyTaskData:getAchievementCondition(self.taskId, self.taskStage)
local taskProg = DataManager.DailyTaskData:getAchievementProg(self.taskId)
taskProg = taskProg > taskTarget and taskTarget or taskProg
if self.taskType == GConst.TaskConst.TASK_TYPE.X_ARENA_GRADING then
taskTarget = DataManager.ArenaData:getGradingScore(taskTarget)
taskProg = DataManager.ArenaData:getGradingScore(taskProg)
end
taskProg = math.min(taskProg, taskTarget)
taskProg = math.max(taskProg, 0)
self.progress.value = taskProg / taskTarget
self.progressTx:setText(taskProg.."/"..taskTarget)

2
lua/app/userdata/activity/act_seven_day/act_seven_day_data.lua
View File

@ -389,7 +389,7 @@ function ActSevenDayData:addTaskProgress(taskType, count)
-- addCount = 0
-- end
-- end
if table.containValue(GConst.TaskConst.TASK_TYPE, taskType) then
if table.containValue(GConst.TaskConst.RELPACE_TASK_TYPE, taskType) then
serverData.progress = math.max(serverData.progress, addCount)
else
if serverData.progress <= math.maxinteger - addCount then -- 检查一下是否相加会溢出

5
lua/app/userdata/arena/arena_data.lua
View File

@ -1,5 +1,5 @@
local ArenaData = class("ArenaData", BaseData)
local MIN_SCORE = 900
-- 竞技场
function ArenaData:ctor()
@ -237,6 +237,9 @@ end
-- 获取所在段位的最低积分
function ArenaData:getGradingMinScore(score)
if not self.cfgRank then
return MIN_SCORE
end
local id = self:getGradingIdFromScore(score)
if not self.cfgRank[id] then
id = table.sort(table.keys(self.cfgRank))