From f24f8d5e754bdf82d9c1fbc141dd0022cb4853b5 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 5 Jul 2023 15:55:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/strings/cn/tutorial.lua | 11 +- lua/app/config/strings/de/tutorial.lua | 11 +- lua/app/config/strings/en/tutorial.lua | 11 +- lua/app/config/strings/es/tutorial.lua | 11 +- lua/app/config/strings/fr/tutorial.lua | 11 +- lua/app/config/strings/id/tutorial.lua | 11 +- lua/app/config/strings/ja/tutorial.lua | 11 +- lua/app/config/strings/ko/tutorial.lua | 11 +- lua/app/config/strings/pt/tutorial.lua | 11 +- lua/app/config/strings/ru/tutorial.lua | 36 +++++++ lua/app/config/strings/ru/tutorial.lua.meta | 10 ++ lua/app/config/strings/th/tutorial.lua | 11 +- lua/app/config/strings/vi/tutorial.lua | 11 +- lua/app/config/strings/zh/tutorial.lua | 11 +- lua/app/config/tutorial.lua | 114 +++++++++++++++++++- lua/app/config/tutorial_start.lua | 6 +- lua/app/ui/arena/arena_formation_ui.lua | 3 + lua/app/ui/arena/arena_match_ui.lua | 3 + lua/app/ui/battle/battle_result_ui.lua | 4 +- lua/app/ui/shop/box_hero_ui.lua | 4 +- lua/app/ui/tips/formation_tips.lua | 1 - lua/app/userdata/player/player_data.lua | 2 + 22 files changed, 294 insertions(+), 21 deletions(-) create mode 100644 lua/app/config/strings/ru/tutorial.lua create mode 100644 lua/app/config/strings/ru/tutorial.lua.meta diff --git a/lua/app/config/strings/cn/tutorial.lua b/lua/app/config/strings/cn/tutorial.lua index 33104cd1..263e557c 100644 --- a/lua/app/config/strings/cn/tutorial.lua +++ b/lua/app/config/strings/cn/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/de/tutorial.lua b/lua/app/config/strings/de/tutorial.lua index f2577b93..341f3a12 100644 --- a/lua/app/config/strings/de/tutorial.lua +++ b/lua/app/config/strings/de/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/en/tutorial.lua b/lua/app/config/strings/en/tutorial.lua index ae4d9280..d6c88a02 100644 --- a/lua/app/config/strings/en/tutorial.lua +++ b/lua/app/config/strings/en/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/es/tutorial.lua b/lua/app/config/strings/es/tutorial.lua index 81106ec4..2f2adcd5 100644 --- a/lua/app/config/strings/es/tutorial.lua +++ b/lua/app/config/strings/es/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/fr/tutorial.lua b/lua/app/config/strings/fr/tutorial.lua index f2577b93..341f3a12 100644 --- a/lua/app/config/strings/fr/tutorial.lua +++ b/lua/app/config/strings/fr/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/id/tutorial.lua b/lua/app/config/strings/id/tutorial.lua index 2faa94f9..375d41d0 100644 --- a/lua/app/config/strings/id/tutorial.lua +++ b/lua/app/config/strings/id/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/ja/tutorial.lua b/lua/app/config/strings/ja/tutorial.lua index 80d0882c..359766fc 100644 --- a/lua/app/config/strings/ja/tutorial.lua +++ b/lua/app/config/strings/ja/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/ko/tutorial.lua b/lua/app/config/strings/ko/tutorial.lua index f873d1b9..cab6b4e3 100644 --- a/lua/app/config/strings/ko/tutorial.lua +++ b/lua/app/config/strings/ko/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/pt/tutorial.lua b/lua/app/config/strings/pt/tutorial.lua index 5103ffa2..02ccae33 100644 --- a/lua/app/config/strings/pt/tutorial.lua +++ b/lua/app/config/strings/pt/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/ru/tutorial.lua b/lua/app/config/strings/ru/tutorial.lua new file mode 100644 index 00000000..341f3a12 --- /dev/null +++ b/lua/app/config/strings/ru/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/ru/tutorial.lua.meta b/lua/app/config/strings/ru/tutorial.lua.meta new file mode 100644 index 00000000..5919891d --- /dev/null +++ b/lua/app/config/strings/ru/tutorial.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1f6c648f9deb935458551ea89cd8885e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/config/strings/th/tutorial.lua b/lua/app/config/strings/th/tutorial.lua index 7cd78fe6..5aac094a 100644 --- a/lua/app/config/strings/th/tutorial.lua +++ b/lua/app/config/strings/th/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/vi/tutorial.lua b/lua/app/config/strings/vi/tutorial.lua index 59ced6e3..22fd4113 100644 --- a/lua/app/config/strings/vi/tutorial.lua +++ b/lua/app/config/strings/vi/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/strings/zh/tutorial.lua b/lua/app/config/strings/zh/tutorial.lua index 5aab7ab9..11652e66 100644 --- a/lua/app/config/strings/zh/tutorial.lua +++ b/lua/app/config/strings/zh/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/tutorial.lua b/lua/app/config/tutorial.lua index fe31233d..b108ad6d 100644 --- a/lua/app/config/tutorial.lua +++ b/lua/app/config/tutorial.lua @@ -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 \ No newline at end of file diff --git a/lua/app/config/tutorial_start.lua b/lua/app/config/tutorial_start.lua index 50ad3da0..fd87bac8 100644 --- a/lua/app/config/tutorial_start.lua +++ b/lua/app/config/tutorial_start.lua @@ -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 \ No newline at end of file diff --git a/lua/app/ui/arena/arena_formation_ui.lua b/lua/app/ui/arena/arena_formation_ui.lua index 5292280b..194eedfe 100644 --- a/lua/app/ui/arena/arena_formation_ui.lua +++ b/lua/app/ui/arena/arena_formation_ui.lua @@ -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() diff --git a/lua/app/ui/arena/arena_match_ui.lua b/lua/app/ui/arena/arena_match_ui.lua index 139b6e21..dda1d867 100644 --- a/lua/app/ui/arena/arena_match_ui.lua +++ b/lua/app/ui/arena/arena_match_ui.lua @@ -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() diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index b961f883..d91a9479 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -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 diff --git a/lua/app/ui/shop/box_hero_ui.lua b/lua/app/ui/shop/box_hero_ui.lua index 39c216a3..e9e0166d 100644 --- a/lua/app/ui/shop/box_hero_ui.lua +++ b/lua/app/ui/shop/box_hero_ui.lua @@ -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)) diff --git a/lua/app/ui/tips/formation_tips.lua b/lua/app/ui/tips/formation_tips.lua index a9fbdff9..1719664a 100644 --- a/lua/app/ui/tips/formation_tips.lua +++ b/lua/app/ui/tips/formation_tips.lua @@ -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 diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index 9aa3502b..908ed64c 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -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()