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

ui资源补充替换

Browse Source
This commit is contained in:
Fang 2023-06-13 15:45:38 +08:00
parent 90bd77a4b7
commit a788b1cb8c
98 changed files with 9527 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
local act_growup_gift = {
[1014]={
[10104]={
["hero_id"]=14001,
["recharge_id"]=7,
["reward"]={
@ -34,7 +34,7 @@ local act_growup_gift = {
["limit"]=1,
["value"]=800
},
[1024]={
[10204]={
["hero_id"]=14001,
["recharge_id"]=10,
["reward"]={
@ -69,7 +69,7 @@ local act_growup_gift = {
["limit"]=1,
["value"]=800
},
[1034]={
[10304]={
["hero_id"]=14001,
["recharge_id"]=13,
["reward"]={
@ -104,7 +104,7 @@ local act_growup_gift = {
["limit"]=1,
["value"]=800
},
[1044]={
[10404]={
["hero_id"]=14001,
["recharge_id"]=15,
["reward"]={
@ -139,7 +139,7 @@ local act_growup_gift = {
["limit"]=1,
["value"]=800
},
[1054]={
[10504]={
["hero_id"]=14001,
["recharge_id"]=17,
["reward"]={
@ -174,7 +174,7 @@ local act_growup_gift = {
["limit"]=1,
["value"]=800
},
[1064]={
[10604]={
["hero_id"]=14001,
["recharge_id"]=18,
["reward"]={
@ -210,7 +210,7 @@ local act_growup_gift = {
["value"]=800,
["last"]=1
},
[2014]={
[11104]={
["hero_id"]=24001,
["recharge_id"]=7,
["reward"]={
@ -246,7 +246,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[2024]={
[11204]={
["hero_id"]=24001,
["recharge_id"]=10,
["reward"]={
@ -282,7 +282,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[2034]={
[11304]={
["hero_id"]=24001,
["recharge_id"]=13,
["reward"]={
@ -318,7 +318,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[2044]={
[11404]={
["hero_id"]=24001,
["recharge_id"]=15,
["reward"]={
@ -354,7 +354,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[2054]={
[11504]={
["hero_id"]=24001,
["recharge_id"]=17,
["reward"]={
@ -390,7 +390,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[2064]={
[11604]={
["hero_id"]=24001,
["recharge_id"]=18,
["reward"]={
@ -427,7 +427,7 @@ local act_growup_gift = {
["value_2"]=1,
["last"]=1
},
[3014]={
[12104]={
["hero_id"]=34001,
["recharge_id"]=7,
["reward"]={
@ -463,7 +463,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[3024]={
[12204]={
["hero_id"]=34001,
["recharge_id"]=10,
["reward"]={
@ -499,7 +499,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[3034]={
[12304]={
["hero_id"]=34001,
["recharge_id"]=13,
["reward"]={
@ -535,7 +535,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[3044]={
[12404]={
["hero_id"]=34001,
["recharge_id"]=15,
["reward"]={
@ -571,7 +571,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[3054]={
[12504]={
["hero_id"]=34001,
["recharge_id"]=17,
["reward"]={
@ -607,7 +607,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[3064]={
[12604]={
["hero_id"]=34001,
["recharge_id"]=18,
["reward"]={
@ -644,7 +644,7 @@ local act_growup_gift = {
["value_2"]=1,
["last"]=1
},
[4014]={
[13104]={
["hero_id"]=44001,
["recharge_id"]=7,
["reward"]={
@ -680,7 +680,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[4024]={
[13204]={
["hero_id"]=44001,
["recharge_id"]=10,
["reward"]={
@ -716,7 +716,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[4034]={
[13304]={
["hero_id"]=44001,
["recharge_id"]=13,
["reward"]={
@ -752,7 +752,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[4044]={
[13404]={
["hero_id"]=44001,
["recharge_id"]=15,
["reward"]={
@ -788,7 +788,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[4054]={
[13504]={
["hero_id"]=44001,
["recharge_id"]=17,
["reward"]={
@ -824,7 +824,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[4064]={
[13604]={
["hero_id"]=44001,
["recharge_id"]=18,
["reward"]={
@ -861,7 +861,7 @@ local act_growup_gift = {
["value_2"]=1,
["last"]=1
},
[5014]={
[14104]={
["hero_id"]=54001,
["recharge_id"]=7,
["reward"]={
@ -897,7 +897,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[5024]={
[14204]={
["hero_id"]=54001,
["recharge_id"]=10,
["reward"]={
@ -933,7 +933,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[5034]={
[14304]={
["hero_id"]=54001,
["recharge_id"]=13,
["reward"]={
@ -969,7 +969,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[5044]={
[14404]={
["hero_id"]=54001,
["recharge_id"]=15,
["reward"]={
@ -1005,7 +1005,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[5054]={
[14504]={
["hero_id"]=54001,
["recharge_id"]=17,
["reward"]={
@ -1041,7 +1041,7 @@ local act_growup_gift = {
["value"]=800,
["value_2"]=1
},
[5064]={
[14604]={
["hero_id"]=54001,
["recharge_id"]=18,
["reward"]={

21
lua/app/config/avatar.lua Normal file
View File

@ -0,0 +1,21 @@
local avatar = {
[1001]={
["hero"]=12001
},
[2001]={
["hero"]=22001,
["unlock"]=1
},
[3001]={
["hero"]=32001,
["unlock"]=1
},
[4001]={
["hero"]=42001,
["unlock"]=1
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: fe59ab7c592d4c141b9fa28289bc898d
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["unlock"]=1
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 8d387a3ff3bff68488370d1ca79c39d5
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -223,9 +223,19 @@ local const = {
},
["dungeon_shards_limit"]={
["value"]=2
},
["change_name_cost"]={
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=200,
["num_for_nothing"]="VAhc"
}
}
}
local config = {
data=const,count=47
data=const,count=48
}
return config

36
lua/app/config/grid_type.lua
View File

@ -475,9 +475,43 @@ local grid_type = {
["can_fall"]=1,
["cant_link"]=1,
["break_sfx"]="sfx_piece_caocong_b01"
},
[36]={
["icon"]="battle_obstacle_lava",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["break_sfx"]="sfx_piece_rongyan_b01",
["effect"]=6,
["effect_sfx"]="sfx_piece_rongyan_b02",
["effect_trigger"]=1
},
[37]={
["icon"]="battle_obstacle_poisonous_mist",
["next_type"]=0,
["break_condition"]={
1,
3
},
["break_count"]=1,
["break_stay_element"]=1,
["can_fall"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["break_sfx"]="sfx_piece_duwu_b01",
["effect"]=6,
["effect_sfx"]="sfx_piece_duwu_b02",
["effect_trigger"]=1
}
}
local config = {
data=grid_type,count=36
data=grid_type,count=38
}
return config

7
lua/app/config/item.lua
View File

@ -346,6 +346,11 @@ local item = {
["qlt"]=1,
["icon"]="19"
},
[20]={
["type"]=1,
["qlt"]=5,
["icon"]="20"
},
[12001]={
["type"]=5,
["parameter"]=12001,
@ -495,6 +500,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

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

@ -229,6 +229,7 @@ local LocalizationGlobalConst =
DUNGEON_SHARDS_OPEN = "DUNGEON_SHARDS_OPEN",
MAIN_CHAPTER = "MAIN_CHAPTER",
SMASH = "SMASH",
DUNGEON_DESC = "DUNGEON_DESC",
}
return LocalizationGlobalConst

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

File diff suppressed because it is too large Load Diff

18
lua/app/config/strings/cn/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
["desc"]="解锁舞女后获得。"
},
[2001]={
["desc"]="刀妹的头像。"
},
[3001]={
["desc"]="洋葱头的头像。"
},
[4001]={
["desc"]="冰心的头像。"
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/cn/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: e550b6c1888c8c54a983504aadc97dd9
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/cn/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="初始头像框"
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/cn/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 7ebdcf5eea9b5744b93b6a66a8a3a4ac
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/cn/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
["name"]="30.魔都出口"
},
[31]={
["name"]="31.熔岩火山"
},
[32]={
["name"]="32.火山之下"
},
[33]={
["name"]="33.炙热海岸"
},
[34]={
["name"]="34.远古潜艇"
},
[35]={
["name"]="35.潜艇控制室"
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -229,6 +229,7 @@ local localization_global =
["DUNGEON_SHARDS_OPEN"] = "开启时间：周一、周三、周五、周日",
["MAIN_CHAPTER"] = "主线章节",
["SMASH"] = "扫荡",
["DUNGEON_DESC"] = "BOSS抗性：",
}
return localization_global

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

@ -75,6 +75,10 @@ local item = {
["name"]="随机碎片",
["desc"]="挂机可获得随机碎片，领取后数量和品质将根据关卡提升。"
},
[20]={
["name"]="高级随机碎片",
["desc"]="有概率随机获得优秀，稀有或史诗英雄碎片。"
},
[12001]={
["name"]="舞娘碎片",
["desc"]="舞娘碎片，凑齐可激活或升级。"
@ -177,6 +181,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/de/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/de/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 9dc40103a0748db44a9f1b68cf0aa638
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/de/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="Rundes Avatar, automatisch verfügbar."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/de/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 45e62fba12275294c9ca0781541e898f
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/de/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -58,6 +58,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -136,6 +139,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/en/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/en/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2efd30882537bcf4d85d41874b20a5d1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/en/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="The default avatar frame."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/en/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: feee83113a5ebf648b61119b6ea67052
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/en/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
["name"]="30. Demon City Exit"
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -74,6 +74,9 @@ local item = {
[19]={
["name"]="Random Shard",
["desc"]="AFK rewards include random shards. The quantity and quality will increase with the progress of the stages."
},
[20]={
},
[12001]={
["name"]="Dancer Shard",
@ -172,6 +175,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/fr/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/fr/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 1b7f9b5c90bd55244adec4028f50f7ae
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/fr/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="Cadre de tête arrondie, disponible au tout début."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/fr/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 91626068ba5bf40478d4c5f990dd336c
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/fr/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -58,6 +58,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -136,6 +139,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/id/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/id/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: be940f5ccbf143143bcb35878aa85b20
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/id/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="Bingkai Avatar bulat, dimiliki dari awal."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/id/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 9b782692fe3bc8046acedd1c14447f80
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/id/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -58,6 +58,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -136,6 +139,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/ja/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/ja/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 4e211405289be9d4fb6973d27e4c0454
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/ja/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="丸いフレーム、デフォルト獲得可能。"
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/ja/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: e19cdea5919e19a4b8bb6538c8b11347
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/ja/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -58,6 +58,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -136,6 +139,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/ko/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/ko/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 845ceb9424b01974aa158e74309a0190
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/ko/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="둥글고 윤택한 아이콘 프레임이며 기본으로 제공됩니다."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/ko/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 76981286f85df2347a2124c248246121
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/ko/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -58,6 +58,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -136,6 +139,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/pt/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/pt/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 0b2a3b866e0802941977489faf1a38fb
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/pt/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="Uma moldura do avatar redonda e lisa. Está em sua posse por padrão."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/pt/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: b9d9a6866f4d1ab4887e52bd0917cdc2
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/pt/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -57,6 +57,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -135,6 +138,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/ru/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/ru/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: ff8547e7031a5194d8b1d50552114e6e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/ru/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="Закругленная рамка аватара принадлежит по умолчанию."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/ru/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: b6be5004e7718fd47bff83daa57c7d73
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/ru/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -55,6 +55,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -133,6 +136,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/th/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/th/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: f47e3fc3edf30dc49b517e1f6d62d4f2
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/th/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="เฟรมอวาตาร์ที่โค้งมนสามารถใช้ได้ตามค่าเริ่มต้น"
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/th/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: b6035fe28448bba4d99008ec9615b2d8
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/th/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -55,6 +55,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -133,6 +136,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/vi/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/vi/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2e1f0c926cef57f4986fb3a41d1496d9
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/vi/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="Khung Avatar tròn trĩnh, mặc định có."
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/vi/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 386cfeaa1310f294887e8b821f909933
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/vi/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -58,6 +58,9 @@ local item = {
},
[19]={
},
[20]={
},
[12001]={
@ -136,6 +139,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

18
lua/app/config/strings/zh/avatar.lua Normal file
View File

@ -0,0 +1,18 @@
local avatar = {
[1001]={
},
[2001]={
},
[3001]={
},
[4001]={
}
}
local config = {
data=avatar,count=4
}
return config

10
lua/app/config/strings/zh/avatar.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: b7c423d2d55031d48bb7b8fecf330920
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

9
lua/app/config/strings/zh/avatar_frame.lua Normal file
View File

@ -0,0 +1,9 @@
local avatar_frame = {
[1000]={
["desc"]="圓潤的頭像框，默認擁有。"
}
}
local config = {
data=avatar_frame,count=1
}
return config

10
lua/app/config/strings/zh/avatar_frame.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6d3262a99efe6f84096157cbb75ae15e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

17
lua/app/config/strings/zh/chapter.lua
View File

@ -88,9 +88,24 @@ local chapter = {
},
[30]={
["name"]="30.魔都出口"
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
}
}
local config = {
data=chapter,count=30
data=chapter,count=35
}
return config

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

@ -74,6 +74,9 @@ local item = {
[19]={
["name"]="隨機碎片",
["desc"]="挂機可獲得隨機碎片，領取數量和品級將根據關卡提高。"
},
[20]={
},
[12001]={
["name"]="舞孃碎片",
@ -172,6 +175,6 @@ local item = {
}
}
local config = {
data=item,count=44
data=item,count=45
}
return config

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

@ -181,6 +181,7 @@ GConst.ATLAS_PATH = {
MAIN = "assets/arts/atlas/ui/main.asset",
BATTLE = "assets/arts/atlas/ui/battle.asset",
DAILY_CHALLENGE = "assets/arts/atlas/ui/daily_challenge.asset",
DUNGEON = "assets/arts/atlas/ui/dungeon.asset",
ICON_ITEM = "assets/arts/atlas/icon/item.asset",
UI_LOGIN = "assets/arts/atlas/ui/login.asset",
ICON_SKILL = "assets/arts/atlas/icon/skill.asset",

12
lua/app/ui/common/cell/reward_cell.lua
View File

@ -96,18 +96,6 @@ function RewardCell:_refreshItem(info, count)
end
end
function RewardCell:setVisibleFragment(isShow)
self.fragment:setVisible(isShow)
end
function RewardCell:setVisibleS(isShow)
self.sImg:setVisible(isShow)
end
function RewardCell:setRewardIcon(atlas, name)
self.icon:setSprite(atlas, name)
end
function RewardCell:setNumTx(str)
self.numTx:setText(str)
end

53
lua/app/ui/dungeon/dungeon_board_cell.lua
View File

@ -3,11 +3,10 @@ local DungeonBoardCell = class("DungeonBoardCell", BaseCell)
function DungeonBoardCell:init()
self.uiMap = self:getUIMap()
self.icon = self.uiMap["dungeon_board_cell.info.icon"]
self.txTitle = self.uiMap["dungeon_board_cell.info.icon.tx_title"]
self.countdown = self.uiMap["dungeon_board_cell.info.countdown"]
self.txCountdown = self.uiMap["dungeon_board_cell.info.countdown.tx_countdown"]
self.txOpen = self.uiMap["dungeon_board_cell.info.tx_open"]
self.txTitle = self.uiMap["dungeon_board_cell.tx_title"]
self.countdown = self.uiMap["dungeon_board_cell.countdown"]
self.txCountdown = self.uiMap["dungeon_board_cell.countdown.tx_countdown"]
self.txOpen = self.uiMap["dungeon_board_cell.tx_open"]
self.lock = self.uiMap["dungeon_board_cell.lock"]
self.lockTxLock = self.uiMap["dungeon_board_cell.lock.desc.tx_lock"]
self.lockTxCountdown = self.uiMap["dungeon_board_cell.lock.countdown.tx_countdown"]
@ -15,6 +14,8 @@ function DungeonBoardCell:init()
self.txStart = self.uiMap["dungeon_board_cell.btn_start.tx_btn"]
self.txTimes = self.uiMap["dungeon_board_cell.btn_start.tx_times"]
self.btnHelp = self.uiMap["dungeon_board_cell.btn_help"]
self.itemReward = self.uiMap["dungeon_board_cell.item_reward"]
self.itemRewardIcon = self.uiMap["dungeon_board_cell.item_reward.icon"]
self.btnStart:addClickListener(function()
-- 打开副本关卡选择界面
@ -37,8 +38,7 @@ end
function DungeonBoardCell:refreshInfo()
self.txTitle:setText(DataManager.DungeonData:getTitle(self.moduleKey))
self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey))
self.icon:setSprite(DataManager.DungeonData:getIcon(self.moduleKey))
-- self.baseObject:setTexture("assets/arts/textures/background/fund/fund_bg_1.png")
self.baseObject:setTexture(DataManager.DungeonData:getBanner(self.moduleKey))
if DataManager.DungeonData:isActive(self.moduleKey) then
self.btnStart:setVisible(true)
@ -47,14 +47,15 @@ function DungeonBoardCell:refreshInfo()
-- 红点
if DataManager.DungeonData:isCanChallenge(self.moduleKey) then
self.btnStart:addRedPoint(65, 35, 0.6)
self.btnStart:addRedPoint(110, 40, 0.6)
else
self.btnStart:removeRedPoint()
end
self.txOpen:setAnchoredPositionY(-115)
self.txOpen:setAnchoredPositionY(-110)
self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC))
self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.moduleKey)))
local timeStr = ":<color=#FF6464>" .. DataManager.DungeonData:getRemainTimes(self.moduleKey) .. "</color>"
self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr))
self:refreshCountdown(self.txCountdown)
else
self.btnStart:setVisible(false)
@ -68,29 +69,25 @@ function DungeonBoardCell:refreshInfo()
end
function DungeonBoardCell:refreshRewards()
self.scrollRect = self.uiMap["dungeon_board_cell.rewards"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
self.scrollRect:addInitCallback(function()
return GConst.TYPEOF_LUA_CLASS.REWARD_CELL
end)
self.scrollRect:clearCells()
local rewards = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey)
if rewards ~= nil then
local reward = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey)
if reward ~= nil then
-- 展示实际item
self.scrollRect:addRefreshCallback(function(index, cell)
cell:refreshItemById(rewards[index], 0)
local info = ConfigManager:getConfig("item")[reward]
if info == nil then
return
end
self.itemRewardIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon)
self.itemReward:setTouchEnable(true)
self.itemReward:addClickListener(function()
ModuleManager.TipsManager:showRewardTips(reward, info.type, self.itemReward)
end)
else
rewards = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey)
reward = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey)
-- 展示icon图片
self.scrollRect:addRefreshCallback(function(index, cell)
cell:setRewardIcon(rewards[index][1], rewards[index][2])
cell:setVisibleS(false)
cell:setVisibleFragment(false)
cell:setTouchEnable(false)
end)
self.itemRewardIcon:setSprite(reward[1], reward[2])
self.itemReward:setTouchEnable(false)
end
self.scrollRect:setTotalCount(#rewards)
end
function DungeonBoardCell:refreshCountdown(txCountdown)

102
lua/app/ui/dungeon/dungeon_difficulty_ui.lua
View File

@ -25,6 +25,7 @@ end
function DungeonDifficultyUI:onLoadRootComplete()
self.uiMap = self.root:genAllChildren()
self.icon = self.uiMap["dungeon_difficulty_ui.bg.title.icon_title"]
self.btnClose = self.uiMap["dungeon_difficulty_ui.bg.close_btn"]
self.btnStart = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_start"]
self.txStart = self.uiMap["dungeon_difficulty_ui.bg.btns.btn_start.tx_start"]
@ -42,19 +43,33 @@ function DungeonDifficultyUI:onLoadRootComplete()
self.buffObj = self.uiMap["dungeon_difficulty_ui.bg.boss_buff"]
self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"]
self.iconBuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.icon_buff"]
self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
self.rewardTx = self.uiMap["dungeon_difficulty_ui.bg.reward_desc"]
self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"]
self.rewardFirstIcon = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.icon"]
self.rewardFirstNum = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.num"]
self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"]
self.rewardPassIcon = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass.icon"]
self.rewardPassNum = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass.num"]
self.txFrist = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.tx_first"]
self.txLock = self.uiMap["dungeon_difficulty_ui.bg.tx_lock"]
self.btnGroup = self.uiMap["dungeon_difficulty_ui.bg.btns"]
local iconPath = DataManager.DungeonData:getIcon(self.module)
self.icon:setSprite(iconPath[1], iconPath[2], function()
self.icon:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
end)
self.txTitle:setText(DataManager.DungeonData:getTitle(self.module))
self.txDifficulty:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_STAGE))
self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC))
self.txSweep:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH))
local cost = DataManager.DungeonData:getChallengeHpCost(self.module)
self.txStartCost:setText("-"..GFunc.getRewardNum(cost))
self.txSweepCost:setText("-"..GFunc.getRewardNum(cost))
self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.module)))
self.txStartCost:setText(GFunc.getRewardNum(cost))
self.txSweepCost:setText(GFunc.getRewardNum(cost))
local timeString = ":<color=#FF8181>" .. DataManager.DungeonData:getRemainTimes(self.module).."</color>"
self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeString))
self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS))
self.rewardTx:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)..":")
self.txLock:setText(I18N:getGlobalText(I18N.GlobalConst.PASS_REQUIRE))
self:refreshDifficulty()
@ -70,7 +85,7 @@ function DungeonDifficultyUI:onLoadRootComplete()
ModuleManager.DungeonManager:reqSweep(self.module, self.curId)
end)
self.arrowLeft:addClickListener(function()
if self:isCanChallengeMinId() then
if self:isMinId() then
return
end
@ -78,7 +93,7 @@ function DungeonDifficultyUI:onLoadRootComplete()
self:refreshDifficulty()
end)
self.arrowRight:addClickListener(function()
if self:isCanChallengeMaxId() then
if self:isMaxId() then
return
end
@ -88,8 +103,6 @@ function DungeonDifficultyUI:onLoadRootComplete()
end
function DungeonDifficultyUI:refreshDifficulty()
self.arrowLeft:setActive(not self:isCanChallengeMinId())
self.arrowRight:setActive(not self:isCanChallengeMaxId())
self.btnSweep:setActive(self:isCanSweepId())
self.txLevel:setText(tostring(self.curId))
@ -97,10 +110,14 @@ function DungeonDifficultyUI:refreshDifficulty()
local buff = DataManager.DungeonData:getBossBuff(self.module, self.curId)
local desc = DataManager.DungeonData:getRule(self.module)
if buff then
local cfg = ConfigManager:getConfigWithOtherKey("buff", "name")[buff.type]
self.txDesc:setActive(false)
self.buffObj:setActive(true)
self.txbuff:setText("")
self.iconBuff:setSprite("","")
self.txbuff:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_DESC))
self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, cfg.icon)
self.iconBuff:addClickListener(function()
ModuleManager.TipsManager:showDescTips(GFunc.getBuffDesc(buff.type, buff.num), self.iconBuff)
end)
elseif desc then
self.txDesc:setActive(true)
self.buffObj:setActive(false)
@ -110,16 +127,48 @@ function DungeonDifficultyUI:refreshDifficulty()
self.buffObj:setActive(false)
end
-- 箭头
self.txLock:setActive(not self:isCanChallengeId())
self.btnGroup:setActive(self:isCanChallengeId())
self.arrowRight:setActive(not self:isMaxId())
self.arrowLeft:setActive(not self:isMinId())
-- 奖励
local rewardFirst = DataManager.DungeonData:getFirstReward(self.module, self.curId)
local rewardPass = DataManager.DungeonData:getPassReward(self.module, self.curId)
if not self:isCanSweepId() and rewardFirst then
self.rewardFirst:setVisible(true)
self.rewardFirst:refreshByConfig(rewardFirst)
else
self.rewardFirst:setVisible(false)
local reward = DataManager.DungeonData:getBoardShowRewardId(self.module)
if reward ~= nil then
-- 展示实际item
local info = ConfigManager:getConfig("item")[reward]
if info == nil then
return
end
self.rewardPass:refreshByConfig(rewardPass)
self.rewardFirstIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon)
self.rewardPassIcon:setSprite(GConst.ATLAS_PATH.ICON_ITEM, info.icon)
self.rewardFirst:setTouchEnable(true)
self.rewardPass:setTouchEnable(true)
self.rewardFirst:addClickListener(function()
ModuleManager.TipsManager:showRewardTips(reward, info.type, self.rewardFirst)
end)
self.rewardPass:addClickListener(function()
ModuleManager.TipsManager:showRewardTips(reward, info.type, self.rewardPass)
end)
else
reward = DataManager.DungeonData:getBoardShowRewardIcon(self.module)
-- 展示icon图片
self.rewardFirstIcon:setSprite(reward[1], reward[2])
self.rewardPassIcon:setSprite(reward[1], reward[2])
self.rewardFirst:setTouchEnable(false)
self.rewardPass:setTouchEnable(false)
end
local firstNum = DataManager.DungeonData:getFirstRewardNum(self.module, self.curId)
local passNum = DataManager.DungeonData:getPassRewardNum(self.module, self.curId)
if not self:isCanSweepId() and firstNum then
self.rewardFirst:setActive(true)
self.rewardFirstNum:setText(firstNum)
else
self.rewardFirst:setActive(false)
end
self.rewardPassNum:setText(passNum)
end
-- 是否是可扫荡关卡
@ -127,13 +176,18 @@ function DungeonDifficultyUI:isCanSweepId()
return self.curId < DataManager.DungeonData:getUnlockMaxId(self.module)
end
--是否是能挑战的最大关卡
function DungeonDifficultyUI:isCanChallengeMaxId()
return self.curId == DataManager.DungeonData:getUnlockMaxId(self.module)
--是否是可挑战关卡
function DungeonDifficultyUI:isCanChallengeId()
return self.curId <= DataManager.DungeonData:getUnlockMaxId(self.module)
end
--是否是能挑战的最小关卡
function DungeonDifficultyUI:isCanChallengeMinId()
-- 是最大副本id
function DungeonDifficultyUI:isMaxId()
return self.curId == DataManager.DungeonData:getConfigMaxId(self.module)
end
--是最小关卡
function DungeonDifficultyUI:isMinId()
return self.curId == 1
end

4
lua/app/ui/main_city/component/chapter_comp.lua
View File

@ -19,6 +19,10 @@ function ChapterComp:getEntranceIcon()
return GConst.ATLAS_PATH.MAIN,"main_dec_5"
end
function ChapterComp:getEntranceBg()
return GConst.ATLAS_PATH.MAIN,"main_btn_ringt"
end
function ChapterComp:getHpCost()
return DataManager.ChapterData:getFightCost()
end

4
lua/app/ui/main_city/component/daily_challenge_comp.lua
View File

@ -13,6 +13,10 @@ function DailyChallengeComp:getEntranceIcon()
return GConst.ATLAS_PATH.MAIN,"main_dec_1"
end
function DailyChallengeComp:getEntranceBg()
return GConst.ATLAS_PATH.MAIN,"main_btn_ligth"
end
function DailyChallengeComp:getShowEntranceRedPoint()
return DataManager.DailyChallengeData:isMeetChallenge()
end

4
lua/app/ui/main_city/component/dungeon_comp.lua
View File

@ -13,6 +13,10 @@ function DungeonComp:getEntranceIcon()
return GConst.ATLAS_PATH.MAIN,"main_dec_2"
end
function DungeonComp:getEntranceBg()
return GConst.ATLAS_PATH.MAIN,"main_btn_ringt"
end
function DungeonComp:getShowEntranceRedPoint()
return DataManager.DungeonData:isCanChallengeAnyone()
end

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

@ -105,6 +105,8 @@ function MainComp:refreshLeftBtn()
end
self.leftBtn:setActive(true)
local bgAtlas, bgName = moduleCell:getEntranceBg()
self.uiMap["main_comp.left_btn.bg"]:setSprite(bgAtlas, bgName)
local iconAtlas, iconName = moduleCell:getEntranceIcon()
self.uiMap["main_comp.left_btn.desc"]:setText(moduleCell:getEntranceName())
self.uiMap["main_comp.left_btn.icon"]:setSprite(iconAtlas, iconName, function()
@ -137,6 +139,8 @@ function MainComp:refreshRightBtn()
end
self.rightBtn:setActive(true)
local bgAtlas, bgName = moduleCell:getEntranceBg()
self.uiMap["main_comp.right_btn.bg"]:setSprite(bgAtlas, bgName)
local iconAtlas, iconName = moduleCell:getEntranceIcon()
self.uiMap["main_comp.right_btn.desc"]:setText(moduleCell:getEntranceName())
self.uiMap["main_comp.right_btn.icon"]:setSprite(iconAtlas, iconName, function()

4
lua/app/ui/main_city/component/main_comp_base_cell.lua
View File

@ -15,6 +15,10 @@ function MainCompBaseCell:getEntranceIcon()
return "",""
end
function MainCompBaseCell:getEntranceBg()
return "",""
end
function MainCompBaseCell:getShowEntranceRedPoint()
return false
end

20
lua/app/userdata/dungeon/dungeon_data.lua
View File

@ -267,27 +267,31 @@ function DungeonData:getBoardShowRewardId(moduleKey)
return self.dataDungeons[moduleKey]:getBoardShowRewardId()
end
-- 获取展示副本首通奖励
function DungeonData:getFirstReward(moduleKey, id)
-- 获取展示副本首通奖励个数
function DungeonData:getFirstRewardNum(moduleKey, id)
-- 通关后，不展示首通奖励
return self.dataDungeons[moduleKey]:getFirstReward(id)
return self.dataDungeons[moduleKey]:getFirstRewardNum(id)
end
-- 获取展示副本通关奖励
function DungeonData:getPassReward(moduleKey, id)
-- 波次奖励数量==通关+波次奖励数量
return self.dataDungeons[moduleKey]:getPassReward(id)
-- 获取展示副本通关奖励个数
function DungeonData:getPassRewardNum(moduleKey, id)
return self.dataDungeons[moduleKey]:getPassRewardNum(id)
end
--获取副本已解锁最大id
function DungeonData:getUnlockMaxId(moduleKey)
local id = self.dataDungeons[moduleKey]:getPassedMaxId() + 1
if id > #self.dataDungeons[moduleKey]:getConfig() then
if id > self:getConfigMaxId(moduleKey) then
id = id - 1
end
return id
end
-- 获取副本配置的最高关卡
function DungeonData:getConfigMaxId(moduleKey)
return #self.dataDungeons[moduleKey]:getConfig()
end
--获取副本已通关的最高关卡id
function DungeonData:getPassedMaxId(moduleKey)
return self.dataDungeons[moduleKey]:getPassedMaxId()

8
lua/app/userdata/dungeon/dungeon_data_base_comp.lua
View File

@ -86,13 +86,13 @@ function DungeonDataBaseComp:getBoardShowRewardId()
return nil
end
-- 获取首通奖励
function DungeonDataBaseComp:getFirstReward()
-- 获取首通奖励个数
function DungeonDataBaseComp:getFirstRewardNum()
return nil
end
-- 获取通关奖励（通关+波次奖励 or 百分比奖励）
function DungeonDataBaseComp:getPassReward()
-- 获取通关奖励个数
function DungeonDataBaseComp:getPassRewardNum()
return nil
end

14
lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
View File

@ -46,11 +46,11 @@ function DungeonGoldDataComp:getOpenWeekString()
end
function DungeonGoldDataComp:getIcon()
return GConst.ATLAS_PATH.COMMON,"common_chest_1"
return {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_1"}
end
function DungeonGoldDataComp:getBanner()
return ""
return "assets/arts/textures/background/dungeon/dungeon_bg_1.png"
end
function DungeonGoldDataComp:getChallengeHpCost()
@ -62,15 +62,15 @@ function DungeonGoldDataComp:getTodayMaxCount()
end
function DungeonGoldDataComp:getBoardShowRewardId()
return {1}
return 1
end
function DungeonGoldDataComp:getFirstReward(id)
return ConfigManager:getConfig("chapter_dungeon_gold")[id].first_pass_reward
function DungeonGoldDataComp:getFirstRewardNum(id)
return GFunc.getRewardNum(ConfigManager:getConfig("chapter_dungeon_gold")[id].first_pass_reward)
end
function DungeonGoldDataComp:getPassReward(id)
return ConfigManager:getConfig("chapter_dungeon_gold")[id].percent_reward
function DungeonGoldDataComp:getPassRewardNum(id)
return GFunc.getRewardNum(ConfigManager:getConfig("chapter_dungeon_gold")[id].percent_reward)
end
return DungeonGoldDataComp

36
lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
View File

@ -42,16 +42,15 @@ function DungeonShardsDataComp:getOpenWeekString()
end
function DungeonShardsDataComp:getBossBuff(id)
Logger.printTable(self:getConfig()[id])
return self:getConfig()[id].effect
return self:getConfig()[id].effect[1]
end
function DungeonShardsDataComp:getIcon()
return GConst.ATLAS_PATH.COMMON,"common_dec_3"
return {GConst.ATLAS_PATH.DUNGEON,"dungeon_dec_2"}
end
function DungeonShardsDataComp:getBanner()
return ""
return "assets/arts/textures/background/dungeon/dungeon_bg_2.png"
end
function DungeonShardsDataComp:getChallengeHpCost()
@ -63,25 +62,28 @@ function DungeonShardsDataComp:getTodayMaxCount()
end
function DungeonShardsDataComp:getBoardShowRewardIcon()
return {
[1]={
GConst.ATLAS_PATH.ICON_ITEM,"4"
},
[2]={
GConst.ATLAS_PATH.ICON_ITEM,"5"
}
}
return {GConst.ATLAS_PATH.ICON_ITEM,"20"}
end
function DungeonShardsDataComp:getFirstReward(id)
return ConfigManager:getConfig("chapter_dungeon_shards")[id].first_pass_reward
function DungeonShardsDataComp:getFirstRewardNum(id)
local count = 0
for index, reward in ipairs(ConfigManager:getConfig("chapter_dungeon_shards")[id].first_pass_reward) do
count = count + GFunc.getRewardNum(reward)
end
return count
end
function DungeonShardsDataComp:getPassReward(id)
function DungeonShardsDataComp:getPassRewardNum(id)
local count = 0
local pass = ConfigManager:getConfig("chapter_dungeon_shards")[id].pass_reward
local wave = ConfigManager:getConfig("chapter_dungeon_shards")[id].wave_reward
-- todo 处理奖励结构
return pass
for index, reward in ipairs(pass) do
count = count + GFunc.getRewardNum(reward)
end
for index, reward in ipairs(wave) do
count = count + GFunc.getRewardNum(reward)
end
return count
end
return DungeonShardsDataComp