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

显示修复

Browse Source
This commit is contained in:
Fang 2023-07-05 15:55:39 +08:00
parent 960bf2eb5f
commit f24f8d5e75
22 changed files with 294 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lua/app/config/strings/cn/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="新的挑战玩法开启了！"
},
["tutorial_txt_8"]={
["value"]="欢迎来到竞技场，请点击匹配。"
},
["tutorial_txt_9"]={
["value"]="对手不强，让我们直接开始。"
},
["tutorial_txt_10"]={
["value"]="请点击这里查看对战规则。"
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/de/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
},
["tutorial_txt_8"]={
},
["tutorial_txt_9"]={
},
["tutorial_txt_10"]={
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/en/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="New challenge gameplay is unlocked!"
},
["tutorial_txt_8"]={
["value"]="Welcome to the Arena. Please click matchmaking."
},
["tutorial_txt_9"]={
["value"]="The opponent is not strong. Let's start."
},
["tutorial_txt_10"]={
["value"]="Please click here to view the battle rules."
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/es/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="¡Ha comenzado una nueva jugabilidad de desafío!"
},
["tutorial_txt_8"]={
["value"]="¡Bienvenido(a) a la Arena! Haz clic para emparejar."
},
["tutorial_txt_9"]={
["value"]="El oponente no es fuerte. Empecemos."
},
["tutorial_txt_10"]={
["value"]="Haz clic aquí para ver las reglas del juego."
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/fr/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
},
["tutorial_txt_8"]={
},
["tutorial_txt_9"]={
},
["tutorial_txt_10"]={
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/id/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="Gameplay tantangan baru telah dimulai!"
},
["tutorial_txt_8"]={
["value"]="Selamat datang di Arena. Silakan ketuk matchmaking."
},
["tutorial_txt_9"]={
["value"]="Lawannya tidak kuat. Mari kita mulai."
},
["tutorial_txt_10"]={
["value"]="Silakan ketuk di sini untuk melihat aturan battle."
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/ja/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="新たな挑戦コンテンツが解放されました！"
},
["tutorial_txt_8"]={
["value"]="闘技場へようこそ。マッチングをタップしてください。"
},
["tutorial_txt_9"]={
["value"]="相手は弱いので、さっそく始めましょう。"
},
["tutorial_txt_10"]={
["value"]="ここをタップして、対戦ルールを確認してください。"
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/ko/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="새롭게 챌린지 모드가 오픈되었습니다!"
},
["tutorial_txt_8"]={
["value"]="아레나에 오신 것을 환영합니다. 클릭하여 매칭하세요."
},
["tutorial_txt_9"]={
["value"]="강한 상대가 아닙니다. 바로 시작해 볼까요?"
},
["tutorial_txt_10"]={
["value"]="대결 규칙을 보려면 이곳을 클릭해 주세요."
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/pt/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="Novo modo de desafio disponível!"
},
["tutorial_txt_8"]={
["value"]="Bem-vindo(a) à Arena! Clique em pareamento."
},
["tutorial_txt_9"]={
["value"]="O oponente não é muito forte. Vamos começar diretamente."
},
["tutorial_txt_10"]={
["value"]="Confira as regras de batalha aqui."
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

36
lua/app/config/strings/ru/tutorial.lua Normal file
View File

@ -0,0 +1,36 @@
local tutorial = {
["tutorial_txt_1"]={
},
["tutorial_txt_2"]={
},
["tutorial_txt_3"]={
},
["tutorial_txt_4"]={
},
["tutorial_txt_5"]={
},
["tutorial_txt_6"]={
},
["tutorial_txt_7"]={
},
["tutorial_txt_8"]={
},
["tutorial_txt_9"]={
},
["tutorial_txt_10"]={
}
}
local config = {
data=tutorial,count=10
}
return config

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

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

11
lua/app/config/strings/th/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="วิธีการเล่นท้าทายใหม่เปิดแล้ว!"
},
["tutorial_txt_8"]={
["value"]="ยินดีต้อนรับสู่อารีน่า แตะเพื่อจับคู่"
},
["tutorial_txt_9"]={
["value"]="คู่ต่อสู้ไม่แข็งแกร่ง เริ่มโดยตรงกันเถอะ"
},
["tutorial_txt_10"]={
["value"]="กรุณาแตะที่นี่เพื่อดูกติกาของเกม"
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/vi/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="Đã mở lối chơi khiêu chiến mới!"
},
["tutorial_txt_8"]={
["value"]="Chào mừng đến đấu trường, hãy ấn ghép đối thủ."
},
["tutorial_txt_9"]={
["value"]="Đối thủ không mạnh, trực tiếp bắt đầu."
},
["tutorial_txt_10"]={
["value"]="Hãy ấn vào đây xem quy tắc."
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

11
lua/app/config/strings/zh/tutorial.lua
View File

@ -19,9 +19,18 @@ local tutorial = {
},
["tutorial_txt_7"]={
["value"]="新的挑戰玩法開啟了！"
},
["tutorial_txt_8"]={
["value"]="歡迎來到競技場，請點擊匹配。"
},
["tutorial_txt_9"]={
["value"]="對手不強，讓我們直接開始。"
},
["tutorial_txt_10"]={
["value"]="請點擊這裡查看對戰規則。"
}
}
local config = {
data=tutorial,count=7
data=tutorial,count=10
}
return config

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

@ -465,7 +465,7 @@ local tutorial = {
[50000]={
["next_id"]=50010,
["type"]=2,
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/left_btn",
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/left/daily_challenge",
["arrow_direction"]=2,
["arrow_offset"]={
0,
@ -499,7 +499,7 @@ local tutorial = {
0,
180
},
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right_btn",
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/right/dungeon",
["arrow_direction"]=1,
["arrow_offset"]={
0,
@ -511,9 +511,117 @@ local tutorial = {
0,
0
}
},
[70000]={
["next_id"]=70010,
["type"]=2,
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/left/arena",
["arrow_direction"]=4,
["arrow_offset"]={
20,
0
},
["show_mask"]=2,
["circle_r"]=100,
["circle_offset"]={
0,
0
}
},
[70010]={
["next_id"]=70020,
["type"]=3,
["txt"]="tutorial_txt_8",
["txt_offset"]={
0,
180
},
["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/fight_btn",
["arrow_direction"]=1,
["arrow_offset"]={
0,
-50
}
},
[70020]={
["next_id"]=70030,
["type"]=4,
["finish"]=1,
["finish_parameter"]=3
},
[70030]={
["next_id"]=70040,
["type"]=3,
["txt"]="tutorial_txt_9",
["txt_offset"]={
0,
180
},
["target_name"]="arena_match_ui(Clone)/match_result/btn_start",
["arrow_direction"]=1,
["arrow_offset"]={
0,
-50
}
},
[70040]={
["next_id"]=70050,
["type"]=4,
["finish"]=1,
["finish_parameter"]=4
},
[70050]={
["next_id"]=70060,
["type"]=3,
["txt"]="tutorial_txt_10",
["txt_offset"]={
0,
180
},
["target_name"]="battle_ui_pvp(Clone)/top_node/close_btn",
["arrow_direction"]=1,
["arrow_offset"]={
0,
-50
},
["show_mask"]=2,
["circle_r"]=100,
["circle_offset"]={
0,
0
}
},
[70060]={
["next_id"]=70070,
["type"]=2,
["target_name"]="battle_arena_pause_ui(Clone)/skill_node/next_btn",
["arrow_direction"]=1,
["arrow_offset"]={
0,
-50
}
},
[70070]={
["next_id"]=70080,
["type"]=2,
["target_name"]="battle_arena_pause_ui(Clone)/skill_node/next_btn",
["arrow_direction"]=1,
["arrow_offset"]={
0,
-50
}
},
[70080]={
["type"]=2,
["target_name"]="battle_arena_pause_ui(Clone)/continue_btn",
["arrow_direction"]=2,
["arrow_offset"]={
0,
50
}
}
}
local config = {
data=tutorial,count=38
data=tutorial,count=47
}
return config

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

@ -22,9 +22,13 @@ local tutorial_start = {
[6]={
["start_id"]=60000,
["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
},
[7]={
["start_id"]=70000,
["uires_path"]="assets/prefabs/ui/main_city/main_ui.prefab"
}
}
local config = {
data=tutorial_start,count=6
data=tutorial_start,count=7
}
return config

3
lua/app/ui/arena/arena_formation_ui.lua
View File

@ -70,6 +70,9 @@ function ArenaFormationUI:onLoadRootComplete()
self:bind(DataManager.BagData.ItemData, "dirty", function()
self:onRefresh()
end)
self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function()
self:closeUI()
end)
end
function ArenaFormationUI:onRefresh()

3
lua/app/ui/arena/arena_match_ui.lua
View File

@ -114,6 +114,9 @@ function ArenaMatchUI:onLoadRootComplete()
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_31))
self:closeUI()
end)
self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function()
self:closeUI()
end)
end
function ArenaMatchUI:onRefresh()

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

@ -310,12 +310,12 @@ function BattleResultUI:refreshArenaBoxNode()
-- 胜利宝箱
self.arenaBoxNode:setSprite(GConst.ATLAS_PATH.ARENA, "arena_bg_6")
self.arenaBoxImgIcon:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_5")
self.arenaBoxTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_32))
self.arenaBoxTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_33))
else
-- 鼓励宝箱
self.arenaBoxNode:setSprite(GConst.ATLAS_PATH.ARENA, "arena_bg_5")
self.arenaBoxImgIcon:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_4")
self.arenaBoxTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_33))
self.arenaBoxTxTitle:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_34))
end
end

4
lua/app/ui/shop/box_hero_ui.lua
View File

@ -114,10 +114,10 @@ function BoxHeroUI:refreshArenaAdBox()
end)
if self.arenaBoxInfo.isWin then
self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_32))
self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_33))
self.boxImg:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_5")
else
self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_33))
self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_34))
self.boxImg:setSprite(GConst.ATLAS_PATH.SHOP, "shop_chest_4")
end
self:showRewards(DataManager.ArenaData:getAdBoxRewards(self.arenaBoxInfo.isWin))

1
lua/app/ui/tips/formation_tips.lua
View File

@ -38,7 +38,6 @@ function FormationTips:onRefresh()
end)
if self.tarCornerScreenPos then
self.tarCornerScreenPos.x = 0
self:locate(self.location, self.originSizeDelta, self.bg, self.tarCornerScreenPos)
end
end

2
lua/app/userdata/player/player_data.lua
View File

@ -81,6 +81,8 @@ end
function PlayerData:resetOnCrossDay()
self.data.vitGemCount = 0
self.data.vitADCount = 0
self.data.arenaTicketGemCount = 0
self.data.arenaTicketADCount = 0
end
function PlayerData:markDirty()