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

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

Browse Source
This commit is contained in:
xiekaidong 2023-09-18 10:36:26 +08:00
commit 84a3eaefb0
7 changed files with 1336 additions and 14056 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15206
lua/app/config/activity_pvp_board.lua
View File

File diff suppressed because it is too large Load Diff

50
lua/app/config/activity_pvp_robot.lua
View File

@ -1,6 +1,7 @@
local activity_pvp_robot = { local activity_pvp_robot = {
[1]={ [1]={
["name"]="Gresham", ["name"]="Gresham",
["total_score"]=10,
["score"]=0, ["score"]=0,
["level"]=9, ["level"]=9,
["avatar"]=3001, ["avatar"]=3001,
@ -30,6 +31,7 @@ local activity_pvp_robot = {
}, },
[2]={ [2]={
["name"]="Gilroy", ["name"]="Gilroy",
["total_score"]=14,
["score"]=0, ["score"]=0,
["level"]=10, ["level"]=10,
["avatar"]=1001, ["avatar"]=1001,
@ -59,6 +61,7 @@ local activity_pvp_robot = {
}, },
[3]={ [3]={
["name"]="Landry", ["name"]="Landry",
["total_score"]=5,
["score"]=0, ["score"]=0,
["level"]=10, ["level"]=10,
["avatar"]=4001, ["avatar"]=4001,
@ -88,6 +91,7 @@ local activity_pvp_robot = {
}, },
[4]={ [4]={
["name"]="Eva", ["name"]="Eva",
["total_score"]=15,
["score"]=0, ["score"]=0,
["level"]=9, ["level"]=9,
["avatar"]=2001, ["avatar"]=2001,
@ -117,6 +121,7 @@ local activity_pvp_robot = {
}, },
[5]={ [5]={
["name"]="Prosperous", ["name"]="Prosperous",
["total_score"]=15,
["score"]=0, ["score"]=0,
["level"]=9, ["level"]=9,
["avatar"]=5001, ["avatar"]=5001,
@ -146,6 +151,7 @@ local activity_pvp_robot = {
}, },
[6]={ [6]={
["name"]="Gresham", ["name"]="Gresham",
["total_score"]=20,
["score"]=1, ["score"]=1,
["level"]=9, ["level"]=9,
["avatar"]=3001, ["avatar"]=3001,
@ -175,6 +181,7 @@ local activity_pvp_robot = {
}, },
[7]={ [7]={
["name"]="Gilroy", ["name"]="Gilroy",
["total_score"]=21,
["score"]=1, ["score"]=1,
["level"]=10, ["level"]=10,
["avatar"]=1001, ["avatar"]=1001,
@ -204,6 +211,7 @@ local activity_pvp_robot = {
}, },
[8]={ [8]={
["name"]="Landry", ["name"]="Landry",
["total_score"]=21,
["score"]=1, ["score"]=1,
["level"]=10, ["level"]=10,
["avatar"]=4001, ["avatar"]=4001,
@ -233,6 +241,7 @@ local activity_pvp_robot = {
}, },
[9]={ [9]={
["name"]="Eva", ["name"]="Eva",
["total_score"]=15,
["score"]=1, ["score"]=1,
["level"]=9, ["level"]=9,
["avatar"]=2001, ["avatar"]=2001,
@ -262,6 +271,7 @@ local activity_pvp_robot = {
}, },
[10]={ [10]={
["name"]="Prosperous", ["name"]="Prosperous",
["total_score"]=18,
["score"]=1, ["score"]=1,
["level"]=9, ["level"]=9,
["avatar"]=5001, ["avatar"]=5001,
@ -291,6 +301,7 @@ local activity_pvp_robot = {
}, },
[11]={ [11]={
["name"]="Fleming", ["name"]="Fleming",
["total_score"]=31,
["score"]=2, ["score"]=2,
["level"]=8, ["level"]=8,
["avatar"]=4001, ["avatar"]=4001,
@ -320,6 +331,7 @@ local activity_pvp_robot = {
}, },
[12]={ [12]={
["name"]="Lola", ["name"]="Lola",
["total_score"]=33,
["score"]=2, ["score"]=2,
["level"]=8, ["level"]=8,
["avatar"]=5001, ["avatar"]=5001,
@ -349,6 +361,7 @@ local activity_pvp_robot = {
}, },
[13]={ [13]={
["name"]="Frances", ["name"]="Frances",
["total_score"]=35,
["score"]=2, ["score"]=2,
["level"]=9, ["level"]=9,
["avatar"]=3001, ["avatar"]=3001,
@ -378,6 +391,7 @@ local activity_pvp_robot = {
}, },
[14]={ [14]={
["name"]="Keith", ["name"]="Keith",
["total_score"]=28,
["score"]=2, ["score"]=2,
["level"]=7, ["level"]=7,
["avatar"]=2001, ["avatar"]=2001,
@ -407,6 +421,7 @@ local activity_pvp_robot = {
}, },
[15]={ [15]={
["name"]="Winston", ["name"]="Winston",
["total_score"]=32,
["score"]=2, ["score"]=2,
["level"]=11, ["level"]=11,
["avatar"]=1001, ["avatar"]=1001,
@ -436,6 +451,7 @@ local activity_pvp_robot = {
}, },
[16]={ [16]={
["name"]="Halsey", ["name"]="Halsey",
["total_score"]=27,
["score"]=3, ["score"]=3,
["level"]=12, ["level"]=12,
["avatar"]=5001, ["avatar"]=5001,
@ -465,6 +481,7 @@ local activity_pvp_robot = {
}, },
[17]={ [17]={
["name"]="Stuart", ["name"]="Stuart",
["total_score"]=30,
["score"]=3, ["score"]=3,
["level"]=14, ["level"]=14,
["avatar"]=5001, ["avatar"]=5001,
@ -494,6 +511,7 @@ local activity_pvp_robot = {
}, },
[18]={ [18]={
["name"]="Dark-Haired", ["name"]="Dark-Haired",
["total_score"]=25,
["score"]=3, ["score"]=3,
["level"]=13, ["level"]=13,
["avatar"]=1001, ["avatar"]=1001,
@ -523,6 +541,7 @@ local activity_pvp_robot = {
}, },
[19]={ [19]={
["name"]="Hilda", ["name"]="Hilda",
["total_score"]=27,
["score"]=3, ["score"]=3,
["level"]=10, ["level"]=10,
["avatar"]=2001, ["avatar"]=2001,
@ -552,6 +571,7 @@ local activity_pvp_robot = {
}, },
[20]={ [20]={
["name"]="Idelle", ["name"]="Idelle",
["total_score"]=25,
["score"]=3, ["score"]=3,
["level"]=13, ["level"]=13,
["avatar"]=2001, ["avatar"]=2001,
@ -581,6 +601,7 @@ local activity_pvp_robot = {
}, },
[21]={ [21]={
["name"]="Sibley", ["name"]="Sibley",
["total_score"]=27,
["score"]=4, ["score"]=4,
["level"]=11, ["level"]=11,
["avatar"]=3001, ["avatar"]=3001,
@ -610,6 +631,7 @@ local activity_pvp_robot = {
}, },
[22]={ [22]={
["name"]="Wolf", ["name"]="Wolf",
["total_score"]=33,
["score"]=4, ["score"]=4,
["level"]=11, ["level"]=11,
["avatar"]=1001, ["avatar"]=1001,
@ -639,6 +661,7 @@ local activity_pvp_robot = {
}, },
[23]={ [23]={
["name"]="Renata", ["name"]="Renata",
["total_score"]=32,
["score"]=4, ["score"]=4,
["level"]=13, ["level"]=13,
["avatar"]=3001, ["avatar"]=3001,
@ -668,6 +691,7 @@ local activity_pvp_robot = {
}, },
[24]={ [24]={
["name"]="Lane", ["name"]="Lane",
["total_score"]=25,
["score"]=4, ["score"]=4,
["level"]=10, ["level"]=10,
["avatar"]=4001, ["avatar"]=4001,
@ -697,6 +721,7 @@ local activity_pvp_robot = {
}, },
[25]={ [25]={
["name"]="Fabian", ["name"]="Fabian",
["total_score"]=32,
["score"]=4, ["score"]=4,
["level"]=13, ["level"]=13,
["avatar"]=4001, ["avatar"]=4001,
@ -726,6 +751,7 @@ local activity_pvp_robot = {
}, },
[26]={ [26]={
["name"]="Peace", ["name"]="Peace",
["total_score"]=34,
["score"]=5, ["score"]=5,
["level"]=14, ["level"]=14,
["avatar"]=1001, ["avatar"]=1001,
@ -755,6 +781,7 @@ local activity_pvp_robot = {
}, },
[27]={ [27]={
["name"]="Tanya", ["name"]="Tanya",
["total_score"]=26,
["score"]=5, ["score"]=5,
["level"]=15, ["level"]=15,
["avatar"]=2001, ["avatar"]=2001,
@ -784,6 +811,7 @@ local activity_pvp_robot = {
}, },
[28]={ [28]={
["name"]="Trix", ["name"]="Trix",
["total_score"]=33,
["score"]=5, ["score"]=5,
["level"]=13, ["level"]=13,
["avatar"]=5001, ["avatar"]=5001,
@ -813,6 +841,7 @@ local activity_pvp_robot = {
}, },
[29]={ [29]={
["name"]="Eugene", ["name"]="Eugene",
["total_score"]=26,
["score"]=5, ["score"]=5,
["level"]=16, ["level"]=16,
["avatar"]=5001, ["avatar"]=5001,
@ -842,6 +871,7 @@ local activity_pvp_robot = {
}, },
[30]={ [30]={
["name"]="Loralie", ["name"]="Loralie",
["total_score"]=25,
["score"]=5, ["score"]=5,
["level"]=14, ["level"]=14,
["avatar"]=1001, ["avatar"]=1001,
@ -871,6 +901,7 @@ local activity_pvp_robot = {
}, },
[31]={ [31]={
["name"]="Henrietta", ["name"]="Henrietta",
["total_score"]=27,
["score"]=6, ["score"]=6,
["level"]=13, ["level"]=13,
["avatar"]=3001, ["avatar"]=3001,
@ -900,6 +931,7 @@ local activity_pvp_robot = {
}, },
[32]={ [32]={
["name"]="Willette", ["name"]="Willette",
["total_score"]=33,
["score"]=6, ["score"]=6,
["level"]=14, ["level"]=14,
["avatar"]=4001, ["avatar"]=4001,
@ -929,6 +961,7 @@ local activity_pvp_robot = {
}, },
[33]={ [33]={
["name"]="Orlena", ["name"]="Orlena",
["total_score"]=30,
["score"]=6, ["score"]=6,
["level"]=14, ["level"]=14,
["avatar"]=3001, ["avatar"]=3001,
@ -958,6 +991,7 @@ local activity_pvp_robot = {
}, },
[34]={ [34]={
["name"]="Irving", ["name"]="Irving",
["total_score"]=29,
["score"]=6, ["score"]=6,
["level"]=15, ["level"]=15,
["avatar"]=2001, ["avatar"]=2001,
@ -987,6 +1021,7 @@ local activity_pvp_robot = {
}, },
[35]={ [35]={
["name"]="Phyllis", ["name"]="Phyllis",
["total_score"]=34,
["score"]=6, ["score"]=6,
["level"]=16, ["level"]=16,
["avatar"]=4001, ["avatar"]=4001,
@ -1016,6 +1051,7 @@ local activity_pvp_robot = {
}, },
[36]={ [36]={
["name"]="Halsey", ["name"]="Halsey",
["total_score"]=29,
["score"]=7, ["score"]=7,
["level"]=12, ["level"]=12,
["avatar"]=5001, ["avatar"]=5001,
@ -1045,6 +1081,7 @@ local activity_pvp_robot = {
}, },
[37]={ [37]={
["name"]="Stuart", ["name"]="Stuart",
["total_score"]=25,
["score"]=7, ["score"]=7,
["level"]=14, ["level"]=14,
["avatar"]=5001, ["avatar"]=5001,
@ -1074,6 +1111,7 @@ local activity_pvp_robot = {
}, },
[38]={ [38]={
["name"]="Dark-Haired", ["name"]="Dark-Haired",
["total_score"]=29,
["score"]=7, ["score"]=7,
["level"]=13, ["level"]=13,
["avatar"]=1001, ["avatar"]=1001,
@ -1103,6 +1141,7 @@ local activity_pvp_robot = {
}, },
[39]={ [39]={
["name"]="Hilda", ["name"]="Hilda",
["total_score"]=32,
["score"]=7, ["score"]=7,
["level"]=10, ["level"]=10,
["avatar"]=2001, ["avatar"]=2001,
@ -1132,6 +1171,7 @@ local activity_pvp_robot = {
}, },
[40]={ [40]={
["name"]="Idelle", ["name"]="Idelle",
["total_score"]=30,
["score"]=7, ["score"]=7,
["level"]=13, ["level"]=13,
["avatar"]=2001, ["avatar"]=2001,
@ -1161,6 +1201,7 @@ local activity_pvp_robot = {
}, },
[41]={ [41]={
["name"]="Sibley", ["name"]="Sibley",
["total_score"]=42,
["score"]=8, ["score"]=8,
["level"]=11, ["level"]=11,
["avatar"]=3001, ["avatar"]=3001,
@ -1190,6 +1231,7 @@ local activity_pvp_robot = {
}, },
[42]={ [42]={
["name"]="Wolf", ["name"]="Wolf",
["total_score"]=36,
["score"]=8, ["score"]=8,
["level"]=11, ["level"]=11,
["avatar"]=1001, ["avatar"]=1001,
@ -1219,6 +1261,7 @@ local activity_pvp_robot = {
}, },
[43]={ [43]={
["name"]="Renata", ["name"]="Renata",
["total_score"]=40,
["score"]=8, ["score"]=8,
["level"]=13, ["level"]=13,
["avatar"]=3001, ["avatar"]=3001,
@ -1248,6 +1291,7 @@ local activity_pvp_robot = {
}, },
[44]={ [44]={
["name"]="Lane", ["name"]="Lane",
["total_score"]=36,
["score"]=8, ["score"]=8,
["level"]=10, ["level"]=10,
["avatar"]=4001, ["avatar"]=4001,
@ -1277,6 +1321,7 @@ local activity_pvp_robot = {
}, },
[45]={ [45]={
["name"]="Fabian", ["name"]="Fabian",
["total_score"]=38,
["score"]=8, ["score"]=8,
["level"]=13, ["level"]=13,
["avatar"]=4001, ["avatar"]=4001,
@ -1306,6 +1351,7 @@ local activity_pvp_robot = {
}, },
[46]={ [46]={
["name"]="Peace", ["name"]="Peace",
["total_score"]=42,
["score"]=9, ["score"]=9,
["level"]=14, ["level"]=14,
["avatar"]=1001, ["avatar"]=1001,
@ -1335,6 +1381,7 @@ local activity_pvp_robot = {
}, },
[47]={ [47]={
["name"]="Tanya", ["name"]="Tanya",
["total_score"]=37,
["score"]=9, ["score"]=9,
["level"]=15, ["level"]=15,
["avatar"]=2001, ["avatar"]=2001,
@ -1364,6 +1411,7 @@ local activity_pvp_robot = {
}, },
[48]={ [48]={
["name"]="Trix", ["name"]="Trix",
["total_score"]=37,
["score"]=9, ["score"]=9,
["level"]=13, ["level"]=13,
["avatar"]=5001, ["avatar"]=5001,
@ -1393,6 +1441,7 @@ local activity_pvp_robot = {
}, },
[49]={ [49]={
["name"]="Eugene", ["name"]="Eugene",
["total_score"]=40,
["score"]=9, ["score"]=9,
["level"]=16, ["level"]=16,
["avatar"]=5001, ["avatar"]=5001,
@ -1422,6 +1471,7 @@ local activity_pvp_robot = {
}, },
[50]={ [50]={
["name"]="Loralie", ["name"]="Loralie",
["total_score"]=40,
["score"]=9, ["score"]=9,
["level"]=14, ["level"]=14,
["avatar"]=1001, ["avatar"]=1001,

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

@ -13786,12 +13786,12 @@ local equip = {
} }
}, },
["weapon_icon"]={ ["weapon_icon"]={
1, 91,
1, 91,
2, 92,
2, 92,
3, 93,
3 93
} }
}, },
[1400402]={ [1400402]={
@ -29361,12 +29361,12 @@ local equip = {
} }
}, },
["weapon_icon"]={ ["weapon_icon"]={
76, 94,
76, 94,
77, 95,
77, 95,
78, 96,
78 96
} }
}, },
[2400402]={ [2400402]={
@ -44936,12 +44936,12 @@ local equip = {
} }
}, },
["weapon_icon"]={ ["weapon_icon"]={
67, 97,
67, 97,
68, 98,
68, 98,
69, 99,
69 99
} }
}, },
[3400402]={ [3400402]={
@ -60511,12 +60511,12 @@ local equip = {
} }
}, },
["weapon_icon"]={ ["weapon_icon"]={
79, 100,
79, 100,
80, 101,
80, 101,
81, 102,
81 102
} }
}, },
[4400402]={ [4400402]={
@ -76086,12 +76086,12 @@ local equip = {
} }
}, },
["weapon_icon"]={ ["weapon_icon"]={
73, 103,
73, 103,
74, 104,
74, 104,
75, 105,
75 105
} }
}, },
[5400402]={ [5400402]={

29
lua/app/config/localization/localization_global_const.lua
View File

@ -1,20 +1,5 @@
local LocalizationGlobalConst = local LocalizationGlobalConst =
{ {
["ACT_PVP_DESC_19"] = "ACT_PVP_DESC_19",
["ACT_PVP_DESC_20"] = "ACT_PVP_DESC_20",
["ACT_PVP_DESC_21"] = "ACT_PVP_DESC_21",
["ACT_PVP_DESC_22"] = "ACT_PVP_DESC_22",
["ACT_PVP_DESC_23"] = "ACT_PVP_DESC_23",
["ACT_PVP_TALK_DESC_1"] ="ACT_PVP_TALK_DESC_1",
["ACT_PVP_TALK_DESC_2"] ="ACT_PVP_TALK_DESC_2",
["ACT_PVP_TALK_DESC_3"] ="ACT_PVP_TALK_DESC_3",
["ACT_PVP_TALK_DESC_4"] ="ACT_PVP_TALK_DESC_4",
["ACT_PVP_TALK_DESC_5"] ="ACT_PVP_TALK_DESC_5",
["ACT_PVP_TALK_DESC_6"] ="ACT_PVP_TALK_DESC_6",
["ACT_PVP_TALK_DESC_7"] ="ACT_PVP_TALK_DESC_7",
["ACT_PVP_TALK_DESC_8"] ="ACT_PVP_TALK_DESC_8",
["ACT_PVP_TALK_DESC_9"] ="ACT_PVP_TALK_DESC_9",
MAIN_BTN_1 = "MAIN_BTN_1", MAIN_BTN_1 = "MAIN_BTN_1",
QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_1 = "QLT_DESC_1",
QLT_DESC_2 = "QLT_DESC_2", QLT_DESC_2 = "QLT_DESC_2",
@ -614,6 +599,20 @@ local LocalizationGlobalConst =
ACT_PVP_DESC_16 = "ACT_PVP_DESC_16", ACT_PVP_DESC_16 = "ACT_PVP_DESC_16",
ACT_PVP_DESC_17 = "ACT_PVP_DESC_17", ACT_PVP_DESC_17 = "ACT_PVP_DESC_17",
ACT_PVP_DESC_18 = "ACT_PVP_DESC_18", ACT_PVP_DESC_18 = "ACT_PVP_DESC_18",
ACT_PVP_DESC_19 = "ACT_PVP_DESC_19",
ACT_PVP_DESC_20 = "ACT_PVP_DESC_20",
ACT_PVP_DESC_21 = "ACT_PVP_DESC_21",
ACT_PVP_DESC_22 = "ACT_PVP_DESC_22",
ACT_PVP_DESC_23 = "ACT_PVP_DESC_23",
ACT_PVP_TALK_DESC_1 = "ACT_PVP_TALK_DESC_1",
ACT_PVP_TALK_DESC_2 = "ACT_PVP_TALK_DESC_2",
ACT_PVP_TALK_DESC_3 = "ACT_PVP_TALK_DESC_3",
ACT_PVP_TALK_DESC_4 = "ACT_PVP_TALK_DESC_4",
ACT_PVP_TALK_DESC_5 = "ACT_PVP_TALK_DESC_5",
ACT_PVP_TALK_DESC_6 = "ACT_PVP_TALK_DESC_6",
ACT_PVP_TALK_DESC_7 = "ACT_PVP_TALK_DESC_7",
ACT_PVP_TALK_DESC_8 = "ACT_PVP_TALK_DESC_8",
ACT_PVP_TALK_DESC_9 = "ACT_PVP_TALK_DESC_9",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

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

@ -1874,7 +1874,7 @@ local skill = {
["range"]=1 ["range"]=1
} }
}, },
["battle_icon"]="30", ["battle_icon"]="31",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -2001,7 +2001,7 @@ local skill = {
["range"]=1 ["range"]=1
} }
}, },
["battle_icon"]="30", ["battle_icon"]="31",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -3783,7 +3783,7 @@ local skill = {
["boardrange"]={ ["boardrange"]={
}, },
["battle_icon"]="26", ["battle_icon"]="32",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -5735,7 +5735,7 @@ local skill = {
["boardrange"]={ ["boardrange"]={
}, },
["battle_icon"]="27", ["battle_icon"]="33",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -7466,7 +7466,7 @@ local skill = {
["boardrange"]={ ["boardrange"]={
}, },
["battle_icon"]="28", ["battle_icon"]="34",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -9241,7 +9241,7 @@ local skill = {
["range"]=3 ["range"]=3
} }
}, },
["battle_icon"]="29", ["battle_icon"]="35",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={

23
lua/app/config/strings/cn/global.lua
View File

@ -586,7 +586,7 @@ local localization_global =
["ACT_PVP_DESC_3"] = "胜场 {0}/{1} 输场{2}/{3}", ["ACT_PVP_DESC_3"] = "胜场 {0}/{1} 输场{2}/{3}",
["ACT_PVP_DESC_4"] = "酒馆基金", ["ACT_PVP_DESC_4"] = "酒馆基金",
["ACT_PVP_DESC_5"] = "每日累胜奖励", ["ACT_PVP_DESC_5"] = "每日累胜奖励",
["ACT_PVP_DESC_6"] = "梦魇酒馆", ["ACT_PVP_DESC_6"] = "梦魔酒馆",
["ACT_PVP_DESC_7"] = "{0}胜", ["ACT_PVP_DESC_7"] = "{0}胜",
["ACT_PVP_DESC_8"] = "请选择{0}英雄", ["ACT_PVP_DESC_8"] = "请选择{0}英雄",
["ACT_PVP_DESC_9"] = "点击英雄可查看详情", ["ACT_PVP_DESC_9"] = "点击英雄可查看详情",
@ -598,22 +598,21 @@ local localization_global =
["ACT_PVP_DESC_15"] = "酒馆积分", ["ACT_PVP_DESC_15"] = "酒馆积分",
["ACT_PVP_DESC_16"] = "欢迎入股酒馆基金，在酒馆挑战对手，累计积分可领取奖励分红哟~", ["ACT_PVP_DESC_16"] = "欢迎入股酒馆基金，在酒馆挑战对手，累计积分可领取奖励分红哟~",
["ACT_PVP_DESC_17"] = "累计胜场", ["ACT_PVP_DESC_17"] = "累计胜场",
["ACT_PVP_DESC_18"] = "1.活动前七天可以挑战，累计胜场排名。\n2.第八天可领取排行榜奖励，第八天无挑战。", ["ACT_PVP_DESC_18"] = "1.活动期间在酒馆中的所有胜场都将累计记录用于排名。\n2.活动一共七天，第八天时可领取排名奖励。\n3.奖励请及时领取，过期将无法补偿。",
["ACT_PVP_DESC_19"] = "胜:{0}", ["ACT_PVP_DESC_19"] = "胜:{0}",
["ACT_PVP_DESC_20"] = "负:{0}", ["ACT_PVP_DESC_20"] = "负:{0}",
["ACT_PVP_DESC_21"] = "帮助文本1", ["ACT_PVP_DESC_21"] = "帮助文本1",
["ACT_PVP_DESC_22"] = "帮助文本2", ["ACT_PVP_DESC_22"] = "帮助文本2",
["ACT_PVP_DESC_23"] = "帮助文本3", ["ACT_PVP_DESC_23"] = "帮助文本3",
["ACT_PVP_TALK_DESC_1"] =" 梦魇随机对话1", ["ACT_PVP_TALK_DESC_1"] = "嗨~今天想来一局吗？",
["ACT_PVP_TALK_DESC_2"] =" 梦魇随机对话2", ["ACT_PVP_TALK_DESC_2"] = "强者，每天可以领取累胜奖励！",
["ACT_PVP_TALK_DESC_3"] =" 梦魇随机对话3", ["ACT_PVP_TALK_DESC_3"] = "嗯，这听起来很有趣，我们开始吧！",
["ACT_PVP_TALK_DESC_4"] =" 梦魇随机对话4", ["ACT_PVP_TALK_DESC_4"] = "我随时准备好了，你准备好打败他们了吗？",
["ACT_PVP_TALK_DESC_5"] =" 梦魇随机对话5", ["ACT_PVP_TALK_DESC_5"] = "请坐下来，放松心情，让我来照顾您。",
["ACT_PVP_TALK_DESC_6"] ="梦魇随机对话胜利1", ["ACT_PVP_TALK_DESC_6"] = "您真厉害，10胜好久没在我们酒馆出现过了！",
["ACT_PVP_TALK_DESC_7"] ="梦魇随机对话胜利2", ["ACT_PVP_TALK_DESC_7"] = "梦魔我今日可算见着厉害的人了，10胜的大人欢迎再来！",
["ACT_PVP_TALK_DESC_8"] ="梦魇随机对话失败1", ["ACT_PVP_TALK_DESC_8"] = "被打败啦？别灰心~再来呀！",
["ACT_PVP_TALK_DESC_9"] ="梦魇随机对话失败2", ["ACT_PVP_TALK_DESC_9"] = "失败了没关系，下次用我梦魔出场一定赢。",
} }
return localization_global return localization_global

12
lua/app/proto/proto_msg_type.lua
View File

@ -57,6 +57,8 @@ local ProtoMsgType = {
[965542649] = "CollectionUpgradeRsp", [965542649] = "CollectionUpgradeRsp",
[1008447203] = "DeleteReq", [1008447203] = "DeleteReq",
[1008449036] = "DeleteRsp", [1008449036] = "DeleteRsp",
[1058152334] = "RuneQuenchingAutoSyncReq",
[1058154167] = "RuneQuenchingAutoSyncRsp",
[1067411524] = "BuyTicketReq", [1067411524] = "BuyTicketReq",
[1067413357] = "BuyTicketRsp", [1067413357] = "BuyTicketRsp",
[1068769299] = "ReconnectReq", [1068769299] = "ReconnectReq",
@ -268,6 +270,8 @@ local ProtoMsgType = {
[3805366191] = "EquipUpgradeRsp", [3805366191] = "EquipUpgradeRsp",
[3851969243] = "HeroChangeSkinReq", [3851969243] = "HeroChangeSkinReq",
[3851971076] = "HeroChangeSkinRsp", [3851971076] = "HeroChangeSkinRsp",
[3875111657] = "RuneQuenchingAutoReq",
[3875113490] = "RuneQuenchingAutoRsp",
[3904148760] = "GMReq", [3904148760] = "GMReq",
[3904150593] = "GMRsp", [3904150593] = "GMRsp",
[3933875617] = "ChapterStartReq", [3933875617] = "ChapterStartReq",
@ -357,6 +361,8 @@ local ProtoMsgType = {
CollectionUpgradeRsp = 965542649, CollectionUpgradeRsp = 965542649,
DeleteReq = 1008447203, DeleteReq = 1008447203,
DeleteRsp = 1008449036, DeleteRsp = 1008449036,
RuneQuenchingAutoSyncReq = 1058152334,
RuneQuenchingAutoSyncRsp = 1058154167,
BuyTicketReq = 1067411524, BuyTicketReq = 1067411524,
BuyTicketRsp = 1067413357, BuyTicketRsp = 1067413357,
ReconnectReq = 1068769299, ReconnectReq = 1068769299,
@ -568,6 +574,8 @@ local ProtoMsgType = {
EquipUpgradeRsp = 3805366191, EquipUpgradeRsp = 3805366191,
HeroChangeSkinReq = 3851969243, HeroChangeSkinReq = 3851969243,
HeroChangeSkinRsp = 3851971076, HeroChangeSkinRsp = 3851971076,
RuneQuenchingAutoReq = 3875111657,
RuneQuenchingAutoRsp = 3875113490,
GMReq = 3904148760, GMReq = 3904148760,
GMRsp = 3904150593, GMRsp = 3904150593,
ChapterStartReq = 3933875617, ChapterStartReq = 3933875617,
@ -657,6 +665,8 @@ local ProtoMsgType = {
CollectionUpgradeRsp = "CollectionUpgradeRsp", CollectionUpgradeRsp = "CollectionUpgradeRsp",
DeleteReq = "DeleteReq", DeleteReq = "DeleteReq",
DeleteRsp = "DeleteRsp", DeleteRsp = "DeleteRsp",
RuneQuenchingAutoSyncReq = "RuneQuenchingAutoSyncReq",
RuneQuenchingAutoSyncRsp = "RuneQuenchingAutoSyncRsp",
BuyTicketReq = "BuyTicketReq", BuyTicketReq = "BuyTicketReq",
BuyTicketRsp = "BuyTicketRsp", BuyTicketRsp = "BuyTicketRsp",
ReconnectReq = "ReconnectReq", ReconnectReq = "ReconnectReq",
@ -868,6 +878,8 @@ local ProtoMsgType = {
EquipUpgradeRsp = "EquipUpgradeRsp", EquipUpgradeRsp = "EquipUpgradeRsp",
HeroChangeSkinReq = "HeroChangeSkinReq", HeroChangeSkinReq = "HeroChangeSkinReq",
HeroChangeSkinRsp = "HeroChangeSkinRsp", HeroChangeSkinRsp = "HeroChangeSkinRsp",
RuneQuenchingAutoReq = "RuneQuenchingAutoReq",
RuneQuenchingAutoRsp = "RuneQuenchingAutoRsp",
GMReq = "GMReq", GMReq = "GMReq",
GMRsp = "GMRsp", GMRsp = "GMRsp",
ChapterStartReq = "ChapterStartReq", ChapterStartReq = "ChapterStartReq",