Update - 1.8.0.96
EN: 1.8.0.96 CN: 1.8.0.97 JP: 1.8.0.99 KR: 1.8.0.101
This commit is contained in:
@@ -26,6 +26,7 @@ function ScoreBossLevel:Init(parent, nLevelId, nBuildId, isAgain)
|
||||
self.BossCurLvTotalChangeHp = 0
|
||||
self.BattleLv = 1
|
||||
self.nTime = 0
|
||||
self.isCanPause = true
|
||||
local leveData = ConfigTable.GetData("ScoreBossLevel", nLevelId)
|
||||
if leveData == nil then
|
||||
printError("ScoreBossLevel 表不存在 id ==== " .. nLevelId)
|
||||
@@ -82,6 +83,7 @@ function ScoreBossLevel:CalCharFixedEffect(nCharId, bMainChar, tbDiscId)
|
||||
return stActorInfo
|
||||
end
|
||||
function ScoreBossLevel:OnEvent_LoadLevelRefresh()
|
||||
self.isCanPause = true
|
||||
local mapAllEft, mapDiscEft, mapNoteEffect, tbNoteInfo = PlayerData.Build:GetBuildAllEft(self.mapBuildData.nBuildId)
|
||||
safe_call_cs_func(CS.AdventureModuleHelper.SetNoteInfo, tbNoteInfo)
|
||||
self.mapEftData = UTILS.AddBuildEffect(mapAllEft, mapDiscEft, mapNoteEffect)
|
||||
@@ -124,7 +126,9 @@ function ScoreBossLevel:SetDiscInfo()
|
||||
safe_call_cs_func(CS.AdventureModuleHelper.SetDiscInfo, tbDiscInfo)
|
||||
end
|
||||
function ScoreBossLevel:OnEvent_Pause()
|
||||
EventManager.Hit("OpenScoreBossPause", self.LevelId, self.tbCharId)
|
||||
if self.isCanPause then
|
||||
EventManager.Hit("OpenScoreBossPause", self.LevelId, self.tbCharId)
|
||||
end
|
||||
end
|
||||
function ScoreBossLevel:OnEvent_AbandonBattle()
|
||||
self.parent:QuiteLevel()
|
||||
|
||||
@@ -117,6 +117,7 @@ function PostalStoryCtrl:RefreshGridInfo(grid, gridIndex, bBranch, nBranchIndex)
|
||||
local txtTime = goImgTime:Find("txtTime"):GetComponent("TMP_Text")
|
||||
local txtTitle = bBranch and RootNode:Find("tmpGroupDone"):GetComponent("TMP_Text") or grid.transform:Find("btnGridText/scale_on_click/tmpGroupDone"):GetComponent("TMP_Text")
|
||||
local txtComplete = goComplete.transform:Find("imgBg/txtComplete"):GetComponent("TMP_Text")
|
||||
local btnGridText = grid.transform:Find("btnGridText").gameObject
|
||||
NovaAPI.SetTMPText(txtComplete, ConfigTable.GetUIText("RoguelikeBuild_Manage_FilterPass"))
|
||||
local isUnlock, tbResult = ActivityAvgData:IsUnlock(avgcfg.ConditionId)
|
||||
local isReaded = ActivityAvgData:IsStoryReaded(storyId)
|
||||
@@ -132,7 +133,11 @@ function PostalStoryCtrl:RefreshGridInfo(grid, gridIndex, bBranch, nBranchIndex)
|
||||
local bShowImgStory = not bBranch or not not isUnlock
|
||||
imgStory.gameObject:SetActive(bShowImgStory)
|
||||
if bShowImgStory then
|
||||
self:SetPngSprite(imgStory, string.format("Icon/ActivityStory/ep_event05_%02d", nIndex) .. branchSuffix)
|
||||
if bOpen then
|
||||
self:SetPngSprite(imgStory, string.format("Icon/ActivityStory/ep_event05_%02d", nIndex) .. branchSuffix)
|
||||
else
|
||||
self:SetPngSprite(imgStory, string.format("Icon/ActivityStory/ep_event05_00"))
|
||||
end
|
||||
end
|
||||
NovaAPI.SetTMPText(txtTitle, avgcfg.Title)
|
||||
NovaAPI.SetTMPText(txtLevel, avgcfg.Index)
|
||||
@@ -145,6 +150,7 @@ function PostalStoryCtrl:RefreshGridInfo(grid, gridIndex, bBranch, nBranchIndex)
|
||||
goNotOpen.gameObject:SetActive(not bOpen or bBranch and not isUnlock)
|
||||
imgBattleTitleBg.gameObject:SetActive(avgcfg.IsBattle and isUnlock and bOpen)
|
||||
imgStoryTitleBg.gameObject:SetActive(not avgcfg.IsBattle and isUnlock and bOpen)
|
||||
btnGridText.gameObject:SetActive(bOpen)
|
||||
if avgcfg.IsBattle == true then
|
||||
local txtPlot = imgBattleTitleBg:Find("txtPlot"):GetComponent("TMP_Text")
|
||||
NovaAPI.SetTMPText(txtPlot, ConfigTable.GetUIText("SelectTeam_StartBattle"))
|
||||
|
||||
@@ -1732,45 +1732,6 @@ return {
|
||||
false
|
||||
}
|
||||
},
|
||||
{
|
||||
cmd = "CtrlChar",
|
||||
param = {
|
||||
"avg1_137",
|
||||
"b",
|
||||
"003",
|
||||
"avg_emoji_star",
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
"none",
|
||||
"none",
|
||||
"Linear",
|
||||
0,
|
||||
nil,
|
||||
false,
|
||||
0.5,
|
||||
false,
|
||||
nil
|
||||
}
|
||||
},
|
||||
{
|
||||
cmd = "SetTalk",
|
||||
param = {
|
||||
0,
|
||||
"avg1_137",
|
||||
"",
|
||||
0,
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"They say these are quite effective against monsters.",
|
||||
""
|
||||
}
|
||||
},
|
||||
{
|
||||
cmd = "CtrlChar",
|
||||
param = {
|
||||
@@ -2272,14 +2233,14 @@ return {
|
||||
"OutSine",
|
||||
false,
|
||||
false,
|
||||
0.5,
|
||||
1.0,
|
||||
true,
|
||||
"AvgStageEffect_clockwise"
|
||||
}
|
||||
},
|
||||
{
|
||||
cmd = "Wait",
|
||||
param = {0.5}
|
||||
param = {1.0}
|
||||
},
|
||||
{
|
||||
cmd = "SetBGM",
|
||||
@@ -3660,7 +3621,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"Hiring a maid to focus... We live in different worlds...==W==Hm? What's that sound?",
|
||||
"Hiring a maid to focus... We live in different worlds...==W== Hm? What's that sound?",
|
||||
""
|
||||
}
|
||||
},
|
||||
@@ -7191,7 +7152,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"Yeah, you bet! Boys, Plan B!",
|
||||
"Yeah, you bet! Girls, Plan B!",
|
||||
""
|
||||
}
|
||||
},
|
||||
@@ -7898,7 +7859,7 @@ return {
|
||||
cmd = "SetTalk",
|
||||
param = {
|
||||
0,
|
||||
"Trekkers Outside",
|
||||
"Trekker Outside",
|
||||
"",
|
||||
1,
|
||||
"",
|
||||
@@ -7946,7 +7907,7 @@ return {
|
||||
cmd = "SetTalk",
|
||||
param = {
|
||||
0,
|
||||
"Trekkers Outside",
|
||||
"Trekker Outside",
|
||||
"",
|
||||
0,
|
||||
"",
|
||||
|
||||
@@ -3666,7 +3666,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"Oh crap! It's a bomb...",
|
||||
"Oh crap! It's gonna explode...",
|
||||
""
|
||||
}
|
||||
},
|
||||
@@ -9294,7 +9294,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"Sniff... I...Mentor, I... I really don't want to give up!",
|
||||
"Sniff... I… Mentor, I... I really don't want to give up!",
|
||||
""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -2486,7 +2486,7 @@ return {
|
||||
false,
|
||||
"",
|
||||
"それが、今日のライブを楽しむ一番いい方法なのだろう。==RT==私は思考を止めて、四弦の太く優しい低音に心を委ねることにした。",
|
||||
"それが、今日のライブを楽しむ一番いい方法なのだろう。==RT==僕は思考を止めて、四弦の太く優しい低温に心を委ねることにした。"
|
||||
"それが、今日のライブを楽しむ一番いい方法なのだろう。==RT==僕は思考を止めて、四弦の太く優しい低音に心を委ねることにした。"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -7779,7 +7779,7 @@ return {
|
||||
false,
|
||||
"",
|
||||
"私が空白旅団に入ったのは最近だろう?==W====RT==みんなは私が入るずっと前から、==RT==信頼と絆を育んできたんだ。",
|
||||
"僕が空白旅団に入ったのは最近だろう?==W====RT==みんなは私が入るずっと前から、==RT==信頼と絆を育んできたんだ。"
|
||||
"僕が空白旅団に入ったのは最近だろう?==W====RT==みんなは僕が入るずっと前から、==RT==信頼と絆を育んできたんだ。"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1224,7 +1224,7 @@ return {
|
||||
false,
|
||||
"",
|
||||
"では私はこの大きな箱を……==W==お、重っ!?==RT==わわ――",
|
||||
""
|
||||
"では僕はこの大きな箱を……==W==お、重っ!?==RT==わわ――"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -10696,7 +10696,7 @@ return {
|
||||
false,
|
||||
"",
|
||||
"私も楽しかったよ。==W====RT==だが、あの量の食事を作るのは大変だったのではないか?",
|
||||
""
|
||||
"僕も楽しかったよ。==W====RT==だが、あの量の食事を作るのは大変だったのではないか?"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -13782,7 +13782,7 @@ return {
|
||||
false,
|
||||
"",
|
||||
"私も楽しかったよ。==W====RT==だが、あの量の食事を作るのは大変だったのではないか?",
|
||||
""
|
||||
"僕も楽しかったよ。==W====RT==だが、あの量の食事を作るのは大変だったのではないか?"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -3235,7 +3235,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"ただいま~……==W==うひゃああ、机が手紙で部屋が埋まっちゃってる。==RT==通常業務がまったくできなかったもんね……",
|
||||
"ただいま~……==W==うひゃああ、集荷した手紙が山積みになっちゃってる。==RT==通常業務がまったくできなかったもんね……",
|
||||
""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -8753,7 +8753,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"肯定。ただし『魔王さんの意志に反して命を落としたとき』に限られマス。==RT==自ら命を経った場合、時制者の力は発動シマセン。",
|
||||
"肯定。ただし『魔王さんの意志に反して命を落としたとき』に限られマス。==RT==自ら命を絶った場合、時制者の力は発動シマセン。",
|
||||
""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -9048,7 +9048,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"このハチミツケーキ、と~ってもおいしいくて止まらないわっ★",
|
||||
"このハチミツケーキ、と~ってもおいしくて止まらないわっ★",
|
||||
""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1033,7 +1033,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"…… 사기 전에 생각 안 해봤어?",
|
||||
"사기 전에 생각 안 해봤어?",
|
||||
""
|
||||
}
|
||||
},
|
||||
@@ -1075,7 +1075,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"? 계산법이 좀 이상한데",
|
||||
"계산법이 좀 이상한데?",
|
||||
""
|
||||
}
|
||||
},
|
||||
@@ -1131,7 +1131,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"전 갈게요, 바이바이!",
|
||||
"난 가볼게, 바이바이!",
|
||||
""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -5697,7 +5697,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"보스, 왜 그렇게 넋 놓고 있어~ 괜찮아?",
|
||||
"으악?! 아, 깜짝이야……",
|
||||
""
|
||||
}
|
||||
},
|
||||
@@ -5754,7 +5754,7 @@ return {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
"으악?! 아, 깜짝이야……",
|
||||
"보스, 왜 그렇게 넋 놓고 있어~ 괜찮아?",
|
||||
""
|
||||
}
|
||||
},
|
||||
|
||||
@@ -217,6 +217,18 @@ function ScoreBossSelectCtrl:OnEnable()
|
||||
self.isPlayNPCVoice = false
|
||||
self:RefreshNPC2D()
|
||||
self._mapRewardGrid = {}
|
||||
if self.ChooseLevelId ~= nil then
|
||||
self:SetBossInfo(self.ChooseLevelId, false)
|
||||
self:PlayBossOpenAni(self.ChooseLevelId)
|
||||
end
|
||||
end
|
||||
function ScoreBossSelectCtrl:PlayBossOpenAni(nLevelId)
|
||||
local bossLevelData = ConfigTable.GetData("ScoreBossLevel", nLevelId)
|
||||
local sOpenAniName = "ScoreBossSelect_Info_open"
|
||||
if bossLevelData.ExtraImageAni ~= nil and bossLevelData.ExtraImageAni ~= "" then
|
||||
sOpenAniName = string.gsub(bossLevelData.ExtraImageAni, "_in", "_open", 1)
|
||||
end
|
||||
self.infoAni:Play(sOpenAniName)
|
||||
end
|
||||
function ScoreBossSelectCtrl:OnEvent_GetScoreBossInfoReq()
|
||||
self:OnInitPanelInfo()
|
||||
|
||||
@@ -582,6 +582,7 @@ function TowerDefenseCtrl:OnPointerDown_CharacterCard(go, nIndex)
|
||||
end
|
||||
self.goPointChar = go.gameObject
|
||||
self:HideFuncIcon()
|
||||
self:SetSlowSpeed(false)
|
||||
end
|
||||
function TowerDefenseCtrl:OnPointerDown_Item(go)
|
||||
if self.bPointItem and self.CardDragType == CardDragType.Pointer then
|
||||
@@ -594,6 +595,7 @@ function TowerDefenseCtrl:OnPointerDown_Item(go)
|
||||
end
|
||||
self.bPointItem = true
|
||||
self:HideFuncIcon()
|
||||
self:SetSlowSpeed(false)
|
||||
end
|
||||
function TowerDefenseCtrl:OnEvent_HoldCard(pos)
|
||||
if self.CardDragType ~= CardDragType.Pointer then
|
||||
|
||||
@@ -180,10 +180,12 @@ function TowerDefenseLevelDetailCtrl:UpdateItem()
|
||||
for i = 1, 4 do
|
||||
if i > #self.tbReward then
|
||||
self._mapNode.item[i].gameObject:SetActive(false)
|
||||
self._mapNode.ItemBtn[i].interactable = false
|
||||
else
|
||||
local levelData = self.TowerDefenseData:GetLevelData(self.nLevelId)
|
||||
self._mapNode.item[i]:SetItem(self.tbReward[i].nId, nil, self.tbReward[i].nCount, nil, 0 < levelData.nStar, true)
|
||||
self._mapNode.item[i].gameObject:SetActive(true)
|
||||
self._mapNode.ItemBtn[i].interactable = true
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -229,6 +231,7 @@ function TowerDefenseLevelDetailCtrl:UpdateCharacter()
|
||||
go_add.gameObject:SetActive(false)
|
||||
go_none.gameObject:SetActive(false)
|
||||
go_icon.gameObject:SetActive(false)
|
||||
btn_add.interactable = false
|
||||
if teamCharacterCount == 0 then
|
||||
if i > #self.tbCharGuideId then
|
||||
go_none.gameObject:SetActive(true)
|
||||
@@ -248,6 +251,7 @@ function TowerDefenseLevelDetailCtrl:UpdateCharacter()
|
||||
go_none.gameObject:SetActive(true)
|
||||
elseif i > #self.tbCharGuideId then
|
||||
go_add.gameObject:SetActive(true)
|
||||
btn_add.interactable = true
|
||||
btn_add.onClick:RemoveAllListeners()
|
||||
btn_add.onClick:AddListener(function()
|
||||
self:OnBtnClick_EditorTeam()
|
||||
@@ -261,6 +265,7 @@ function TowerDefenseLevelDetailCtrl:UpdateCharacter()
|
||||
NovaAPI.SetTMPText(txt_name, characterConfig.Name)
|
||||
end
|
||||
go_icon.gameObject:SetActive(true)
|
||||
btn_add.interactable = true
|
||||
btn_add.onClick:RemoveAllListeners()
|
||||
btn_add.onClick:AddListener(function()
|
||||
self:OnBtnClick_EditorTeam()
|
||||
@@ -390,10 +395,14 @@ end
|
||||
function TowerDefenseLevelDetailCtrl:EnterTeamEditorPanel()
|
||||
self._mapNode.teamCtrl.gameObject:SetActive(true)
|
||||
self.bInEditorPanel = true
|
||||
self._mapNode.btn_Team.interactable = false
|
||||
self._mapNode.btn_go1.interactable = false
|
||||
end
|
||||
function TowerDefenseLevelDetailCtrl:CloseTeamEditorPanel()
|
||||
self._mapNode.teamCtrl.gameObject:SetActive(false)
|
||||
self.bInEditorPanel = false
|
||||
self._mapNode.btn_Team.interactable = true
|
||||
self._mapNode.btn_go1.interactable = true
|
||||
end
|
||||
function TowerDefenseLevelDetailCtrl:OnBtnClick_MonsterInfo()
|
||||
EventManager.Hit("OpenTowerDefenseMonsterInfo", self.levelConfig.Id)
|
||||
|
||||
Reference in New Issue
Block a user