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

成就

Browse Source
This commit is contained in:
puxuan 2025-08-21 16:00:11 +08:00
parent 3a6557f043
commit c5bb9e07fe
4 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/config/hero.lua
View File

@ -5444,7 +5444,7 @@ local hero = {
1100,
1200
},
["model_id"]="p23001",
["model_id"]="p26001",
["icon"]="26001",
["item_id"]=26001,
["level_id"]=10,

14
lua/app/config/monster_base.lua
View File

@ -150,37 +150,37 @@ local monster_base = {
["model_ui"]=1.0
},
[30004]={
["model_id"]="m30004",
["model_id"]="m30001",
["body"]=2,
["model_ui"]=1.0
},
[30005]={
["model_id"]="m30005",
["model_id"]="m30002",
["body"]=2,
["model_ui"]=1.0
},
[30006]={
["model_id"]="m30006",
["model_id"]="m30003",
["body"]=2,
["model_ui"]=1.0
},
[30007]={
["model_id"]="m30007",
["model_id"]="m30001",
["body"]=2,
["model_ui"]=1.0
},
[30008]={
["model_id"]="m30008",
["model_id"]="m30002",
["body"]=2,
["model_ui"]=1.0
},
[30009]={
["model_id"]="m30009",
["model_id"]="m30003",
["body"]=2,
["model_ui"]=1.0
},
[30010]={
["model_id"]="m30010",
["model_id"]="m30001",
["body"]=2,
["model_ui"]=1.0
},

10
lua/app/config/skill.lua
View File

@ -3079,7 +3079,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
140
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3108,7 +3108,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
140
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3137,7 +3137,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
140
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3166,7 +3166,7 @@ local skill = {
["obj"]=2,
["skill_position"]={
1,
140
120
},
["shake_time"]=100,
["shake_type"]=1,
@ -3227,7 +3227,7 @@ local skill = {
},
["skill_position"]={
1,
140
120
},
["shake_time"]=200,
["shake_type"]=5,

33
lua/app/userdata/task/daily_task_data.lua
View File

@ -90,7 +90,6 @@ function DailyTaskData:initAchievement(achievement)
-- 成就任务
self.achievementData = achievement.tasks or {}
self.achievementRewardData = achievement.task_claimed_stages or {}
self.achievementRedState = nil
self:showRedPoint()
end
@ -136,7 +135,7 @@ function DailyTaskData:showDailyRedPoint()
end
function DailyTaskData:showAchievementRedPoint()
if not self.achievementRewardData then
if not self.achievementData then
return
end
if self.achievementRedState ~= nil then
@ -267,30 +266,23 @@ end
function DailyTaskData:addTaskProgress(taskType, count)
for taskId, info in pairs(TaskDailyCfg) do
if self:getTaskType(taskId) == taskType then
if self.dailyTaskData[taskId] == nil then
self.dailyTaskData[taskId] = {}
end
self.dailyTaskData[taskId] = self.dailyTaskData[taskId] or {}
if not self:isTaskFinished(taskId) then
-- if table.containValue(GConst.TaskConst.TASK_TARGRT_TYPE, taskType) then
-- self.dailyTaskData[taskId].progress = math.max(self.dailyTaskData[taskId].progress or 0, count)
-- else
self.dailyTaskData[taskId].progress = (self.dailyTaskData[taskId].progress or 0) + count
-- end
self.dailyTaskData[taskId].progress = (self.dailyTaskData[taskId].progress or 0) + count
end
end
end
for achievementId, info in pairs(TaskAchievementCfg) do
if self:getTaskTypeByAchievementId(achievementId) == taskType then
self.achievementData[achievementId] = self.achievementData[achievementId] or {}
if not self:isAchievementFinished(achievementId, self:getAchievementTotalStage(achievementId)) then
-- if table.containValue(GConst.TaskConst.TASK_TARGRT_TYPE, taskType) then
-- self.achievementData[achievementId] = math.max(self.achievementData[achievementId] or 0, count)
-- else
self.achievementData[achievementId] = (self.achievementData[achievementId] or 0) + count
-- end
self.achievementData[achievementId].progress = (self.achievementData[achievementId].progress or 0) + count
end
end
end
self.dailyRedState = nil
self.achievementRedState = nil
self:setDirty()
end
@ -391,7 +383,7 @@ end
-- 获取当前进度
function DailyTaskData:getAchievementProg(achievementId)
return self.achievementData[achievementId] or 0
return self.achievementData[achievementId] and self.achievementData[achievementId].progress or 0
end
-- 获取任务总共阶段
@ -422,7 +414,8 @@ end
-- 是否已领奖
function DailyTaskData:isAchievementReceived(achievementId, stage)
achievementId = tonumber(achievementId)
return self.achievementRewardData[achievementId] and self.achievementRewardData[achievementId] >= stage or false
self.achievementData[achievementId] = self.achievementData[achievementId] or {}
return self.achievementData[achievementId].claimed and self.achievementData[achievementId].claimed >= stage or false
end
-- 是否可领奖
@ -468,12 +461,14 @@ function DailyTaskData:onAchievementClaimed(achievementId, stage)
for achievementId, info in ipairs(TaskAchievementCfg) do
for stage = self:getAchievementStage(achievementId), self:getAchievementTotalStage(achievementId) do
if self:canClaimAchievement(achievementId, stage) then
self.achievementRewardData[achievementId] = stage
self.achievementData[achievementId] = self.achievementData[achievementId] or {}
self.achievementData[achievementId].claimed = stage
end
end
end
else
self.achievementRewardData[achievementId] = stage
self.achievementData[achievementId] = self.achievementData[achievementId] or {}
self.achievementData[achievementId].claimed = stage
end
self.achievementRedState = nil
self:setDirty()