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

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

Browse Source
This commit is contained in:
xiekaidong 2023-06-06 10:59:37 +08:00
commit 3c1b73cebe
12 changed files with 117 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17450,41 +17450,41 @@ local chapter_board = {
18,
0
},
{
22,
1
},
{
22,
3
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
22,
2
},
{
0,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
0,
0
},
{
0,
0
22,
4
},
{
18,
@ -17511,8 +17511,8 @@ local chapter_board = {
0
},
{
0,
0
22,
5
},
{
18,
@ -17546,21 +17546,21 @@ local chapter_board = {
1,
0
},
{
22,
2
},
{
22,
2
},
{
22,
1
},
{
22,
2
},
{
22,
3
},
{
22,
4
}
},
["mystery_box_board"]={
@ -17648,41 +17648,41 @@ local chapter_board = {
18,
0
},
{
22,
1
},
{
22,
3
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
22,
2
},
{
0,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
18,
0
},
{
0,
0
},
{
0,
0
22,
4
},
{
18,
@ -17705,12 +17705,12 @@ local chapter_board = {
4
},
{
14,
17,
0
},
{
0,
0
22,
5
},
{
18,
@ -17744,21 +17744,21 @@ local chapter_board = {
1,
0
},
{
22,
2
},
{
17,
0
},
{
22,
1
},
{
22,
2
},
{
22,
3
},
{
22,
4
}
}
},

18
lua/app/config/chapter_board_daily_challenge.lua
View File

@ -3071,7 +3071,7 @@ local chapter_board_daily_challenge = {
},
{
0,
0
4
},
{
0,
@ -3430,8 +3430,8 @@ local chapter_board_daily_challenge = {
0
},
{
0,
2
1,
0
},
{
0,
@ -3450,7 +3450,7 @@ local chapter_board_daily_challenge = {
4
},
{
31,
1,
0
},
{
@ -3658,7 +3658,7 @@ local chapter_board_daily_challenge = {
2
},
{
31,
1,
0
},
{
@ -4654,8 +4654,8 @@ local chapter_board_daily_challenge = {
0
},
{
34,
1
1,
0
},
{
32,
@ -4682,8 +4682,8 @@ local chapter_board_daily_challenge = {
0
},
{
34,
2
1,
0
},
{
32,

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

@ -213,6 +213,8 @@ local LocalizationGlobalConst =
SETTING_DESC_23 = "SETTING_DESC_23",
SETTING_DESC_25 = "SETTING_DESC_25",
BIND_TIPS_DESC = "BIND_TIPS_DESC",
GET_SEVER_ERROR = "GET_SEVER_ERROR",
PAY_FAILED_DESC_1 = "PAY_FAILED_DESC_1",
}
return LocalizationGlobalConst

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

@ -5212,6 +5212,9 @@ local skill = {
["skill_position"]=2,
["cd"]=2,
["cd_start"]=0,
["sound_hit"]={
3300120
},
["name_act"]="skill01"
},
[10016]={

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

@ -213,6 +213,8 @@ local localization_global =
["SETTING_DESC_23"] = "当前有订单正在处理中，请稍后再试",
["SETTING_DESC_25"] = "支付取消",
["BIND_TIPS_DESC"] = "为了您的帐户安全，请绑定账号",
["GET_SEVER_ERROR"] = "请求服务器失败，请重试",
["PAY_FAILED_DESC_1"] = "订单异常，请联系客服处理",
}
return localization_global

10
lua/app/config/strings/en/global.lua
View File

@ -42,13 +42,13 @@ local localization_global =
["BATTLE_DESC_8"] = "Additional heroes available for deploying",
["MAIN_BTN_2"] = "Hero",
["MAIN_DESC_1"] = "Chapter {0}",
["TIME_STR_DHM"] = "{0} d {1} h {2} min",
["TIME_STR_DHM"] = "{0} d {1} h {2} m",
["TIME_STR_M"] = "{0} min",
["TIME_STR_MS"] = "{0} min {1} sec",
["TIME_STR_MS"] = "{0} m {1} s",
["TIME_STR_S"] = "{0} sec",
["TIME_STR_DH"] = "{0} d {1} h",
["TIME_STR_HMS"] = "{0} h {1} min {2} sec",
["TIME_STR_HM"] = "{0} h {1} min",
["TIME_STR_HMS"] = "{0} h {1} m {2} s",
["TIME_STR_HM"] = "{0} h {1} m",
["TIME_STR_D"] = "{0} d",
["TIME_MS"] = "{0}:{1}",
["TIME_HMS"] = "{0}:{1}:{2}",
@ -213,6 +213,8 @@ local localization_global =
["SETTING_DESC_23"] = "An order is currently being processed, please try again later",
["SETTING_DESC_25"] = "Payment Cancellation",
["BIND_TIPS_DESC"] = "For the security of your account, please bind your accounts",
["GET_SEVER_ERROR"] = "Request to server failed, please try again",
["PAY_FAILED_DESC_1"] = "Order abnormal, please contact customer support",
}
return localization_global

2
lua/app/config/strings/zh/global.lua
View File

@ -213,6 +213,8 @@ local localization_global =
["SETTING_DESC_23"] = "當前有訂單正在處理中，請稍後再試",
["SETTING_DESC_25"] = "支付取消",
["BIND_TIPS_DESC"] = "爲了您的帳戶安全，請綁定賬號",
["GET_SEVER_ERROR"] = "請求服務器失敗，請重試",
["PAY_FAILED_DESC_1"] = "訂單異常，請聯繫客服處理",
}
return localization_global

15
lua/app/config/task.lua
View File

@ -117,7 +117,6 @@ local task = {
["num_for_nothing"]="Uwg="
}
},
["lock"]=3,
["icon"]="1"
},
[9]={
@ -133,7 +132,6 @@ local task = {
["num_for_nothing"]="UQ0="
}
},
["lock"]=3,
["icon"]="1"
},
[10]={
@ -149,7 +147,6 @@ local task = {
["num_for_nothing"]="Vwhc"
}
},
["lock"]=3,
["icon"]="1"
},
[11]={
@ -165,7 +162,6 @@ local task = {
["num_for_nothing"]="Vw1c"
}
},
["lock"]=3,
["icon"]="1"
},
[12]={
@ -241,7 +237,6 @@ local task = {
["num_for_nothing"]="Uwg="
}
},
["lock"]=3,
["icon"]="2"
},
[17]={
@ -257,7 +252,6 @@ local task = {
["num_for_nothing"]="UQ0="
}
},
["lock"]=3,
["icon"]="2"
},
[18]={
@ -273,7 +267,6 @@ local task = {
["num_for_nothing"]="Vwhc"
}
},
["lock"]=3,
["icon"]="2"
},
[19]={
@ -289,7 +282,6 @@ local task = {
["num_for_nothing"]="Vw1c"
}
},
["lock"]=3,
["icon"]="2"
},
[20]={
@ -429,7 +421,6 @@ local task = {
["num_for_nothing"]="Uwg="
}
},
["lock"]=5,
["icon"]="5"
},
[29]={
@ -445,7 +436,6 @@ local task = {
["num_for_nothing"]="UQ0="
}
},
["lock"]=5,
["icon"]="5"
},
[30]={
@ -461,7 +451,6 @@ local task = {
["num_for_nothing"]="Vwhc"
}
},
["lock"]=5,
["icon"]="5"
},
[31]={
@ -477,7 +466,6 @@ local task = {
["num_for_nothing"]="Vw1c"
}
},
["lock"]=5,
["icon"]="5"
},
[32]={
@ -1168,7 +1156,6 @@ local task = {
["num_for_nothing"]="Vw1c"
}
},
["lock"]=3,
["icon"]="1"
},
[78]={
@ -1184,7 +1171,6 @@ local task = {
["num_for_nothing"]="Vw1c"
}
},
["lock"]=3,
["icon"]="2"
},
[79]={
@ -1231,7 +1217,6 @@ local task = {
["num_for_nothing"]="Vw1c"
}
},
["lock"]=5,
["icon"]="5"
},
[82]={

8
lua/app/config/tutorial.lua
View File

@ -121,7 +121,7 @@ local tutorial = {
["arrow_direction"]=2,
["arrow_offset"]={
0,
0
50
},
["show_mask"]=1,
["square_size"]={
@ -329,7 +329,7 @@ local tutorial = {
["arrow_direction"]=2,
["arrow_offset"]={
0,
0
50
},
["show_mask"]=1,
["square_size"]={
@ -431,7 +431,7 @@ local tutorial = {
["arrow_direction"]=2,
["arrow_offset"]={
0,
0
50
},
["show_mask"]=1,
["square_size"]={
@ -459,7 +459,7 @@ local tutorial = {
["arrow_direction"]=2,
["arrow_offset"]={
0,
0
50
}
},
[50010]={

2
lua/app/ui/battle/battle_result_ui.lua
View File

@ -33,9 +33,11 @@ function BattleResultUI:onClose()
end
if self.animRewards then
for idx, anim in pairs(self.animRewards) do
if anim then
anim:Kill()
end
end
end
end
function BattleResultUI:onLoadRootComplete()

2
lua/app/ui/main_city/component/main_comp.lua
View File

@ -35,7 +35,7 @@ function MainComp:refreshModule(selectModule)
elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE then
-- 切换到每日挑战
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE)
if not Datamanager.TutorialData:getIsInTutorial() and DataManager.DailyChallengeData:getIsPopTask() then
if not DataManager.TutorialData:getIsInTutorial() and DataManager.DailyChallengeData:getIsPopTask() then
ModuleManager.DailyChallengeManager:showBattleTaskUI()
end
end

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

@ -954,6 +954,10 @@ function MainCityUI:checkGift()
if DataManager.TutorialData:getIsHaveTutorial() then
return
end
-- 非主线章节界面不处理（只在主线章节也就是主界面弹）
if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN or self.subComps[self.selectedIndex]:getCurModuleType() ~= GConst.MainCityConst.MAIN_MODULE.CHAPTER then
return
end
-- 章节礼包
local chapterPopUpGifts = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT)
-- 通用礼包