zhibo
parent
842354c2e4
commit
73d45e64ef
|
@ -490,6 +490,7 @@ end
|
|||
|
||||
-- 解析世界聊天数据
|
||||
function this.AnalysisGlobalChat(msg)
|
||||
--LogError("聊天:"..msg)
|
||||
local chat = {}
|
||||
local msgList = string.split(msg, "|")
|
||||
local headStr = table.remove(msgList, 1)
|
||||
|
|
|
@ -632,8 +632,10 @@ function this.ChatItemAdapter(node, data, isShowTime, isShowServerName, isFriend
|
|||
else
|
||||
contentStr = data.msg
|
||||
end
|
||||
|
||||
-- LogError(data.content)
|
||||
--LogError("内容1:"..(data.content or ""))
|
||||
--LogError("内容2:"..(data.msg or ""))
|
||||
--LogError("内容3:"..data.msg)
|
||||
--LogError("内容4:"..contentStr)
|
||||
content.font = poolManager:LoadAsset(GetFont2(), PoolManager.AssetType.Other)
|
||||
content.text = GetNewChatMsg(contentStr)
|
||||
|
||||
|
|
|
@ -244,7 +244,7 @@ function SupportManager.CheckSkillIsEnough(curArtifactData)
|
|||
local artifactSkillLv = curArtifactData.sData.skillLevel
|
||||
|
||||
local supportLv = SupportManager.GetDataById("level")
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv)
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv<=31 and artifactSkillLv or 31)
|
||||
if configData == nil then
|
||||
return false
|
||||
end
|
||||
|
|
|
@ -321,7 +321,7 @@ function SupportPanel:UpdateActivateUpUI()
|
|||
--> skill
|
||||
local artifactId = this.curArtifactData.sData.artifactid
|
||||
local artifactSkillLv = 1
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv)
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv<=31 and artifactSkillLv or 31)
|
||||
local skillData = skillConfig[configData.SkillId]
|
||||
local desc = GetSkillConfigDesc(skillData)
|
||||
this.skillName.text = GetLanguageStrById(skillData.Name)
|
||||
|
@ -375,7 +375,7 @@ function SupportPanel:UpdateActivateDownUI()
|
|||
if isAllTaskGet then
|
||||
local artifactId = this.curArtifactData.sData.artifactid
|
||||
local artifactSkillLv = 1
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv)
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv<=31 and artifactSkillLv or 31)
|
||||
local skillData = skillConfig[configData.SkillId]
|
||||
local desc = GetSkillConfigDesc(skillData)
|
||||
Util.GetGameObject(this.activateFight,"skillName"):GetComponent("Text").text = GetLanguageStrById(skillData.Name)
|
||||
|
@ -622,12 +622,12 @@ function SupportPanel.SetSkillUI()
|
|||
local supportLv = SupportManager.GetDataById("level")
|
||||
|
||||
--cur
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv)
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv<=31 and artifactSkillLv or 31)
|
||||
local skillData = skillConfig[configData.SkillId]
|
||||
local desc = GetSkillConfigDesc(skillData)
|
||||
|
||||
--next
|
||||
local configDataNext = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv + 1)
|
||||
local configDataNext = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv + 1<=31 and (artifactSkillLv + 1) or 31)
|
||||
local skillDataNext = skillConfig[configDataNext.SkillId]
|
||||
local descNext = GetSkillConfigDesc(skillDataNext)
|
||||
|
||||
|
@ -881,7 +881,7 @@ function SupportPanel.SetAllSupportUI()
|
|||
|
||||
local artifactId = i
|
||||
local artifactSkillLv = SupportManager.GetSkillMaxLvById(artifactId)
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv)
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", artifactId, "SkillLevel", artifactSkillLv<=31 and artifactSkillLv or 31)
|
||||
local skillData = skillConfig[configData.SkillId]
|
||||
local desc = GetSkillConfigDesc(skillData)
|
||||
TitleText:GetComponent("Text").text = desc
|
||||
|
|
|
@ -78,7 +78,7 @@ function SupportSelectPanel:SetUIWithData(go, data)
|
|||
if data.openStatus ~= 0 then
|
||||
artifactSkillLv = SupportManager.GetDataById(data.supportId).skillLevel
|
||||
end
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", data.supportId, "SkillLevel", artifactSkillLv)
|
||||
local configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ArtifactSkillConfig, "ArtifactId", data.supportId, "SkillLevel", artifactSkillLv<=31 and artifactSkillLv or 31)
|
||||
local skillData = skillConfig[configData.SkillId]
|
||||
local desc = GetSkillConfigDesc(skillData)
|
||||
|
||||
|
|
Loading…
Reference in New Issue