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

七天乐

Browse Source
This commit is contained in:
chenxi 2023-05-26 14:51:24 +08:00
parent e552761eea
commit 0b6607d714
19 changed files with 7499 additions and 2496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lua/app/config/chapter.lua
View File

@ -154,21 +154,6 @@ local chapter = {
1401, 1401,
1501 1501
}, },
["mystery_box"]={
1
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -321,32 +306,6 @@ local chapter = {
2901, 2901,
3001 3001
}, },
["mystery_box"]={
1,
3
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,

688
lua/app/config/chapter_board.lua
View File

@ -277,8 +277,8 @@ local chapter_board = {
0 0
}, },
{ {
14, 0,
0 1
}, },
{ {
2, 2,
@ -292,208 +292,10 @@ local chapter_board = {
2, 2,
0 0
}, },
{
14,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
2,
0
},
{
2,
0
},
{
2,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
2,
0
},
{
1,
0
},
{
2,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
}
},
["mystery_box_board"]={
{
1,
0
},
{
2,
0
},
{ {
0, 0,
1 1
}, },
{
0,
2
},
{
0,
1
},
{
2,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
0,
3
},
{
0,
1
},
{
0,
3
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
14,
0
},
{
2,
0
},
{
2,
0
},
{
2,
0
},
{
14,
0
},
{ {
1, 1,
0 0
@ -539,7 +341,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 1,
0 0
}, },
{ {
@ -735,16 +537,16 @@ local chapter_board = {
0 0
}, },
{ {
14, 0,
0 1
}, },
{ {
2, 2,
0 0
}, },
{ {
14, 0,
0 1
}, },
{ {
1, 1,
@ -1010,204 +812,6 @@ local chapter_board = {
1, 1,
0 0
} }
},
["mystery_box_board"]={
{
1,
0
},
{
2,
0
},
{
0,
1
},
{
0,
2
},
{
0,
1
},
{
2,
0
},
{
1,
0
},
{
1,
0
},
{
2,
0
},
{
0,
2
},
{
0,
1
},
{
0,
4
},
{
2,
0
},
{
1,
0
},
{
1,
0
},
{
2,
0
},
{
3,
0
},
{
0,
2
},
{
3,
0
},
{
2,
0
},
{
1,
0
},
{
14,
0
},
{
3,
0
},
{
2,
0
},
{
3,
0
},
{
2,
0
},
{
3,
0
},
{
14,
0
},
{
1,
0
},
{
2,
0
},
{
3,
0
},
{
2,
0
},
{
3,
0
},
{
2,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
15,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
}
} }
}, },
[5]={ [5]={
@ -1608,204 +1212,6 @@ local chapter_board = {
1, 1,
0 0
} }
},
["mystery_box_board"]={
{
1,
0
},
{
1,
0
},
{
0,
1
},
{
0,
2
},
{
0,
1
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
0,
2
},
{
0,
3
},
{
0,
2
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
2,
0
},
{
0,
1
},
{
2,
0
},
{
0,
1
},
{
2,
0
},
{
1,
0
},
{
2,
0
},
{
3,
0
},
{
3,
0
},
{
2,
0
},
{
3,
0
},
{
3,
0
},
{
2,
0
},
{
14,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
3,
0
},
{
14,
0
},
{
1,
0
},
{
3,
0
},
{
3,
0
},
{
15,
0
},
{
3,
0
},
{
3,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
3,
0
},
{
14,
0
},
{
3,
0
},
{
1,
0
},
{
1,
0
}
} }
}, },
[7]={ [7]={
@ -7789,7 +7195,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -8367,7 +7773,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -9185,7 +8591,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -9583,7 +8989,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -10153,7 +9559,7 @@ local chapter_board = {
5 5
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -10979,7 +10385,7 @@ local chapter_board = {
1 1
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -11549,7 +10955,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -11975,7 +11381,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -12573,7 +11979,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -13355,7 +12761,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -14169,7 +13575,7 @@ local chapter_board = {
1 1
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -14523,7 +13929,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -15177,7 +14583,7 @@ local chapter_board = {
4 4
}, },
{ {
15, 17,
0 0
} }
} }
@ -15567,7 +14973,7 @@ local chapter_board = {
2 2
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -16465,7 +15871,7 @@ local chapter_board = {
1 1
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -16903,7 +16309,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -17317,7 +16723,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -17955,7 +17361,7 @@ local chapter_board = {
4 4
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -18737,7 +18143,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -19315,7 +18721,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -19721,7 +19127,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -20359,7 +19765,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
} }
} }
@ -20957,7 +20363,7 @@ local chapter_board = {
1 1
}, },
{ {
15, 17,
0 0
} }
} }
@ -21743,7 +21149,7 @@ local chapter_board = {
2 2
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -22341,7 +21747,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -22883,7 +22289,7 @@ local chapter_board = {
3 3
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -23709,7 +23115,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -24135,7 +23541,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -24505,7 +23911,7 @@ local chapter_board = {
4 4
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -25103,7 +24509,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -26045,7 +25451,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -26527,7 +25933,7 @@ local chapter_board = {
1 1
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -27085,7 +26491,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -27611,7 +27017,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -28333,7 +27739,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
} }
} }
@ -28691,7 +28097,7 @@ local chapter_board = {
2 2
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -29461,7 +28867,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -30019,7 +29425,7 @@ local chapter_board = {
2 2
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -30885,7 +30291,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {
@ -31227,7 +30633,7 @@ local chapter_board = {
0 0
}, },
{ {
15, 17,
0 0
}, },
{ {

45
lua/app/config/hero.lua
View File

@ -113,7 +113,8 @@ local hero = {
["model_id"]="p0014", ["model_id"]="p0014",
["icon"]="5", ["icon"]="5",
["item_id"]=13001, ["item_id"]=13001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[13002]={ [13002]={
["position"]=1, ["position"]=1,
@ -171,7 +172,8 @@ local hero = {
["model_id"]="p0009", ["model_id"]="p0009",
["icon"]="5", ["icon"]="5",
["item_id"]=13002, ["item_id"]=13002,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[14001]={ [14001]={
["position"]=1, ["position"]=1,
@ -229,7 +231,8 @@ local hero = {
["model_id"]="p0011", ["model_id"]="p0011",
["icon"]="5", ["icon"]="5",
["item_id"]=14001, ["item_id"]=14001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[22001]={ [22001]={
["position"]=2, ["position"]=2,
@ -345,7 +348,8 @@ local hero = {
["model_id"]="p0010", ["model_id"]="p0010",
["icon"]="5", ["icon"]="5",
["item_id"]=23001, ["item_id"]=23001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[23002]={ [23002]={
["position"]=2, ["position"]=2,
@ -403,7 +407,8 @@ local hero = {
["model_id"]="p0012", ["model_id"]="p0012",
["icon"]="5", ["icon"]="5",
["item_id"]=23002, ["item_id"]=23002,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[24001]={ [24001]={
["position"]=2, ["position"]=2,
@ -461,7 +466,8 @@ local hero = {
["model_id"]="p0007", ["model_id"]="p0007",
["icon"]="7", ["icon"]="7",
["item_id"]=24001, ["item_id"]=24001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[32001]={ [32001]={
["position"]=3, ["position"]=3,
@ -577,7 +583,8 @@ local hero = {
["model_id"]="p0006", ["model_id"]="p0006",
["icon"]="6", ["icon"]="6",
["item_id"]=33001, ["item_id"]=33001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[33002]={ [33002]={
["position"]=3, ["position"]=3,
@ -635,7 +642,8 @@ local hero = {
["model_id"]="p0006", ["model_id"]="p0006",
["icon"]="6", ["icon"]="6",
["item_id"]=33002, ["item_id"]=33002,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[34001]={ [34001]={
["position"]=3, ["position"]=3,
@ -693,7 +701,8 @@ local hero = {
["model_id"]="p0006", ["model_id"]="p0006",
["icon"]="6", ["icon"]="6",
["item_id"]=34001, ["item_id"]=34001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[42001]={ [42001]={
["position"]=4, ["position"]=4,
@ -809,7 +818,8 @@ local hero = {
["model_id"]="p0003", ["model_id"]="p0003",
["icon"]="3", ["icon"]="3",
["item_id"]=43001, ["item_id"]=43001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[43002]={ [43002]={
["position"]=4, ["position"]=4,
@ -867,7 +877,8 @@ local hero = {
["model_id"]="p0003", ["model_id"]="p0003",
["icon"]="3", ["icon"]="3",
["item_id"]=43002, ["item_id"]=43002,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[44001]={ [44001]={
["position"]=4, ["position"]=4,
@ -925,7 +936,8 @@ local hero = {
["model_id"]="p0008", ["model_id"]="p0008",
["icon"]="8", ["icon"]="8",
["item_id"]=44001, ["item_id"]=44001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[52001]={ [52001]={
["position"]=5, ["position"]=5,
@ -1041,7 +1053,8 @@ local hero = {
["model_id"]="p0015", ["model_id"]="p0015",
["icon"]="4", ["icon"]="4",
["item_id"]=53001, ["item_id"]=53001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[53002]={ [53002]={
["position"]=5, ["position"]=5,
@ -1099,7 +1112,8 @@ local hero = {
["model_id"]="p0004", ["model_id"]="p0004",
["icon"]="4", ["icon"]="4",
["item_id"]=53002, ["item_id"]=53002,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
}, },
[54001]={ [54001]={
["position"]=5, ["position"]=5,
@ -1157,7 +1171,8 @@ local hero = {
["model_id"]="p0004", ["model_id"]="p0004",
["icon"]="4", ["icon"]="4",
["item_id"]=54001, ["item_id"]=54001,
["unlock_chapter"]=3 ["unlock_chapter"]=3,
["is_show"]=1
} }
} }
local config = { local config = {

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

@ -135,6 +135,14 @@ local LocalizationGlobalConst =
LEVEL_FUND_DESC_1 = "LEVEL_FUND_DESC_1", LEVEL_FUND_DESC_1 = "LEVEL_FUND_DESC_1",
BUFF_DESC = "BUFF_DESC", BUFF_DESC = "BUFF_DESC",
DAILY_CHALLENGE_DESC_1 = "DAILY_CHALLENGE_DESC_1", DAILY_CHALLENGE_DESC_1 = "DAILY_CHALLENGE_DESC_1",
DISCONNECT_RELOGIN = "DISCONNECT_RELOGIN",
RECONNECT = "RECONNECT",
RELOGIN = "RELOGIN",
SEVEN_DAY_TITLE = "SEVEN_DAY_TITLE",
SEVEN_DAY_DESC_1 = "SEVEN_DAY_DESC_1",
DAY_X = "DAY_X",
DAY_X_UNLOCK = "DAY_X_UNLOCK",
SEVEN_DAY_DESC_2 = "SEVEN_DAY_DESC_2",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -1746,10 +1746,10 @@ local skill_rogue = {
["skill_position"]=2, ["skill_position"]=2,
["effect"]={ ["effect"]={
{ {
["type"]="hurt_yellow", ["type"]="add_skill",
["num"]=33400, ["num"]=2400125,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=1
} }
}, },
["obj"]=2, ["obj"]=2,

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

@ -135,6 +135,14 @@ local localization_global =
["LEVEL_FUND_DESC_1"] = "购买成长基金{0}后，可通过提升等级获得钻石。\n多档基金可同时购买", ["LEVEL_FUND_DESC_1"] = "购买成长基金{0}后，可通过提升等级获得钻石。\n多档基金可同时购买",
["BUFF_DESC"] = "BUFF", ["BUFF_DESC"] = "BUFF",
["DAILY_CHALLENGE_DESC_1"] = "今日剩余挑战次数不足", ["DAILY_CHALLENGE_DESC_1"] = "今日剩余挑战次数不足",
["DISCONNECT_RELOGIN"] = "网络连接已断开, 请重新登录",
["RECONNECT"] = "网络连接已断开,是否重连",
["RELOGIN"] = "重新登录",
["SEVEN_DAY_TITLE"] = "新手七天乐",
["SEVEN_DAY_DESC_1"] = "每天将开启新的任务",
["DAY_X"] = "第{0}天",
["DAY_X_UNLOCK"] = "第{0}天解锁",
["SEVEN_DAY_DESC_2"] = "已完成任务数:<color=#8DFF81>{0}</color>/{1}",
} }
return localization_global return localization_global

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

@ -1,63 +1,83 @@
local hero = { local hero = {
[12001]={ [12001]={
["name"]="舞娘" ["name"]="舞娘",
["desc"]="舞娘起舞，轻盈的舞步甩在敌人的脸上。"
}, },
[13001]={ [13001]={
["name"]="克劳德" ["name"]="克劳德",
["desc"]="克劳德挥舞大剑，剑气形成旋风，灼灼逼人。"
}, },
[13002]={ [13002]={
["name"]="火旺" ["name"]="火旺",
["desc"]="火旺擅长炎拳，拳拳带火花，有谁不服，就是邦邦两拳。"
}, },
[14001]={ [14001]={
["name"]="亚历山大" ["name"]="亚历山大",
["desc"]="亚历山大的装备，可不是用来好看的。"
}, },
[22001]={ [22001]={
["name"]="刀妹" ["name"]="刀妹",
["desc"]="刀妹使用一次拔刀斩终结技，造成大量伤害。"
}, },
[23001]={ [23001]={
["name"]="野蛮人" ["name"]="野蛮人",
["desc"]="野蛮人的多段伤害，附加流血。"
}, },
[23002]={ [23002]={
["name"]="二丫" ["name"]="二丫",
["desc"]="二丫的链接可以增伤。"
}, },
[24001]={ [24001]={
["name"]="巨剑魔童" ["name"]="巨剑魔童",
["desc"]="巨剑魔童可以造成大量伤害，并概率眩晕敌人。"
}, },
[32001]={ [32001]={
["name"]="洋葱头" ["name"]="洋葱头",
["desc"]="洋葱头使用一次长枪突刺终结技，造成大量伤害并恢复自身血量。"
}, },
[33001]={ [33001]={
["name"]="小鹿" ["name"]="小鹿",
["desc"]="小鹿的急速治疗法，起死回生不过一瞬。"
}, },
[33002]={ [33002]={
["name"]="森林狼" ["name"]="森林狼",
["desc"]="森林狼的链接可以增伤，概率附加易伤效果。"
}, },
[34001]={ [34001]={
["name"]="木兰" ["name"]="木兰",
["desc"]="木兰的链接可以增伤，并附加易伤效果。"
}, },
[42001]={ [42001]={
["name"]="冰心" ["name"]="冰心",
["desc"]="冰心的攻击随机消除额外元素，并造成伤害，有概率冰冻敌人。"
}, },
[43001]={ [43001]={
["name"]="冰女" ["name"]="冰女",
["desc"]="冰女的攻击附加冰霜，并增加灼烧伤害。"
}, },
[43002]={ [43002]={
["name"]="鸦姐" ["name"]="鸦姐",
["desc"]="鸦姐的攻击一定给敌人附加腐败状态。"
}, },
[44001]={ [44001]={
["name"]="寒冰妖姬" ["name"]="寒冰妖姬",
["desc"]="寒冰妖姬随机消除元素，释放一次附带冰霜效果的剑舞攻击。"
}, },
[52001]={ [52001]={
["name"]="忍者伦" ["name"]="忍者伦",
["desc"]="忍者伦生成的魔法罩可以承受伤害。"
}, },
[53001]={ [53001]={
["name"]="魔女琪琪" ["name"]="魔女琪琪",
["desc"]="魔女琪琪的扫帚攻击命中可以附加负面负面状态。"
}, },
[53002]={ [53002]={
["name"]="灵魂猎手" ["name"]="灵魂猎手",
["desc"]="灵魂猎手攻击冰霜敌人概率冰冻敌人。"
}, },
[54001]={ [54001]={
["name"]="蝴蝶" ["name"]="蝴蝶",
["desc"]="蝴蝶的技能可以随机增加技能的能量。"
} }
} }
local config = { local config = {

1
lua/app/global/global_const.lua
View File

@ -188,6 +188,7 @@ GConst.ATLAS_PATH = {
SHOP = "assets/arts/atlas/ui/shop.asset", SHOP = "assets/arts/atlas/ui/shop.asset",
HERO = "assets/arts/atlas/ui/hero.asset", HERO = "assets/arts/atlas/ui/hero.asset",
FUND = "assets/arts/atlas/ui/fund.asset", FUND = "assets/arts/atlas/ui/fund.asset",
SEVEN_DAY = "assets/arts/atlas/ui/sevenday.asset",
} }
GConst.TOUCH_EVENT = { GConst.TOUCH_EVENT = {

3
lua/app/module/login/login_manager.lua
View File

@ -160,7 +160,7 @@ function LoginManager:loginFinish(data)
end end
end end
function LoginManager:saveAuthArgs(name) function LoginManager:saveAuthArgs(isReconnect, name)
local args = LocalData:getLastLoginInfo() local args = LocalData:getLastLoginInfo()
if name then if name then
args.type = NetManager.LOGIN_TYPE.ANONYMOUS args.type = NetManager.LOGIN_TYPE.ANONYMOUS
@ -171,6 +171,7 @@ function LoginManager:saveAuthArgs(name)
end end
args.client_info = self:getClientInfo() args.client_info = self:getClientInfo()
args.reconnect = isReconnect
local sendQueue = LocalData:getSendQueue() local sendQueue = LocalData:getSendQueue()
args.sync = args.sync =
{ {

2
lua/app/module/login/login_ui.lua
View File

@ -60,7 +60,7 @@ function LoginUI:onLoadRootComplete()
end end
self:refreshServerList(serverList) self:refreshServerList(serverList)
ModuleManager.LoginManager:saveAuthArgs() ModuleManager.LoginManager:saveAuthArgs(false)
ModuleManager.LoginManager:initSocket() ModuleManager.LoginManager:initSocket()
local info = LocalData:getLastLoginInfo() local info = LocalData:getLastLoginInfo()

2
lua/app/module/login/test_login_ui.lua
View File

@ -78,7 +78,7 @@ function TestLoginUI:loginGame()
if name == "" then if name == "" then
name = nil name = nil
end end
ModuleManager.LoginManager:saveAuthArgs(name) ModuleManager.LoginManager:saveAuthArgs(false, name)
ModuleManager.LoginManager:initSocket() ModuleManager.LoginManager:initSocket()
self.uiMap["test_login_ui.login_node.login_btn"]:setTouchEnable(false) self.uiMap["test_login_ui.login_node.login_btn"]:setTouchEnable(false)

14
lua/app/module/summon/summon_manager.lua
View File

@ -30,7 +30,19 @@ function SummonManager:summonFinish(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.SummonData:cacheSummonRewards(result.rewards) -- 缓存一下 防止有其他地方需要使用 DataManager.SummonData:cacheSummonRewards(result.rewards) -- 缓存一下 防止有其他地方需要使用
DataManager.SummonData:init(result.summon_info) DataManager.SummonData:init(result.summon_info)
ModuleManager.ShopManager:showBoxOpenUI({type = result.reqData.type})
if result.reqData then
local summonType = result.reqData.type
ModuleManager.ShopManager:showBoxOpenUI({type = summonType})
-- 任务
if summonType == GConst.SummonConst.SUMMON_TYPE.LV_1 then
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_1)
elseif summonType == GConst.SummonConst.SUMMON_TYPE.LV_2 then
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_2)
elseif summonType == GConst.SummonConst.SUMMON_TYPE.LV_3 then
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3)
end
end
end end
end end

4
lua/app/net/net_manager.lua
View File

@ -227,12 +227,12 @@ function NetManager:connect(domain, port, callback, socketName)
return return
end end
LocalData:setLastLoginInfo(lastLoginType, params.id, params.token) LocalData:setLastLoginInfo(lastLoginType, params.id, params.token)
ModuleManager.LoginManager:saveAuthArgs() ModuleManager.LoginManager:saveAuthArgs(true)
ModuleManager.LoginManager:initSocket() ModuleManager.LoginManager:initSocket()
end, loginType) end, loginType)
else else
LocalData:setLastLoginInfo() LocalData:setLastLoginInfo()
ModuleManager.LoginManager:saveAuthArgs() ModuleManager.LoginManager:saveAuthArgs(true)
local params = { local params = {
content = I18N:getGlobalText(I18N.GlobalConst.DISCONNECT_RELOGIN), content = I18N:getGlobalText(I18N.GlobalConst.DISCONNECT_RELOGIN),
okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK), okText = I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_OK),

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

@ -27,6 +27,8 @@ local ProtoMsgType = {
[1068771132] = "ReconnectRsp", [1068771132] = "ReconnectRsp",
[1070841461] = "LoginReq", [1070841461] = "LoginReq",
[1070843294] = "LoginRsp", [1070843294] = "LoginRsp",
[1433352538] = "ChapterDailyChallengeResetReq",
[1433354371] = "ChapterDailyChallengeResetRsp",
[1471116409] = "BindReq", [1471116409] = "BindReq",
[1471118242] = "BindRsp", [1471118242] = "BindRsp",
[1584689751] = "ActPaidResultReq", [1584689751] = "ActPaidResultReq",
@ -139,6 +141,8 @@ local ProtoMsgType = {
ReconnectRsp = 1068771132, ReconnectRsp = 1068771132,
LoginReq = 1070841461, LoginReq = 1070841461,
LoginRsp = 1070843294, LoginRsp = 1070843294,
ChapterDailyChallengeResetReq = 1433352538,
ChapterDailyChallengeResetRsp = 1433354371,
BindReq = 1471116409, BindReq = 1471116409,
BindRsp = 1471118242, BindRsp = 1471118242,
ActPaidResultReq = 1584689751, ActPaidResultReq = 1584689751,
@ -251,6 +255,8 @@ local ProtoMsgType = {
ReconnectRsp = "ReconnectRsp", ReconnectRsp = "ReconnectRsp",
LoginReq = "LoginReq", LoginReq = "LoginReq",
LoginRsp = "LoginRsp", LoginRsp = "LoginRsp",
ChapterDailyChallengeResetReq = "ChapterDailyChallengeResetReq",
ChapterDailyChallengeResetRsp = "ChapterDailyChallengeResetRsp",
BindReq = "BindReq", BindReq = "BindReq",
BindRsp = "BindRsp", BindRsp = "BindRsp",
ActPaidResultReq = "ActPaidResultReq", ActPaidResultReq = "ActPaidResultReq",

55
lua/app/ui/activity/seven_day/seven_day_ui.lua
View File

@ -36,8 +36,8 @@ function SevenDayUI:onLoadRootComplete()
end end
function SevenDayUI:_display() function SevenDayUI:_display()
self.uiMap["seven_day_ui.title_bg.title_tx"]:setText("临时文本:新手七天乐") self.uiMap["seven_day_ui.title_bg.title_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_TITLE))
self.uiMap["seven_day_ui.down.desc"]:setText("临时文本:每天将开启新的任务") self.uiMap["seven_day_ui.down.desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_1))
self.uiMap["seven_day_ui.down.close_btn"]:addClickListener(function() self.uiMap["seven_day_ui.down.close_btn"]:addClickListener(function()
self:closeUI() self:closeUI()
end) end)
@ -51,10 +51,10 @@ function SevenDayUI:initTop()
self.stepObjs = {} self.stepObjs = {}
for i = 1, 7 do for i = 1, 7 do
self.dayTextList[i] = self.uiMap["seven_day_ui.day_bg.day_" .. i] self.dayTextList[i] = self.uiMap["seven_day_ui.day_bg.day_" .. i]
self.dayTextList[i]:setText("临时文本:第" .. i .. "天") self.dayTextList[i]:setText(I18N:getGlobalText(I18N.GlobalConst.DAY_X, i))
self.dayTextList[i]:addClickListener(function() self.dayTextList[i]:addClickListener(function()
if i > DataManager.SevenDayData:getActDay() then if i > DataManager.SevenDayData:getActDay() then
GFunc.showToast(string.format("临时文本:第%s天解锁", i)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAY_X_UNLOCK, i))
return return
end end
self.day = i self.day = i
@ -66,6 +66,18 @@ function SevenDayUI:initTop()
icon = self.uiMap["seven_day_ui.slider_bg.icon_" .. i], icon = self.uiMap["seven_day_ui.slider_bg.icon_" .. i],
num = self.uiMap["seven_day_ui.slider_bg.num_" .. i], num = self.uiMap["seven_day_ui.slider_bg.num_" .. i],
} }
self.stepObjs[i].icon:addClickListener(function()
local list = DataManager.SevenDayData:getStepRewardList()
local id = list[i]
if id then
if DataManager.SevenDayData:canClaimStepTask(id) then
ModuleManager.SevenDayManager:claimStepReward(id)
else
local reward = DataManager.SevenDayData:getStepReward(id)
ModuleManager.TipsManager:showRewardTips(reward.id, reward.type, self.stepObjs[i].icon)
end
end
end)
end end
self.finalBoxLight = self.uiMap["seven_day_ui.slider_bg.light_7"] self.finalBoxLight = self.uiMap["seven_day_ui.slider_bg.light_7"]
self.sevenDayDesc = self.uiMap["seven_day_ui.slider_bg.desc"] self.sevenDayDesc = self.uiMap["seven_day_ui.slider_bg.desc"]
@ -117,23 +129,20 @@ function SevenDayUI:refreshStepInfo()
for index, objs in ipairs(self.stepObjs) do for index, objs in ipairs(self.stepObjs) do
local id = list[index] local id = list[index]
if id then if id then
local reward = DataManager.SevenDayData:getStepReward(id)
objs.num:setText(DataManager.SevenDayData:getStepNum(id)) objs.num:setText(DataManager.SevenDayData:getStepNum(id))
if DataManager.SevenDayData:canClaimStepTask(id) then if index ~= 7 then
objs.icon:addClickListener(function() if DataManager.SevenDayData:stepOver(id) then
ModuleManager.SevenDayManager:claimStepReward(id) objs.icon:setSprite(GConst.ATLAS_PATH.SEVEN_DAY, "sevenday_chest_1")
end) else
else objs.icon:setSprite(GConst.ATLAS_PATH.SEVEN_DAY, "sevenday_chest_2")
objs.icon:addClickListener(function() end
ModuleManager.TipsManager:showRewardTips(reward.id, reward.type, objs.icon)
end)
end end
end end
end end
local count = DataManager.SevenDayData:getCollectedCount() local count = DataManager.SevenDayData:getCollectedCount()
local totalCount = DataManager.SevenDayData:getTotalCount() local totalCount = DataManager.SevenDayData:getTotalCount()
self.sevenDayDesc:setText(string.format("临时文本:已完成任务数:<color=#8DFF81>%s</color>/%s", count, totalCount)) self.sevenDayDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SEVEN_DAY_DESC_2, count, totalCount))
self.sevenDaySliderComp.value = count / totalCount self.sevenDaySliderComp.value = count / totalCount
end end
@ -147,24 +156,6 @@ function SevenDayUI:refreshScrollRect()
end end
end end
-- function SevenDayUI:_addListeners()
-- uiMap["seven_day_ui.img_3.btn_all"]:addClickListener(function()
-- local list = DataManager.SevenDayData:getTaskListByDay(self.day or 1)
-- local ids = {}
-- for _, id in ipairs(list) do
-- if DataManager.SevenDayData:canClaimTask(id) then
-- table.insert(ids, id)
-- end
-- end
-- if not ids[1] then
-- return
-- end
-- ModuleManager.SevenDayManager:claimTask(ids)
-- end)
-- end
function SevenDayUI:sortTaskList(day) function SevenDayUI:sortTaskList(day)
self.day = day self.day = day
self.taskList = DataManager.SevenDayData:getTaskListByDay(day or 1) self.taskList = DataManager.SevenDayData:getTaskListByDay(day or 1)

5
lua/app/ui/main_city/cell/side_bar_seven_days_cell.lua
View File

@ -13,4 +13,9 @@ function SideBarSevenDaysCell:onClick()
ModuleManager.SevenDayManager:showUI() ModuleManager.SevenDayManager:showUI()
end end
function SideBarSevenDaysCell:getIsShowRedPoint()
return DataManager.SevenDayData:showRedPoint()
end
return SideBarSevenDaysCell return SideBarSevenDaysCell

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

@ -695,9 +695,9 @@ function MainCityUI:setLeftSideBarArrowRedPoint(isShow)
end end
if isShow then if isShow then
if ModuleManager.MaincityManager:getIsMainCityLeftSideBarClose() then if ModuleManager.MaincityManager:getIsMainCityLeftSideBarClose() then
self.leftArrowBtn:removeRedPoint()
else
self.leftArrowBtn:addRedPoint() self.leftArrowBtn:addRedPoint()
else
self.leftArrowBtn:removeRedPoint()
end end
else else
self.leftArrowBtn:removeRedPoint() self.leftArrowBtn:removeRedPoint()
@ -710,9 +710,9 @@ function MainCityUI:setRightSideBarArrowRedPoint(isShow)
end end
if isShow then if isShow then
if ModuleManager.MaincityManager:getIsMainCityRightSideBarClose() then if ModuleManager.MaincityManager:getIsMainCityRightSideBarClose() then
self.rightArrowBtn:removeRedPoint()
else
self.rightArrowBtn:addRedPoint() self.rightArrowBtn:addRedPoint()
else
self.rightArrowBtn:removeRedPoint()
end end
else else
self.rightArrowBtn:removeRedPoint() self.rightArrowBtn:removeRedPoint()