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

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

Browse Source 
# Conflicts:
#	lua/app/config/hero.lua
#	lua/app/config/item.lua
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
This commit is contained in:
chenxi 2023-05-18 22:11:16 +08:00
commit 4e1f4c2dbb
12 changed files with 78 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lua/app/config/strings/cn/item.lua
View File

@ -75,84 +75,56 @@ local item = {
["name"]="随机碎片", ["name"]="随机碎片",
["desc"]="挂机可获得随机碎片，领取后数量和品质将根据关卡提升。" ["desc"]="挂机可获得随机碎片，领取后数量和品质将根据关卡提升。"
}, },
[12001]={
["name"]="红R舞女碎片",
["desc"]="凑齐可解锁或升级。"
},
[13001]={ [13001]={
["name"]="红SR-克劳德", ["name"]="红SR-克劳德碎片",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[13002]={ [13002]={
["name"]="红SR-武僧", ["name"]="红SR-武僧碎片",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[14001]={ [14001]={
["name"]="红SSR-铁锤小孩", ["name"]="红SSR-铁锤小孩碎片",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[22001]={ [22001]={
["name"]="黄R黑妹", ["name"]="黄R黑妹碎片",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[23001]={ [23001]={
["name"]="黄SR野蛮人", ["name"]="黄SR野蛮人碎片",
["desc"]="凑齐可解锁或升级。"
},
[23002]={
["name"]="黄SR二丫",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[24001]={ [24001]={
["name"]="黄ssr巨剑", ["name"]="黄ssr巨剑碎片",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[32001]={ [32001]={
["name"]="绿R洋葱", ["name"]="绿R洋葱碎片",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[33001]={ [33001]={
["name"]="绿SR小鹿", ["name"]="绿SR小鹿碎片",
["desc"]="凑齐可解锁或升级。"
},
[33002]={
["name"]="绿SR森林狼",
["desc"]="凑齐可解锁或升级。"
},
[34001]={
["name"]="绿SSR花木兰",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[42001]={ [42001]={
["name"]="蓝R莉莉丝", ["name"]="蓝R莉莉丝碎片",
["desc"]="凑齐可解锁或升级。"
},
[43001]={
["name"]="蓝SR冰女",
["desc"]="凑齐可解锁或升级。"
},
[43002]={
["name"]="蓝SR鸦姐",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[44001]={ [44001]={
["name"]="蓝SSR冰刃", ["name"]="蓝SSR冰刃碎片",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[52001]={ [52001]={
["name"]="紫R忍者", ["name"]="紫R忍者碎片",
["desc"]="凑齐可解锁或升级。"
},
[53001]={
["name"]="紫SR女巫",
["desc"]="凑齐可解锁或升级。"
},
[53002]={
["name"]="紫SR德古拉",
["desc"]="凑齐可解锁或升级。"
},
[54001]={
["name"]="紫SSR蝴蝶",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/de/item.lua
View File

@ -58,6 +58,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -73,9 +76,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -85,39 +85,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

35
lua/app/config/strings/en/item.lua
View File

@ -62,27 +62,27 @@ local item = {
[19]={ [19]={
}, },
[13001]={ [12001]={
["name"]="Roxy Shard", ["name"]="Roxy Shard",
["desc"]="Roxy Shard, collect it to unlock or upgrade Roxy" ["desc"]="Roxy Shard, collect it to unlock or upgrade Roxy"
}, },
[13002]={ [13001]={
["name"]="Carla Shard", ["name"]="Carla Shard",
["desc"]="Carla Shard, collect it to unlock or upgrade Carla" ["desc"]="Carla Shard, collect it to unlock or upgrade Carla"
}, },
[14001]={ [13002]={
["name"]="Great Sword Robert Shard", ["name"]="Great Sword Robert Shard",
["desc"]="Great Sword Robert Shard, collect it to unlock or upgrade Great Sword Robert" ["desc"]="Great Sword Robert Shard, collect it to unlock or upgrade Great Sword Robert"
}, },
[22001]={ [14001]={
["name"]="Aske Shard", ["name"]="Aske Shard",
["desc"]="Aske Shard, collect it to unlock or upgrade Aske" ["desc"]="Aske Shard, collect it to unlock or upgrade Aske"
}, },
[23001]={ [22001]={
["name"]="Evelyn Shard", ["name"]="Evelyn Shard",
["desc"]="Evelyn Shard, collect it to unlock or upgrade Evelyn" ["desc"]="Evelyn Shard, collect it to unlock or upgrade Evelyn"
}, },
[23002]={ [23001]={
["name"]="Lilith Shard", ["name"]="Lilith Shard",
["desc"]="Lilith Shard, collect it to unlock or upgrade Lilith" ["desc"]="Lilith Shard, collect it to unlock or upgrade Lilith"
}, },
@ -96,39 +96,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/fr/item.lua
View File

@ -58,6 +58,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -73,9 +76,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -85,39 +85,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/id/item.lua
View File

@ -58,6 +58,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -73,9 +76,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -85,39 +85,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/ja/item.lua
View File

@ -58,6 +58,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -73,9 +76,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -85,39 +85,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/ko/item.lua
View File

@ -58,6 +58,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -73,9 +76,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -85,39 +85,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/pt/item.lua
View File

@ -57,6 +57,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -72,9 +75,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -84,39 +84,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/ru/item.lua
View File

@ -55,6 +55,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -70,9 +73,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -82,39 +82,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/th/item.lua
View File

@ -55,6 +55,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -70,9 +73,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -82,39 +82,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

29
lua/app/config/strings/vi/item.lua
View File

@ -58,6 +58,9 @@ local item = {
}, },
[19]={ [19]={
},
[12001]={
}, },
[13001]={ [13001]={
@ -73,9 +76,6 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -85,39 +85,18 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config

59
lua/app/config/strings/zh/item.lua
View File

@ -62,73 +62,52 @@ local item = {
[19]={ [19]={
}, },
[13001]={ [12001]={
["name"]="红SR-克劳德", ["name"]="红R舞女碎片",
["desc"]="洛克西英雄碎片,湊齊可解鎖或升級。" ["desc"]="洛克西英雄碎片,湊齊可解鎖或升級。"
}, },
[13002]={ [13001]={
["name"]="红SR-武僧", ["name"]="红SR-克劳德碎片",
["desc"]="卡拉英雄碎片,湊齊可解鎖或升級。" ["desc"]="卡拉英雄碎片,湊齊可解鎖或升級。"
}, },
[14001]={ [13002]={
["name"]="红SSR-铁锤小孩", ["name"]="红SR-武僧碎片",
["desc"]="巨劍羅伯特英雄碎片,湊齊可解鎖或升級。" ["desc"]="巨劍羅伯特英雄碎片,湊齊可解鎖或升級。"
}, },
[22001]={ [14001]={
["name"]="黄R黑妹", ["name"]="红SSR-铁锤小孩碎片",
["desc"]="阿斯克英雄碎片,湊齊可解鎖或升級。" ["desc"]="阿斯克英雄碎片,湊齊可解鎖或升級。"
}, },
[23001]={ [22001]={
["name"]="黄SR野蛮人", ["name"]="黄R黑妹碎片",
["desc"]="艾芙琳英雄碎片,湊齊可解鎖或升級。" ["desc"]="艾芙琳英雄碎片,湊齊可解鎖或升級。"
}, },
[23002]={ [23001]={
["name"]="黄SR二丫", ["name"]="黄SR野蛮人碎片",
["desc"]="莉莉絲英雄碎片,湊齊可解鎖或升級。" ["desc"]="莉莉絲英雄碎片,湊齊可解鎖或升級。"
}, },
[24001]={ [24001]={
["name"]="黄ssr巨剑", ["name"]="黄ssr巨剑碎片",
["desc"]="白髮凱瑟琳英雄碎片,湊齊可解鎖或升級。" ["desc"]="白髮凱瑟琳英雄碎片,湊齊可解鎖或升級。"
}, },
[32001]={ [32001]={
["name"]="绿R洋葱", ["name"]="绿R洋葱碎片",
["desc"]="艾倫英雄碎片,湊齊可解鎖或升級。" ["desc"]="艾倫英雄碎片,湊齊可解鎖或升級。"
}, },
[33001]={ [33001]={
["name"]="绿SR小鹿" ["name"]="绿SR小鹿碎片"
},
[33002]={
["name"]="绿SR森林狼"
},
[34001]={
["name"]="绿SSR花木兰"
}, },
[42001]={ [42001]={
["name"]="蓝R莉莉丝" ["name"]="蓝R莉莉丝碎片"
},
[43001]={
["name"]="蓝SR冰女"
},
[43002]={
["name"]="蓝SR鸦姐"
}, },
[44001]={ [44001]={
["name"]="蓝SSR冰刃" ["name"]="蓝SSR冰刃碎片"
}, },
[52001]={ [52001]={
["name"]="紫R忍者" ["name"]="紫R忍者碎片"
},
[53001]={
["name"]="紫SR女巫"
},
[53002]={
["name"]="紫SR德古拉"
},
[54001]={
["name"]="紫SSR蝴蝶"
} }
} }
local config = { local config = {
data=item,count=38 data=item,count=31
} }
return config return config