From c57a5ec8ebd97f8fc5f86332da1e49e4358fc109 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" Date: Mon, 18 Jan 2021 10:33:32 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A1=86=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/HeadManager.lua | 10 ++++++--- .../Popup/RewardItemSingleShowPopup.lua | 22 ++++++++++++++----- .../~Lua/View/PlayerHeadView.lua | 1 + 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua index 4ef42758f8..21f9d18f93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua @@ -78,7 +78,11 @@ end -- 获取头像框 function HeadManager.GetHeadFrameList() if #this._MyHeadFrameList == 0 then - this._MyHeadFrameList = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.ItemConfig, "ItemType", ItemType.HeadFrame, "Ifopen", 1) + --this._MyHeadFrameList = ConfigManager.GetConfig(ConfigName.PlayerHeadIcon) --ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.ItemConfig, "ItemType", ItemType.HeadFrame, "Ifopen", 1) + for key, value in ConfigPairs(ConfigManager.GetConfig(ConfigName.PlayerHeadIcon)) do + -- body + table.insert(this._MyHeadFrameList,value) + end end return this._MyHeadFrameList end @@ -179,7 +183,7 @@ function HeadManager.SetHeadFrameAllData(data) local single_data = {} single_data.headFrameId = data[i].headFrameId single_data.validTime = data[i].validTime - single_data.PlayerHeadIcon = ConfigManager.GetConfigDataByKey(ConfigName.PlayerHeadIcon,"ItemId",single_data.headFrameId) + single_data.PlayerHeadIcon = ConfigManager.GetConfigDataByKey(ConfigName.PlayerHeadIcon,"Id",single_data.headFrameId) this.headFrameData[single_data.headFrameId] = single_data end -- body @@ -191,7 +195,7 @@ function HeadManager.SetSineleHeadFrameAllData(headFrameId,time) single_data.headFrameId = headFrameId single_data.validTime = time LogGreen(" headFrameId ".. headFrameId.." time "..time ) - single_data.PlayerHeadIcon = ConfigManager.GetConfigDataByKey(ConfigName.PlayerHeadIcon,"ItemId",single_data.headFrameId) + single_data.PlayerHeadIcon = ConfigManager.GetConfigDataByKey(ConfigName.PlayerHeadIcon,"Id",single_data.headFrameId) this.headFrameData[single_data.headFrameId] = single_data end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 8ebd8074bf..4aeb77eea3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -129,11 +129,23 @@ function RewardItemSingleShowPopup:BindEvent() end) end elseif itemConfigData.ItemType == ItemType.HeadFrame then - LogBlue("itemSid "..itemSid) - NetManager.UseHeadFrameRequestFun(itemSid,function (msg) - HeadManager.SetSineleHeadFrameAllData(itemSid,msg.validTime) - self:ClosePanel() - end) + HeadManager.GetCurFrameId() + local theFrameData = HeadManager.GetSingleFrame(itemSid) + if theFrameData then + MsgPanel.ShowTwo("当前已激活该头像框,是否要重复使用?",nil,function() + NetManager.UseHeadFrameRequestFun(itemSid,function (msg) + HeadManager.SetSineleHeadFrameAllData(itemSid,msg.validTime) + self:ClosePanel() + PopupTipPanel.ShowTip("成功激活头像框!") + end) + end) + else + NetManager.UseHeadFrameRequestFun(itemSid,function (msg) + HeadManager.SetSineleHeadFrameAllData(itemSid,msg.validTime) + self:ClosePanel() + PopupTipPanel.ShowTip("成功激活头像框!") + end) + end elseif itemConfigData then JumpManager.GoJump(itemConfigData.UseJump,function () this:ClosePanel() diff --git a/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua b/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua index bdf64ba1c8..1d741fef68 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerHeadView.lua @@ -54,6 +54,7 @@ end -- 设置头像框 function PlayerHeadView:SetFrame(frameId) self.frame:SetActive(true) + print(frameId) self.frame:GetComponent("Image").sprite = GetPlayerHeadFrameSprite(frameId) -- 检测特效 self:UnLoadFrameEffect() From 72844ea7ab7ce9a37276e4182999265318781482 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 18 Jan 2021 10:56:02 +0900 Subject: [PATCH 02/10] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=E8=A2=AB=E5=8A=A8299=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index b8b79987c8..6072752648 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -6230,11 +6230,18 @@ local passivityList = { local f1 = args[2] local OnDead = function(atkRole) - local arr = BattleUtil.ChooseTarget(role, 100000) - for i=1, #arr do - local val = floor(BattleUtil.FP_Mul(f1, arr[i]:GetRoleData(BattlePropList[pro]))) - BattleUtil.CalTreat(role, arr[i], val) - end + BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function () --延时一帧做处理,我方场上所有单位都结算死亡以后,再处理299被动回血 + local arr = BattleUtil.ChooseTarget(role, 100000) + if arr==nil then + return + end + for i=1, #arr do + if not arr[i]:IsDead() then + local val = floor(BattleUtil.FP_Mul(f1, arr[i]:GetRoleData(BattlePropList[pro]))) + BattleUtil.CalTreat(role, arr[i], val) + end + end + end) end role.Event:AddEvent(BattleEventName.RoleDead, OnDead) end, From c1aa2626bc24b97546e576f6b5f450c2778e82a7 Mon Sep 17 00:00:00 2001 From: guowei Date: Mon, 18 Jan 2021 11:07:07 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A1=86=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 5 +++++ .../~Lua/Modules/Setting/HeadChangePopup.lua | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 2485b4ba73..d5c5cb6ef0 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1371,6 +1371,11 @@ function TimeStampToDateStr(timestamp) end return string.format(Language[12119], date.year, date.month, date.day, date.hour, date.min) end +function TimeStampToDateStr2(timestamp) + local date = os.date("*t", timestamp) + local cdate = os.date("*t", GetTimeStamp()) + return string.format(Language[12119], date.year, date.month, date.day, date.hour, date.min) +end -- 将时间戳转换为用于显示的日期字符串(时分秒) function TimeStampToDateStr3(second) local minute = math.floor(second / 60) % 60 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua index d95524e85a..a58cfa2a3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua @@ -315,7 +315,7 @@ function this.SelectItem(index, item) if not data then return end if data.Id >=80000 and HeadData and HeadData.validTime - GetTimeStamp() > 0 then -- body - this.content.text = data.ItemDescribe .."到期时间:"..TimeStampToDateStr(HeadData.validTime) + this.content.text = data.ItemDescribe .."到期时间:"..TimeStampToDateStr2(HeadData.validTime) else this.content.text = data.ItemDescribe end From 1d65116a84f781af4df32b94b2ba798db441748f Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 18 Jan 2021 14:23:56 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua index 2883088a5b..ab3562b845 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua @@ -16,11 +16,8 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), this.timer = Timer.New() local challengeNum = 0 local lootNum = 0 -<<<<<<< HEAD local isPlayAnim = true local bossNum = 0 -======= ->>>>>>> a064d83bf... 【车迟斗法】boss轮转 --初始化组件(用于子类重写) function GuildCarDelayMainPanel:InitComponent() this.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot") From b9479d83269b0ba01c6b45a38d1bd62a9c7b84c1 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 18 Jan 2021 14:31:54 +0900 Subject: [PATCH 05/10] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=E8=A2=AB=E5=8A=A8154=E4=BF=AE=E6=94=B9=20=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E300=E8=A2=AB=E5=8A=A8=20=20=20Hot=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=BB=E7=96=97=E9=87=8F=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=A4=8D=E6=B4=BB=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 50 +++++++++++++++---- .../~Lua/Modules/Battle/Logic/Buff/HOT.lua | 8 +++ .../Modules/Battle/Logic/Role/RoleLogic.lua | 9 ++++ 3 files changed, 58 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 6072752648..b118d55849 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2955,15 +2955,17 @@ local passivityList = { if deadRole==role then return end - if deadRole.camp == role.camp then - if ele and v1 and deadRole.element==ele then - f1=v1 + BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function () --延时一帧做处理,我方场上所有单位都结算死亡以后,再处理299被动回血 + if deadRole.camp == role.camp and not role:IsDead() then + if ele and v1 and deadRole.element==ele then + f1=v1 + end + counter = counter + 1 + if counter == i1 then + deadRole:SetRelive(f1) + end end - counter = counter + 1 - if counter == i1 then - deadRole:SetRelive(f1) - end - end + end) end BattleLogic.Event:AddEvent(BattleEventName.RoleRealDead, onRoleRealDead) end, @@ -6176,7 +6178,6 @@ local passivityList = { end if skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra then local list = skill:GetDirectTargetsNoMiss() - LogError(LengthOfTable(list)) if list then local isHave=false for key, value in pairs(list) do @@ -6246,6 +6247,37 @@ local passivityList = { role.Event:AddEvent(BattleEventName.RoleDead, OnDead) end, + --修改持续效果的治疗值为[a] [b]属性的[c]% + --a[int] b[float] + [300]=function(role,args,id,judge) + local pro=args[1] + local v1=args[2] + + local onSkillCastEnd = function(skill) + if not skill or skill.type~= BattleSkillType.Special then + return + end + if skill and judge==1 and not skill.isTriggerJudge then + return + end + BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function () --延迟一帧移除事件,才能抓到添加效果字典里面的效果 + local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * v1)) + if tv and tv<=0 then + return + end + local list=skill:GetDirectTargetsNoMiss() + for _, role1 in ipairs(list) do + BattleLogic.BuffMgr:QueryBuff(role1, function(buff) + if buff.type == BuffName.HOT and buff.caster == role and buff.roundDuration>1 and buff.startRound==BattleLogic.GetCurRound() then + buff:ChangeHealValue(tv) + end + end) + end + end) + end + role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd) + end, + } return passivityList \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua index 5817a06598..d441181461 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua @@ -10,12 +10,20 @@ function HOT:SetData(...) self.sort = 1 -- 最先计算回血 end + --初始化后调用一次 function HOT:OnStart() self.target.Event:DispatchEvent(BattleEventName.RoleBeHealed, self.caster) end +--修改持续加血效果的加血值 +function HOT:ChangeHealValue(newValue) + if newValue then + self.healValue=newValue + end +end + --间隔N帧触发,返回true时表示继续触发,返回false立刻触发OnEnd function HOT:OnTrigger() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 80e76a863b..071d3aeed0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -557,6 +557,15 @@ function RoleLogic:SetRelive(hpf, caster) self.reliveHPF = hpf or 1 self.reliveCaster = caster RoleManager.AddReliveRole(self) + local maxHp = self.data:GetData(RoleDataName.MaxHp) + local reHp = floor(self.reliveHPF * maxHp) + self.data:SetValue(RoleDataName.Hp, reHp) + -- 发送复活事件 + --self.Event:DispatchEvent(BattleEventName.RoleRelive, self) + --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) + -- 复活的血量算做加血 + BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) + return true end return false end From 27666918f70b453c5c8a1749efb35e5a9724c60a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 18 Jan 2021 14:53:16 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E3=80=90ID1007938=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E5=AF=BB=E5=AE=9D=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E9=94=81=E5=AE=9A=E5=92=8C=E8=A7=A3=E9=94=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua index 1e40970322..299419b46d 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua @@ -393,8 +393,10 @@ function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,reward Util.AddOnceClick(lockBtn, function() if rewardData.lock == 0 then rewardData.lock = 1 + PopupTipPanel.ShowTip("已锁定任务!") else rewardData.lock = 0 + PopupTipPanel.ShowTip("已将任务解锁!") end NetManager.MissingRoomLockRequest(rewardData.missionId,rewardData.lock, function() --刷新界面 From 344ec52500cd7b1a9d747a24a6ac357a4ab80bf5 Mon Sep 17 00:00:00 2001 From: guowei Date: Mon, 18 Jan 2021 15:07:23 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Arena/ArenaManager.lua | 2 +- .../~Lua/Modules/Arena/ArenaRecordPopup.lua | 2 +- .../ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua | 2 +- .../~Lua/Modules/Chat/FriendChatPanel.lua | 2 +- .../~Lua/Modules/Formation/View/PlayWithSBFormation.lua | 2 +- .../ManagedResources/~Lua/Modules/Player/HeadManager.lua | 7 +++++-- .../~Lua/Modules/Setting/HeadChangePopup.lua | 8 ++++---- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index 13cab0e181..6048931fc6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -161,7 +161,7 @@ function this.RequestArenaChallenge(index, isSkip, func) arg.blue.uid = PlayerManager.uid arg.blue.name = PlayerManager.nickName arg.blue.head = PlayerManager.head - arg.blue.frame = PlayerManager.frame + arg.blue.frame = HeadManager.GetCurFrameId() arg.blue.deltaScore = msg.myScoreChange arg.red= {} arg.red.uid = enemy.personInfo.uid diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua index d40025f623..235fb58b41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua @@ -126,7 +126,7 @@ function this.RankNodeAdapter(node, data) arg.red.uid = PlayerManager.uid arg.red.name = PlayerManager.nickName arg.red.head = PlayerManager.head - arg.red.frame = PlayerManager.frame + arg.red.frame = HeadManager.GetCurFrameId() arg.red.deltaScore = data.myScoreChange UIManager.OpenPanel(UIName.ArenaResultPopup, arg) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua index e805bae5c4..88f604fec9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/MinMapPopup.lua @@ -150,7 +150,7 @@ function this.SetRoleInfo(pos) this.role:SetActive(true) this.SetIconPos(x, y, this.role, true) - this.roleFrame.sprite = GetPlayerHeadFrameSprite(PlayerManager.frame) + this.roleFrame.sprite = GetPlayerHeadFrameSprite(HeadManager.GetCurFrameId()) this.roleIcon.sprite = GetPlayerHeadSprite(PlayerManager.head) this.roleLv = PlayerManager.level diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua index a3f122b9b9..f2f3318d8b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua @@ -463,7 +463,7 @@ function this.ChatItemAdapter(node, data, isShowTime) lv.text = PlayerManager.level name.text = PlayerManager.nickName head.sprite = GetPlayerHeadSprite(PlayerManager.head) - headKuang.sprite = GetPlayerHeadFrameSprite(PlayerManager.frame) + headKuang.sprite = GetPlayerHeadFrameSprite(HeadManager.GetCurFrameId()) else lv.text = data.senderlevel name.text = data.senderName diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua index 6dbc352369..cd623ecd3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua @@ -144,7 +144,7 @@ function this.ChatItemAdapter(node, data, isShowTime) lv.text = PlayerManager.level name.text = PlayerManager.nickName head.sprite = GetPlayerHeadSprite(PlayerManager.head) - headKuang.sprite = GetPlayerHeadFrameSprite(PlayerManager.frame) + headKuang.sprite = GetPlayerHeadFrameSprite(HeadManager.GetCurFrameId()) else lv.text = this.friendData.lv name.text = this.friendData.name diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua index a9250ee416..03d31e7c54 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/PlayWithSBFormation.lua @@ -46,7 +46,7 @@ function this.On_Btn2_Click() arg.blue.uid = PlayerManager.uid arg.blue.name = PlayerManager.nickName arg.blue.head = PlayerManager.head - arg.blue.frame = PlayerManager.frame + arg.blue.frame = HeadManager.GetCurFrameId() arg.red= {} arg.red.uid = this.pData.uid arg.red.name = this.pData.name diff --git a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua index 21f9d18f93..09b38635eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua @@ -207,6 +207,9 @@ function HeadManager.GetSingleFrame(Did) return nil end end +function HeadManager.SetCurFrameId(frame) + PlayerManager.frame= frame +end function HeadManager.GetCurFrameId() local freameData = this.headFrameData[PlayerManager.frame] @@ -217,7 +220,7 @@ function HeadManager.GetCurFrameId() this.headFrameData[PlayerManager.frame] = nil end end - PlayerManager.frame = 80000 - return 80000 + HeadManager.SetCurFrameId(80000) + return PlayerManager.frame end return HeadManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua index a58cfa2a3a..1c54d8f209 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/HeadChangePopup.lua @@ -98,7 +98,7 @@ function HeadChangePopup:BindEvent() end NetManager.RequestChangeModifyDecoration(0, frameId, function () PopupTipPanel.ShowTip(Language[11891]) - PlayerManager.frame = frameId + HeadManager.SetCurFrameId(frameId) Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnHeadFrameChange) this.RefreshCurShow() end) @@ -181,7 +181,7 @@ function this.OnTabChange(index, lastIndex) if index == SELECT_TYPE.FRAME then datalist = _HeadFrameList --print(#datalist.." 77777") - curId = PlayerManager.frame + curId = HeadManager.GetCurFrameId() this.title.text = Language[11893] elseif index == SELECT_TYPE.HEAD then datalist = _HeadList @@ -242,7 +242,7 @@ function this.HeadFrameItemAdapter(item, data, index) _PlayerHeadList[item]:SetHead(PlayerManager.head) _PlayerHeadList[item]:SetLayer(this.sortingOrder) _PlayerHeadList[item]:SetEffectScale(1.1) - if frameId == PlayerManager.frame then + if frameId == HeadManager.GetCurFrameId() then this:SetUsing(_PlayerHeadList[item].gameObject) else this:RecycleUsing(_PlayerHeadList[item].gameObject) @@ -261,7 +261,7 @@ function this.HeadFrameItemAdapter(item, data, index) local headId = data.Id name:GetComponent("Text").text = data.Name _PlayerHeadList[item]:SetHead(headId) - _PlayerHeadList[item]:SetFrame(PlayerManager.frame) + _PlayerHeadList[item]:SetFrame(HeadManager.GetCurFrameId()) _PlayerHeadList[item]:SetLayer(this.sortingOrder) _PlayerHeadList[item]:SetEffectScale(1.1) if headId == PlayerManager.head then From 2d8cf57a08c16990d8b170a3dbcf3e5987219275 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 18 Jan 2021 15:11:27 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E3=80=90=E8=BD=A6=E8=BF=9F=E6=96=97?= =?UTF-8?q?=E6=B3=95=E3=80=91=E6=88=98=E6=96=97=E5=90=8Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardItemPopup.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index e97278b890..63d9392521 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -147,6 +147,10 @@ function RewardItemPopup:OnOpen(...) this.btnResult:SetActive(haveRecord and args[5]) this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and not GuideManager.IsInMainGuide()) this.btnResultMax:SetActive(haveRecord and args[5]) + this.expeditionGo:SetActive(compShowType == 5) + this.guildDeathPos:SetActive(compShowType == 4) + this.guildTranscript:SetActive(compShowType == 6) + this.guildCarDelay:SetActive(compShowType == 3) -- 设置背景遮罩的显隐 local isHideBG = args[6] this.btnBack:GetComponent("Image").color = Color.New(0, 0, 0, isHideBG and 0 or 0.8) @@ -160,10 +164,6 @@ function RewardItemPopup:OnOpen(...) end return end - - this.expeditionGo:SetActive(compShowType == 5) - this.guildDeathPos:SetActive(compShowType == 4) - this.guildTranscript:SetActive(compShowType == 6) if compShowType == 4 then this.GuildDeathPosShow() end From f6b4a710c8c73042b9e6a0a21018ed91e2401bb4 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 18 Jan 2021 15:50:56 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E5=9B=9E?= =?UTF-8?q?=E6=94=BE=E3=80=91=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=E6=88=98?= =?UTF-8?q?=E6=96=97=E5=90=8E=EF=BC=8C=E5=9C=A8=E6=A3=AE=E7=BD=97=E5=B9=BB?= =?UTF-8?q?=E5=A2=83=E4=B8=AD=E6=9F=A5=E7=9C=8B=E6=88=98=E6=96=97=E5=9B=9E?= =?UTF-8?q?=E6=94=BE=EF=BC=8C=E6=92=AD=E6=94=BE=E7=9A=84=E6=98=AF=E5=A4=A7?= =?UTF-8?q?=E9=97=B9=E5=A4=A9=E5=AE=AB=E5=9B=9E=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua | 2 +- .../ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index 82d7bd391b..f5899b163e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -89,7 +89,7 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) FightPointPassManager.FightBattleEnd() Util.GetGameObject(this.btnClose, "record"):SetActive(m_showRecord) Util.GetGameObject(this.btnClose,"tip"):SetActive(not fightType ==12)--副本内无法点击招募 - if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide() then--地图 + if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide() or MapManager.Mapping then--地图 this.btnBattleBack:SetActive(false) else this.btnBattleBack:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 63d9392521..cd0e27dc82 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -137,7 +137,7 @@ function RewardItemPopup:OnOpen(...) if args[4] then compShowType = args[4] - end + end if args[7] then showHero = false else @@ -145,7 +145,7 @@ function RewardItemPopup:OnOpen(...) end local haveRecord = BattleRecordManager.isHaveRecord() this.btnResult:SetActive(haveRecord and args[5]) - this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and not GuideManager.IsInMainGuide()) + this.btnBattleBack:SetActive(haveRecord and args[5] and BattleManager.GetLastBattleType() ~= BATTLE_TYPE.MAP_FIGHT and not GuideManager.IsInMainGuide() and not MapManager.Mapping) this.btnResultMax:SetActive(haveRecord and args[5]) this.expeditionGo:SetActive(compShowType == 5) this.guildDeathPos:SetActive(compShowType == 4) From 95e15caa9af3da6bc9ce2aa5db594d20e75bfb27 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 18 Jan 2021 17:13:51 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8=20137=20=20=E4=BF=AE=E6=94=B9=20=20=20?= =?UTF-8?q?=E5=A4=8D=E6=B4=BB=E5=90=8E=E8=A1=80=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 4 ++-- .../Modules/Battle/Logic/Role/RoleLogic.lua | 20 +++++++++---------- .../Modules/Battle/View/Unit/EnemyView.lua | 1 + .../Modules/Battle/View/Unit/PlayerView.lua | 2 +- .../Modules/Battle/View/Unit/RoleView.lua | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index b118d55849..9ebfcd76d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2526,7 +2526,7 @@ local passivityList = { -- 技能后后 local onSkillEnd = function(skill) if skill.type == BattleSkillType.Special then - local list = skill:GetDirectTargetsNoMiss() + local list = skill:GetDirectTargets() if list then local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1)) for _, r in ipairs(list) do @@ -6247,7 +6247,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.RoleDead, OnDead) end, - --修改持续效果的治疗值为[a] [b]属性的[c]% + --修改持续效果的治疗值为[a]属性的[b]% --a[int] b[float] [300]=function(role,args,id,judge) local pro=args[1] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 071d3aeed0..f099ebb663 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -539,7 +539,7 @@ function RoleLogic:Relive() self.data:SetValue(RoleDataName.Hp, reHp) -- 发送复活事件 self.Event:DispatchEvent(BattleEventName.RoleRelive, self) - BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) + --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) -- 复活的血量算做加血 BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) return true @@ -557,15 +557,15 @@ function RoleLogic:SetRelive(hpf, caster) self.reliveHPF = hpf or 1 self.reliveCaster = caster RoleManager.AddReliveRole(self) - local maxHp = self.data:GetData(RoleDataName.MaxHp) - local reHp = floor(self.reliveHPF * maxHp) - self.data:SetValue(RoleDataName.Hp, reHp) - -- 发送复活事件 - --self.Event:DispatchEvent(BattleEventName.RoleRelive, self) - --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) - -- 复活的血量算做加血 - BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) - return true + -- local maxHp = self.data:GetData(RoleDataName.MaxHp) + -- local reHp = floor(self.reliveHPF * maxHp) + -- self.data:SetValue(RoleDataName.Hp, reHp) + -- -- 发送复活事件 + -- --self.Event:DispatchEvent(BattleEventName.RoleRelive, self) + -- --BattleLogic.Event:DispatchEvent(BattleEventName.RoleRelive, self) + -- -- 复活的血量算做加血 + -- BattleLogic.Event:DispatchEvent(BattleEventName.RecordTreat, self.reliveCaster or self, self, reHp) + -- return true end return false end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index f158cd2cfa..2004cc7bd0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -546,6 +546,7 @@ function EnemyView:onRoleRelive() self.RoleLiveGOGraphic2.freeze = false self.isDead = false + self.hpSlider.fillAmount=self.role:GetRoleData(RoleDataName.Hp) / self.role:GetRoleData(RoleDataName.MaxHp) -- self.Floater:TextBuffFloating(4, Language[10285]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index b2259a5a1d..777e490a73 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -583,7 +583,7 @@ function PlayerView:onRoleRelive() self.RoleLiveGOGraphic2.freeze = false self.isDead = false - + self.hpSlider.fillAmount=self.role:GetRoleData(RoleDataName.Hp) / self.role:GetRoleData(RoleDataName.MaxHp) -- self.Floater:TextBuffFloating(4, Language[10285]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua index 865d8c872b..82506d6009 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua @@ -680,7 +680,7 @@ function RoleView:onRoleRelive() self.RoleLiveGOGraphic2.freeze = false self.isDead = false - + self.hpSlider.fillAmount=self.role:GetRoleData(RoleDataName.Hp) / self.role:GetRoleData(RoleDataName.MaxHp) -- self.Floater:TextBuffFloating(4, Language[10285]) end