diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 51336b3810..d3393a0674 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1879,7 +1879,7 @@ [11878] = "升星被动技能id ", [11879] = "新增技能", [11880] = "道具不足!", - [11881] = "赠送1个元神玉", + [11881] = "赠送1个元神玉和20个置换玉", [11882] = "赠送1个妖灵玉", [11883] = "活动结束!", [11884] = "赠送10个元神玉", diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index a9aa453e87..8782596f02 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -33,10 +33,13 @@ function this.InitializeData() this.rewardData[v.ActivityId][v.Level].state = -2 this.rewardData[v.ActivityId][v.Level].Reward = {} local temp = {} + this.rewardData[v.ActivityId][v.Level].type = 2 if v.Reward then for n,m in ipairs(v.Reward) do table.insert(temp,{ type = 1,item = { m[1] , m[2] } }) end + else + this.rewardData[v.ActivityId][v.Level].type = 1 end if v.TreasureReward then for n,m in ipairs(v.TreasureReward) do @@ -65,19 +68,21 @@ end function this.UpdateTreasureState() local level = this.GetLevel() local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody) - for k,v in pairs(this.rewardData[activityId]) do - if level < v.level then - v.state = -2 - end - end - local TreasureRewardState = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody) - if TreasureRewardState and TreasureRewardState.mission then - --state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝,可以再次领取 - for k,v in ipairs(TreasureRewardState.mission) do - if v and level >= v.missionId then - this.rewardData[activityId][v.missionId].state = v.state + if this.rewardData[activityId] then + for k,v in pairs(this.rewardData[activityId]) do + if level < v.level then + v.state = -2 end - end + end + local TreasureRewardState = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody) + if TreasureRewardState and TreasureRewardState.mission then + --state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝,可以再次领取 + for k,v in ipairs(TreasureRewardState.mission) do + if v and level >= v.missionId then + this.rewardData[activityId][v.missionId].state = v.state + end + end + end end end @@ -85,11 +90,13 @@ end function this.UpdateTreasureState2() local level = this.GetLevel() local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody) - for k,v in pairs(this.rewardData[activityId]) do - if level < k then - v.state = -2 - elseif v.state == -2 then - v.state = 0 + if this.rewardData[activityId] then + for k,v in pairs(this.rewardData[activityId]) do + if level < k or (level > k and this.GetTreasureState() < 1 and v.type == 1) then + v.state = -2 + elseif v.state == -2 then + v.state = 0 + end end end end @@ -158,6 +165,9 @@ function this.SetLevel(_level) end function this.GetLevel() + if this.level > 50 then + this.level = 50 + end return this.level end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index e6b47a80fe..89cede57f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -486,7 +486,7 @@ function this.TakeMissionRewardRequest(type, taskId, func) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.TakeMissionRewardResponse() msg:ParseFromString(data) - QinglongSerectTreasureManager.SetLevel(msg.treasureScore) + --QinglongSerectTreasureManager.SetLevel(msg.treasureScore) if func then func(msg) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 092ec0e89e..2ffb8a0dcd 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -272,7 +272,7 @@ function RoleInfoPanel:BindEvent() --前往化虚坛 Util.AddClick(this.goCompoundHero, function() if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.COMPOUND_HERO) then - JumpManager.GoJump(740001) + JumpManager.GoJump(750001) else PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.COMPOUND_HERO)) end diff --git a/data_execl/Language_data/LanguageLua.csv b/data_execl/Language_data/LanguageLua.csv index 5e68f61b4e..7c3302b74c 100644 --- a/data_execl/Language_data/LanguageLua.csv +++ b/data_execl/Language_data/LanguageLua.csv @@ -1878,7 +1878,7 @@ 11878,DZid 11879, 11880,߲㣡 -11881,1Ԫ +11881,1Ԫ20û 11882,1 11883, 11884,10Ԫ