SL1900/StellaSora_DataLua
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hotfix - 2.0.2.146

Browse Source 
EN: 2.0.2.146
CN: 2.0.2.146
JP: 2.0.2.148
KR: 2.0.2.153
This commit is contained in:
SL1900
2026-11-10 12:13:00 +09:00
parent 00cf81046d
commit c84dd6f891
117 changed files with 3603 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/game/codegen/game_enum_define.lua
+3 -1
View File
@@ -400,7 +400,9 @@ GameEnum.jumpType = {
ActivityGame1 = 46,
ActivityGame2 = 47,
Soldier = 48,
Dorm = 49
Dorm = 49,
ActivityStoryReview = 50,
MainLineStoryPreview = 51
}
GameEnum.characterSearchTargetType = {MELEE = 1, RANGED = 2}
GameEnum.characterSearchTargetTypeTowerDefense = {NORMAL = 1}
lua/game/common/utils/jumputil.lua
+64 -18
View File
@@ -434,6 +434,36 @@ function JumpUtil.DoJump(jumpId, ...)
else
EventManager.Hit(EventId.OpenPanel, PanelId.MainlineEx, chapterIndex)
end
elseif nType == GameEnum.jumpType.MainLineStoryPreview then
local nChapterId = mapJumpTo.Param[1]
local cfg = ConfigTable.GetData("StoryChapter", nChapterId)
local nPanelId = cfg.StoryPanelId
if nPanelId == 0 then
nPanelId = PanelId.MainlineEx
end
if PlayerData.Avg:IsStoryChapterUnlock(nChapterId) == true then
EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId)
else
do
local sLockReadTipsKey = "Mainline_Preview_Lock_Read_" .. nChapterId
if LocalData.GetPlayerLocalData(sLockReadTipsKey) then
EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId)
else
do
local sTip = ConfigTable.GetUIText("Mainline_Preview_Lock_Read")
local msg = {
nType = AllEnum.MessageBox.Confirm,
sContent = sTip,
callbackConfirm = function()
LocalData.SetPlayerLocalData(sLockReadTipsKey, true)
EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId)
end
}
EventManager.Hit(EventId.OpenMessageBox, msg)
end
end
end
end
elseif nType == GameEnum.jumpType.QuestNewbie then
local nJumpTab = mapJumpTo.Param[1]
if PanelManager.GetCurPanelId() == PanelId.QuestNewbie then
@@ -460,6 +490,12 @@ function JumpUtil.DoJump(jumpId, ...)
EventManager.Hit(EventId.OpenPanel, PanelId.SoldierMainViewPanel)
elseif nType == GameEnum.jumpType.Dorm then
EventManager.Hit(EventId.OpenPanel, PanelId.DormPanel)
elseif nType == GameEnum.jumpType.ActivityStoryReview then
local nActivityId = mapJumpTo.Param[1]
local data = ConfigTable.GetData("ActivityStoryChapter", nActivityId)
if data ~= nil then
PlayerData.StoryReview:TryOpenStoryChapter(data.ChapterId)
end
end
end
function JumpUtil.CheckJumpUnLock(jumpId, showTips)
@@ -626,29 +662,39 @@ end
function JumpUtil.JumpToActivity(tbJumpData)
if tbJumpData[1] == GameEnum.jumpType.MainLineStoryChapter then
local chapterIndex = tbJumpData[2]
local panelId = PanelId.MainlineEx
if chapterIndex == 11 then
panelId = PanelId.DustDawnStory
end
local isUnlock = PlayerData.Avg:IsStoryChapterUnlock(chapterIndex)
if isUnlock then
EventManager.Hit(EventId.OpenPanel, panelId, chapterIndex)
EventManager.Hit(EventId.OpenPanel, PanelId.MainlineEx, chapterIndex)
end
return
end
if tbJumpData[1] == GameEnum.jumpType.MainLineStoryPreview then
local nChapterId = tbJumpData[2]
local cfg = ConfigTable.GetData("StoryChapter", nChapterId)
local nPanelId = cfg.StoryPanelId
if nPanelId == 0 then
nPanelId = PanelId.MainlineEx
end
if PlayerData.Avg:IsStoryChapterUnlock(nChapterId) == true then
EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId)
else
local sLockReadTipsKey = "Mainline_Preview_Lock_Read_" .. chapterIndex
local sLockReadTipsKey = "Mainline_Preview_Lock_Read_" .. nChapterId
if LocalData.GetPlayerLocalData(sLockReadTipsKey) then
EventManager.Hit(EventId.OpenPanel, panelId, chapterIndex)
return
end
local sTip = ConfigTable.GetUIText("Mainline_Preview_Lock_Read")
local msg = {
nType = AllEnum.MessageBox.Confirm,
sContent = sTip,
callbackConfirm = function()
LocalData.SetPlayerLocalData(sLockReadTipsKey, true)
EventManager.Hit(EventId.OpenPanel, panelId, chapterIndex)
EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId)
else
do
local sTip = ConfigTable.GetUIText("Mainline_Preview_Lock_Read")
local msg = {
nType = AllEnum.MessageBox.Confirm,
sContent = sTip,
callbackConfirm = function()
LocalData.SetPlayerLocalData(sLockReadTipsKey, true)
EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId)
end
}
EventManager.Hit(EventId.OpenMessageBox, msg)
end
}
EventManager.Hit(EventId.OpenMessageBox, msg)
end
end
return
end
lua/game/ui/activity/advertise/mainlinestoryactctrl.lua
+28 -1
View File
@@ -16,7 +16,19 @@ function MainLineStoryActCtrl:InitActData(actData)
self.actData = actData
self.nActId = actData:GetActId()
self.AdConfig = ConfigTable.GetData("AdControl", self.nActId)
self:RefreshAct()
local bIsMainlineStoryPreview = false
local jumpToId = self.AdConfig.JumpTo[1]
if type(jumpToId) == "number" then
local cfgData_JumpTo = ConfigTable.GetData("JumpTo", jumpToId)
if cfgData_JumpTo ~= nil and cfgData_JumpTo.Type == GameEnum.jumpType.MainLineStoryPreview then
bIsMainlineStoryPreview = true
end
end
if bIsMainlineStoryPreview == true then
self:RefreshAct_MainlineStoryPreview()
else
self:RefreshAct()
end
end
function MainLineStoryActCtrl:GetTimeStr(nRemainTime)
local sTimeStr = ""
@@ -79,6 +91,21 @@ function MainLineStoryActCtrl:RefreshAct()
refresh()
self.refreshTimer = self:AddTimer(0, 1, refresh, true, true, true)
end
function MainLineStoryActCtrl:RefreshAct_MainlineStoryPreview()
if self.timerLoopRefresh ~= nil then
self.timerLoopRefresh:Cancel()
self.timerLoopRefresh = nil
end
local do_refresh = function()
local nEndTime = self.actData:GetActEndTime()
local nCurTime = ClientManager.serverTimeStamp
local nRemainTime = math.max(nEndTime - nCurTime, 0)
local sTime = self:GetTimeStr(nRemainTime)
NovaAPI.SetTMPText(self._mapNode.txtActTime, sTime)
end
do_refresh()
self.timerLoopRefresh = self:AddTimer(0, 1, do_refresh, true, true, true)
end
function MainLineStoryActCtrl:OnBtnClick_Go()
local nEndTime = self.actData:GetActEndTime()
local nCurTime = ClientManager.serverTimeStamp
lua/game/ui/activity/loginreward/_301054/loginrewardctrl_01.lua
+28
View File
@@ -0,0 +1,28 @@
local LoginRewardCtrl_01 = class("LoginRewardCtrl_01", BaseCtrl)
LoginRewardCtrl_01._mapNodeConfig = {
goCommon = {
sNodeName = "---Common---"
}
}
LoginRewardCtrl_01._mapEventConfig = {}
function LoginRewardCtrl_01:UnbindCtrl()
if self.activityCtrl ~= nil then
self:UnbindCtrlByNode(self.activityCtrl)
self.activityCtrl = nil
end
end
function LoginRewardCtrl_01:InitActData(actData)
if self.activityCtrl == nil then
self.activityCtrl = self:BindCtrlByNode(self._mapNode.goCommon, "Game.UI.Activity.LoginReward.LoginRewardCtrl_List")
end
self.actData = actData
self.nActId = actData:GetActId()
self.activityCtrl:InitActData(actData)
end
function LoginRewardCtrl_01:ClearActivity()
self:UnbindCtrl()
end
function LoginRewardCtrl_01:OnDisable()
self:UnbindCtrl()
end
return LoginRewardCtrl_01
lua/game/ui/activity/loginreward/_301054/loginrewardpopupctrl_01.lua
+142
View File
@@ -0,0 +1,142 @@
local LoginRewardPopUpCtrl_01 = class("LoginRewardPopUpCtrl_01", BaseCtrl)
local ClientManager = CS.ClientManager.Instance
LoginRewardPopUpCtrl_01._mapNodeConfig = {
goActTime = {},
txtActivityTime = {sComponentName = "TMP_Text"},
btnActivity = {
sComponentName = "Button",
callback = "OnBtnClick_Activity"
},
txtTips = {
sComponentName = "TMP_Text",
sLanguageId = "LoginReward_PopUp_Tip"
},
goRewardItem = {
nCount = 7,
sCtrlName = "Game.UI.Activity.LoginReward.LoginRewardItemCtrl_01"
},
imgActor = {nCount = 2, sComponentName = "Image"}
}
LoginRewardPopUpCtrl_01._mapEventConfig = {}
LoginRewardPopUpCtrl_01._mapRedDotConfig = {}
function LoginRewardPopUpCtrl_01:RefreshRemainTime()
local endTime = self.actData:GetActEndTime()
local curTime = ClientManager.serverTimeStamp
local remainTime = endTime - curTime
if remainTime < 0 then
self._mapNode.goActTime.gameObject:SetActive(false)
return
end
local sTimeStr = ""
if remainTime <= 60 then
local sec = math.floor(remainTime)
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Sec") or "", sec)
elseif 60 < remainTime and remainTime <= 3600 then
local min = math.floor(remainTime / 60)
local sec = math.floor(remainTime - min * 60)
if sec == 0 then
min = min - 1
sec = 60
end
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Min") or "", min, sec)
elseif 3600 < remainTime and remainTime <= 86400 then
local hour = math.floor(remainTime / 3600)
local min = math.floor((remainTime - hour * 3600) / 60)
if min == 0 then
hour = hour - 1
min = 60
end
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Hour") or "", hour, min)
elseif 86400 < remainTime then
local day = math.floor(remainTime / 86400)
local hour = math.floor((remainTime - day * 86400) / 3600)
if hour == 0 then
day = day - 1
hour = 24
end
sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Day") or "", day, hour)
end
NovaAPI.SetTMPText(self._mapNode.txtActivityTime, sTimeStr)
end
function LoginRewardPopUpCtrl_01:RefreshActData()
self.nActId = self._panel.nActId
self.actData = self._panel.actData
self.remainTimer = nil
self:RefreshRewardList()
local actCfg = self.actData:GetActCfgData()
if actCfg.EndType == GameEnum.activityEndType.NoLimit then
self._mapNode.goActTime.gameObject:SetActive(false)
else
self._mapNode.goActTime.gameObject:SetActive(true)
self:RefreshRemainTime()
end
end
function LoginRewardPopUpCtrl_01:RefreshRewardList()
local tbRewardList = self.actData:GetActLoginRewardList()
if nil ~= tbRewardList then
for k, v in ipairs(self._mapNode.goRewardItem) do
local mapReward = tbRewardList[k]
v.gameObject:SetActive(mapReward ~= nil)
if mapReward ~= nil then
v:SetRewardItem(k, mapReward)
end
end
end
end
function LoginRewardPopUpCtrl_01:PlayOutAnim()
local nAnimLength = 0
if self.animRoot ~= nil then
nAnimLength = NovaAPI.GetAnimClipLength(self.animRoot, {
"LoginReward_01_out"
})
self.animRoot:Play("LoginReward_01_out")
EventManager.Hit(EventId.TemporaryBlockInput, nAnimLength)
end
return nAnimLength
end
function LoginRewardPopUpCtrl_01:Awake()
self.animRoot = self.gameObject:GetComponent("Animator")
end
function LoginRewardPopUpCtrl_01:OnEnable()
if self.animRoot ~= nil then
local nAnimLength = NovaAPI.GetAnimClipLength(self.animRoot, {
"LoginReward_01_in"
})
self.animRoot:Play("LoginReward_01_in")
EventManager.Hit(EventId.TemporaryBlockInput, nAnimLength)
end
end
function LoginRewardPopUpCtrl_01:OnDisable()
end
function LoginRewardPopUpCtrl_01:OnDestroy()
end
function LoginRewardPopUpCtrl_01:OnBtnClick_Activity()
local bOpen = self.actData:CheckActivityOpen()
if not bOpen then
local callback = function()
EventManager.Hit("RefreshLoginRewardPanel")
end
EventManager.Hit(EventId.OpenMessageBox, {
nType = AllEnum.MessageBox.Alert,
sContent = ConfigTable.GetUIText("Activity_PopUp_Time_Out"),
callbackConfirm = callback
})
return
end
local canReceive = self.actData:CheckCanReceive()
if not canReceive then
EventManager.Hit("RefreshLoginRewardPanel")
return
end
local tbRewardList = self.actData:GetActLoginRewardList()
local nReceive = self.actData:GetCanReceive()
local mapNpc = {
nNpcId = tbRewardList[nReceive].NpcId,
nVoiceId = tbRewardList[nReceive].VoiceId
}
local callback = function()
EventManager.Hit("RefreshLoginRewardPanel")
end
PlayerData.Activity:SendReceiveLoginRewardMsg(self.nActId, callback)
end
return LoginRewardPopUpCtrl_01
lua/game/ui/avg/_cn/config/stm10001_02.lua
+3 -3
View File
@@ -14964,7 +14964,7 @@ return {
param = {
3,
"avg3_182",
"（我在星塔里拼命地跑，就在我马上就要跑不动时候，我看到了一个华贵的棺材。）",
"（我在高塔里拼命地跑，就在我马上就要跑不动时候，我看到了一个华贵的棺材。）",
0,
"",
false,
@@ -15421,7 +15421,7 @@ return {
param = {
0,
"avg3_182",
"（说起来，你到底是什么人？这个棺材又是怎么一回事？为什么会出现在那座星塔的顶层，我住在那里三年，从来没见到有人上去过。）",
"（说起来，你到底是什么人？这个棺材又是怎么一回事？为什么会出现在那座高塔的顶层，我住在那里三年，从来没见到有人上去过。）",
0,
"",
false,
@@ -15510,7 +15510,7 @@ return {
param = {
1,
"avg3_100",
"（我不是见习司祭，我的家乡在很远很远的地方。至于我为什么会和那个“棺材”一起出现在星塔里，我也说不清。）",
"（我不是见习司祭，我的家乡在很远很远的地方。至于我为什么会和那个“棺材”一起出现在塔里，我也说不清。）",
0,
"",
false,
lua/game/ui/avg/_cn/config/stm10001_03.lua
+27 -27
View File
@@ -976,7 +976,7 @@ return {
cmd = "CtrlChar",
param = {
"avg2_978",
"a",
"b",
nil,
"none",
nil,
@@ -2237,7 +2237,7 @@ return {
0,
"none",
"avg2_978",
"a",
"b",
"002",
"none",
nil,
@@ -2252,31 +2252,6 @@ return {
nil
}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "CtrlStage",
param = {
@@ -2312,6 +2287,31 @@ return {
cmd = "Wait",
param = {0.3}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "SetTrans",
param = {
lua/game/ui/avg/_cn/preset/avgcharacter.lua
+52
View File
@@ -1328,6 +1328,12 @@ return {
name_bg_color = "#0ABEC5",
ver = "2.2.0"
},
{
id = "avg3_240",
name = "***",
name_bg_color = "#0ABEC5",
ver = "2.3.0"
},
{
id = "avg3_873",
name = "克莱儿",
@@ -3260,6 +3266,47 @@ return {
reuse = "avg3_101",
ver = "2.0.0"
},
{
id = "avg3_1343",
name = "黑块A",
name_bg_color = "#0ABEC5",
reuse = "avg4_107"
},
{
id = "avg3_1344",
name = "***",
name_bg_color = "#0ABEC5",
reuse = "avg3_136",
ver = "2.1.0"
},
{
id = "avg3_1345",
name = "***",
name_bg_color = "#0ABEC5",
reuse = "avg3_137",
ver = "2.1.0"
},
{
id = "avg3_1346",
name = "科佩里乌斯A",
name_bg_color = "#0ABEC5",
reuse = "avg2_942",
ver = "2.0.0"
},
{
id = "avg3_1347",
name = "科佩里乌斯B",
name_bg_color = "#0ABEC5",
reuse = "avg2_942",
ver = "2.0.0"
},
{
id = "avg3_1348",
name = "科佩里乌斯C",
name_bg_color = "#0ABEC5",
reuse = "avg2_942",
ver = "2.0.0"
},
{
id = "avg4_100",
name = "菈露发光",
@@ -3298,6 +3345,11 @@ return {
name_bg_color = "#0ABEC5",
ver = "2.0.0"
},
{
id = "avg4_107",
name = "黑块",
name_bg_color = "#0ABEC5"
},
{
id = "avg4_999",
name = "维塔",
lua/game/ui/avg/_en/config/cg_157_03.lua
+1 -1
View File
@@ -1262,7 +1262,7 @@ return {
"",
false,
"",
"One Tawny Nightingale ... and one salted salmon, please.",
"One Tawny Nightingale ... and one red-striped fish, please.",
""
}
},
lua/game/ui/avg/_en/config/stm10001_03.lua
+27 -27
View File
@@ -976,7 +976,7 @@ return {
cmd = "CtrlChar",
param = {
"avg2_978",
"a",
"b",
nil,
"none",
nil,
@@ -2237,7 +2237,7 @@ return {
0,
"none",
"avg2_978",
"a",
"b",
"002",
"none",
nil,
@@ -2252,31 +2252,6 @@ return {
nil
}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "CtrlStage",
param = {
@@ -2312,6 +2287,31 @@ return {
cmd = "Wait",
param = {0.3}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "SetTrans",
param = {
lua/game/ui/avg/_jp/config/stm10001_03.lua
+27 -27
View File
@@ -976,7 +976,7 @@ return {
cmd = "CtrlChar",
param = {
"avg2_978",
"a",
"b",
nil,
"none",
nil,
@@ -2237,7 +2237,7 @@ return {
0,
"none",
"avg2_978",
"a",
"b",
"002",
"none",
nil,
@@ -2252,31 +2252,6 @@ return {
nil
}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "CtrlStage",
param = {
@@ -2312,6 +2287,31 @@ return {
cmd = "Wait",
param = {0.3}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "SetTrans",
param = {
lua/game/ui/avg/_kr/config/cg_157_03.lua
+3 -3
View File
@@ -1262,7 +1262,7 @@ return {
"",
false,
"",
"나이팅게일 빵 하나랑…… 절인 연어 한 접시 부탁해.",
"나이팅게일 빵 하나랑…… 절인 생선 한 접시 부탁해.",
""
}
},
@@ -4738,7 +4738,7 @@ return {
param = {
11,
"avg1_157",
"그건…… 그…… ==W==맞다, 예요. ==W==네 덕분에 무사히 ==W==언니 생일 선물을 ==W==줄 수 있었고…… ==W==렌즈도 ==W==보충할 수 있었으니까……",
"그건…… ==W==그…… ==W==맞다, 예요. ==W==네 덕분에 무사히 ==W==언니 생일 선물을 ==W==줄 수 있었고…… ==W==렌즈도 ==W==보충할 수 있었으니까……",
0,
"",
false,
@@ -4829,7 +4829,7 @@ return {
param = {
11,
"avg1_157",
"뭣……?! ==W==너, ==W==알면서 일부러 그랬냐예요?!==W====W==",
"뭣……?! ==W==너, ==W==알면서 일부러 그랬냐예요?!==W====W====W==",
0,
"",
false,
lua/game/ui/avg/_kr/config/stm10001_03.lua
+27 -27
View File
@@ -976,7 +976,7 @@ return {
cmd = "CtrlChar",
param = {
"avg2_978",
"a",
"b",
nil,
"none",
nil,
@@ -2237,7 +2237,7 @@ return {
0,
"none",
"avg2_978",
"a",
"b",
"002",
"none",
nil,
@@ -2252,31 +2252,6 @@ return {
nil
}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "CtrlStage",
param = {
@@ -2312,6 +2287,31 @@ return {
cmd = "Wait",
param = {0.3}
},
{
cmd = "CtrlChar",
param = {
"avg2_978",
"b",
"018",
"none",
nil,
0.55,
nil,
nil,
nil,
nil,
nil,
"none",
"none",
"Linear",
0,
nil,
false,
0.0,
true,
nil
}
},
{
cmd = "SetTrans",
param = {
lua/game/ui/avg/avgpreset.lua
+282 -1
View File
@@ -83,10 +83,14 @@ local AvgPreset = {
"flatlands_floralsea_daylight",
"flatlands_floralsea_night",
"flatlands_night",
"flavio_backstage",
"flavio_city_livehouse_a",
"flavio_city_livehouse_b",
"flavio_city_street",
"flavio_city_street_2",
"flavio_fantasystage",
"flavio_fantasystage_auditorium",
"flavio_fantasystage_auditorium_nobody",
"forest",
"forest_burn",
"forest_camp_rain",
@@ -197,6 +201,7 @@ local AvgPreset = {
"theater_inside_a",
"theater_inside_b",
"tower_common",
"tower_common_xmas",
"tower_elevator_close",
"tower_elevator_danger",
"tower_elevator_event",
@@ -283,6 +288,7 @@ local AvgPreset = {
"view_secret_laboratory_b",
"view_skeleton_a",
"view_skeleton_b",
"view_turtle",
"view_wasteland_night",
"view_whale_1",
"view_whale_2",
@@ -382,6 +388,16 @@ local AvgPreset = {
"story_event_14_002_a_MP",
"story_event_14_002_FP",
"story_event_14_002_MP",
"story_event_15_001_01",
"story_event_15_001_02",
"story_event_15_002",
"story_event_15_003",
"story_event_15_003_a",
"story_event_15_004",
"story_event_15_005",
"story_event_15_006",
"story_event_15_007",
"story_event_15_008",
"story_main_00_001",
"story_main_00_002",
"story_main_00_003_FP",
@@ -687,6 +703,15 @@ local AvgPreset = {
"story_main_10001_010",
"story_main_10001_010_a",
"story_main_10001_011",
"story_main_10_001_FP",
"story_main_10_001_MP",
"story_main_10_002_a_FP",
"story_main_10_002_a_MP",
"story_main_10_002_FP",
"story_main_10_002_MP",
"story_main_10_003",
"story_main_10_004",
"story_main_10_005",
"story_main_be_01_001_FP",
"story_main_be_01_001_MP",
"story_main_be_01_002",
@@ -789,7 +814,19 @@ local AvgPreset = {
"4057_B",
"4059_B",
"4061_B",
"4066_B"
"4066_B",
"4068_B",
"4070_B",
"4072_B",
"4074_B",
"4076_B",
"4078_B",
"4080_B",
"4082_B",
"4084_B",
"4086_B",
"4088_B",
"4090_B"
},
BgEffectResName = {
"0",
@@ -2402,6 +2439,66 @@ local AvgPreset = {
},
true
}
},
{
"yunxuan",
{
{
{
10.0,
5.0,
0
},
{
4,
2.0,
0
},
{
2.0,
2.0,
0
},
{
1,
1,
1
},
{
1,
1,
1
}
},
{
{
0,
0,
1
},
{
0,
0,
4
},
{
0,
0,
2
},
{
1,
1,
1
},
{
1,
1,
1
}
},
true
}
}
},
EaseType = {
@@ -5597,6 +5694,126 @@ local AvgPreset = {
},
false
}
},
{
"yunxuan",
{
{
{
0,
0.0,
0
},
{
4,
2.0,
0
},
{
2.0,
2.0,
0
},
{
1,
1,
1
},
{
1,
1,
1
}
},
{
{
0,
0,
0.5
},
{
0,
0,
4
},
{
0,
0,
2
},
{
1,
1,
1
},
{
1,
1,
1
}
},
true
}
},
{
"yunxuan2",
{
{
{
5,
0.0,
0
},
{
4,
2.0,
0
},
{
2.0,
2.0,
0
},
{
1,
1,
1
},
{
1,
1,
1
}
},
{
{
0,
0,
-1
},
{
0,
0,
4
},
{
0,
0,
2
},
{
1,
1,
1
},
{
1,
1,
1
}
},
true
}
}
},
CharEnter = {
@@ -6433,6 +6650,70 @@ local AvgPreset = {
"fx_avg_story_019",
""
},
{
"fx_avg_magic_cure",
""
},
{
"fx_avg_glowworm",
""
},
{
"fx_avg_vine_loop",
""
},
{
"fx_avg_vine_full_loop",
""
},
{
"fx_avg_pollen_2",
""
},
{
"fx_fog_3_lp",
""
},
{
"fx_avg_petal_transfer",
""
},
{
"fx_avg_powder_lp",
""
},
{
"fx_avg_powder_blow",
""
},
{
"fx_avg_petal",
""
},
{
"fx_avg_claw",
""
},
{
"fx_avg_cluster_flame_loop",
""
},
{
"fx_avg_miss",
""
},
{
"fx_avg_tiger_impact",
""
},
{
"fx_avg_tiger_claw_strike",
""
},
{
"fx_avg_fire_magic_blue",
""
},
{
"--分割线，以下特效含后期效果--",
""
lua/game/ui/mainlineex/storychapterctrl.lua
+8 -2
View File
@@ -26,6 +26,10 @@ StoryChapterCtrl._mapNodeConfig = {
txtTitle2_Show = {sComponentName = "TMP_Text"},
imgStoryIcon = {sComponentName = "Image"},
TabRedDot = {},
rtBtnShowStoryLineList = {
sNodeName = "btnShowStoryLineList",
sComponentName = "RectTransform"
},
btnShowStoryLineList = {
sComponentName = "UIButton",
callback = "OnBtn_ShowStoryLineList"
@@ -543,8 +547,10 @@ function StoryChapterCtrl:PlayRootAnim(bIn)
self._mapNode.animBtnShowStoryLineList:Play(sAnimName)
end
function StoryChapterCtrl:SetBtn_IconTitle(nLineId, bForceVisible)
local v2On = Vector2(55, 332)
local v2Off = Vector2(9999, 9999)
if bForceVisible == true then
self._mapNode.btnShowStoryLineList.transform.localScale = Vector3.one
self._mapNode.rtBtnShowStoryLineList.anchoredPosition = v2On
else
local b = false
if #self.tbLine > 1 then
@@ -553,7 +559,7 @@ function StoryChapterCtrl:SetBtn_IconTitle(nLineId, bForceVisible)
b = false
end
end
self._mapNode.btnShowStoryLineList.transform.localScale = b == true and Vector3.one or Vector3.zero
self._mapNode.rtBtnShowStoryLineList.anchoredPosition = b == true and v2On or v2Off
end
local cfg = ConfigTable.GetData("StoryLine", nLineId)
local sRemovedMain = string.gsub(cfg.TitleMain, "\n", "")
lua/game/ui/mainlineex_dustdawnstory/mainlineex_dustdawnstoryctrl.lua
+14
View File
@@ -540,6 +540,20 @@ function MainlineEx_DustDawnStoryCtrl:OnBtn_ClickHome()
end
function MainlineEx_DustDawnStoryCtrl:SetGridCanvasVisible(bVisible)
self.bAvgRootOpen = not bVisible
local canvasUnderBar = self._mapNode.grpUnderBar
if canvasUnderBar ~= nil and not canvasUnderBar:IsNull() then
if bVisible then
canvasUnderBar.enabled = true
else
local wait = function()
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
if self.bAvgRootOpen and not canvasUnderBar:IsNull() then
canvasUnderBar.enabled = false
end
end
cs_coroutine.start(wait)
end
end
if self.tbGridCanvas == nil then
return
end
lua/game/ui/mainviewex/mainviewctrl.lua
+29 -3
View File
@@ -1291,6 +1291,8 @@ function MainViewCtrl:RefreshLeftActivityList()
self:SetPngSprite(imgOpenBg, actGroupCfg.EnterRes)
self:SetPngSprite(imgOpenBgMask, actGroupCfg.EnterRes)
if bOpened then
OpenRoot:Find("imgActivityTime/imgTime").gameObject:SetActive(true)
OpenRoot:Find("imgActivityTime/goEmptyForLayout").gameObject:SetActive(false)
local txtActRemainTime = OpenRoot:Find("imgActivityTime/txtActivityTime"):GetComponent("TMP_Text")
if bShowCountDown then
do
@@ -1349,6 +1351,29 @@ function MainViewCtrl:RefreshLeftActivityList()
end
end
end
self.actAdv = PlayerData.Activity:GetMainviewShowActivityAdv()
if self.actAdv ~= nil then
local nIdx = #self.tbActivityPrepareShowList + 1
local btnTrans = self._mapNode.btnActivityPrepare[nIdx]
if btnTrans ~= nil then
btnTrans.gameObject:SetActive(true)
local tr = btnTrans.transform:Find("AnimRoot")
tr:Find("End").gameObject:SetActive(false)
tr:Find("Open").gameObject:SetActive(true)
local imgBg = tr:Find("Open/imgBg"):GetComponent("Image")
imgBg.gameObject:SetActive(true)
local sIcon = string.gsub(self.actAdv.actCfg.TabBgRes, "tab", "banner")
local sIcon = string.gsub(sIcon, "lang", "m_lang")
self:SetPngSprite(imgBg, sIcon)
tr:Find("Open/imgBgMask").gameObject:SetActive(false)
tr:Find("Open/imgActivityTime").gameObject:SetActive(true)
tr:Find("Open/imgActivityTime/imgTime").gameObject:SetActive(false)
tr:Find("Open/imgActivityTime/goEmptyForLayout").gameObject:SetActive(true)
local tmpTxt = tr:Find("Open/imgActivityTime/txtActivityTime"):GetComponent("TMP_Text")
tmpTxt.gameObject:SetActive(true)
NovaAPI.SetTMPText(tmpTxt, ConfigTable.GetUIText("MainView_MainStoryPreview"))
end
end
end
function MainViewCtrl:RefreshActivityFastEntrance()
for k, v in ipairs(self._mapNode.btnActivityFast) do
@@ -1691,6 +1716,10 @@ end
function MainViewCtrl:OnBtnClick_ActivityPrepare(btn, index)
local actGroupData = self.tbActivityPrepareShowList[index]
if actGroupData == nil then
if self.actAdv ~= nil then
local jumpToId = self.actAdv.adCfg.JumpTo[1]
JumpUtil.JumpTo(jumpToId)
end
return
end
actGroupData = actGroupData.actGroupData
@@ -2166,9 +2195,6 @@ function MainViewCtrl:OnBtnClick_GoToStarTower()
end
PlayerData.StarTower:GetAffinity(AffinityCallback)
end
function MainViewCtrl:OnBtnClick_GotoMainlineStory()
EventManager.Hit(EventId.OpenPanel, PanelId.MainlineEx, self.nRecentChapterId, PanelId.MainView)
end
function MainViewCtrl:OnDragStart_Actor(mDrag)
if mDrag.DragEventType == AllEnum.UIDragType.DragStart then
self.nDragStartPosX = mDrag.EventData.position.x
lua/gamecore/data/dataclass/activity/playeractivitydata.lua
+25 -1
View File
@@ -144,7 +144,6 @@ function PlayerActivityData:CacheAllActivityData(mapNetMsg)
elseif actCfg.ActivityType == GameEnum.activityType.Shop then
self:RefreshActivityShopData(nActId, v.Shop)
elseif actCfg.ActivityType == GameEnum.activityType.Advertise then
self:RefreshInfinityTowerActData(nActId, v.Shop)
elseif actCfg.ActivityType == GameEnum.activityType.BDConvert then
self:RefreshBdConvertData(nActId, v.BdConvert)
elseif actCfg.ActivityType == GameEnum.activityType.Breakout then
@@ -562,6 +561,31 @@ function PlayerActivityData:GetMainviewShowActivityGroup()
end)
return tbShowList
end
function PlayerActivityData:GetMainviewShowActivityAdv()
local actAdv
local tbShowList_Adv = {}
local curTime = CS.ClientManager.Instance.serverTimeStamp
for _, actData in pairs(self.tbAllActivity) do
if actData.actCfg.SpecialParam == "ShowInMainUI" then
local openTime = actData:GetActOpenTime()
local endTime = actData:GetActEndTime()
if curTime > openTime and curTime < endTime and actData.bPlay == true then
table.insert(tbShowList_Adv, actData)
end
end
end
if 0 < #tbShowList_Adv then
table.sort(tbShowList_Adv, function(a, b)
if a:GetActSortId() == b:GetActSortId() then
return a:GetActId() > b:GetActId()
else
return a:GetActSortId() < b:GetActSortId()
end
end)
actAdv = tbShowList_Adv[1]
end
return actAdv
end
function PlayerActivityData:IsActivityInActivityGroup(nActId)
local isInGroup, getActId
for _, actGroupData in pairs(self.tbAllActivityGroup) do
lua/gamecore/data/dataclass/avgdata.lua
+12 -1
View File
@@ -1301,7 +1301,8 @@ function AvgData:CheckNewStory(nChapterId)
for k, v in ipairs(map) do
local config = ConfigTable.GetData("Story", v)
local bUnlock = self:IsUnlock(config.ConditionId, config.StoryId)
if bUnlock then
local bUnlockByTime = self:CheckStoryUnlockTime(config.StoryId)
if bUnlock == true and bUnlockByTime == true then
local bReaded = self:IsStoryReaded(v)
if not bReaded then
tbNewUnlockStorys[v] = true
@@ -1313,6 +1314,16 @@ function AvgData:CheckNewStory(nChapterId)
end
return tbNewUnlockStorys
end
function AvgData:CheckStoryUnlockTime(sStoryId)
local s = ConfigTable.GetConfigValue("TimeUnlockStory")
if s == sStoryId then
local curTime = CS.ClientManager.Instance.serverTimeStamp
local time = ConfigTable.GetConfigValue("StoryUnlockTime")
local openTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(time)
return curTime > openTime
end
return true
end
function AvgData:SetNewLockChapterIndex(chapterIndex)
self.nNewLockChapterIndex = chapterIndex
end