From 9069b2ed2c1c7f3e760a00d362fc7897d707e279 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 10 Dec 2021 14:58:14 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=8B=9B=E5=8B=9F=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecruitTreasurePanel.prefab | 36 +++++++++---------- .../RecruitTreasureManager.lua | 3 +- .../TreasureOfHeaven/RecruitTreasurePanel.lua | 22 +++++++----- 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab index ddbf56594e..5b57e2dd37 100644 --- a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/RecruitTreasurePanel.prefab @@ -296,8 +296,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -227.7} - m_SizeDelta: {x: -115, y: -945.6} + m_AnchoredPosition: {x: 0, y: -194.27} + m_SizeDelta: {x: -115, y: -1012.56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &263232123 CanvasRenderer: @@ -788,8 +788,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -11.200012, y: -212} - m_SizeDelta: {x: -56, y: -850} + m_AnchoredPosition: {x: -11.200012, y: -181.5} + m_SizeDelta: {x: -56, y: -911} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &700413945 CanvasRenderer: @@ -1734,8 +1734,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 184, y: 175} + m_AnchoredPosition: {x: 0.12504, y: -0.04} + m_SizeDelta: {x: 160, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6962248010961131481 CanvasRenderer: @@ -1765,8 +1765,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 461e6af409ec67d45ba908596f22e977, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d8e19ffb0a1c14b4dba326a273e52e7a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1889,7 +1889,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 184, y: 175} + m_SizeDelta: {x: 160, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8921616627170501590 CanvasRenderer: @@ -1919,7 +1919,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d780da214597bd144b017ef450a9142d, type: 3} + m_Sprite: {fileID: 21300000, guid: adc4c40d7df40e94db1c69896e51878c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1986,7 +1986,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0.70980394, g: 0.6431373, b: 0.5058824, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1994,11 +1994,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 39 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -2876,7 +2876,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 74.9, y: 23} + m_AnchoredPosition: {x: 78.99998, y: 16.095001} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6875376091408120744 @@ -2950,7 +2950,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.000030517578, y: 38} + m_AnchoredPosition: {x: 0, y: 38} m_SizeDelta: {x: 0, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4125706634736168924 @@ -2971,7 +2971,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 27.71 + m_Spacing: 1.7 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -3106,7 +3106,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 9.15, y: 175.2} + m_AnchoredPosition: {x: 9.1501, y: 214.5} m_SizeDelta: {x: -96.7, y: 75.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5457082822150884615 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasureManager.lua index a1b14ac0d3..5a07b18c1c 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasureManager.lua @@ -38,8 +38,7 @@ end function this.CheckIsBuyTreasureByGoodsId(goodsId) local goodsInfo = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.RecruiteTreasure,goodsId) - LogGreen("goodsInfo.isBought:"..tostring(goodsInfo.isBought)) - return goodsInfo.isBought > 0 + return goodsInfo and goodsInfo.isBought > 0 end function this.GetConfigDataByActId(actId) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua index 170ca04782..f99cffbfd8 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua @@ -25,14 +25,15 @@ function RecruitTreasurePanel:InitComponent() this.buyBtn = Util.GetGameObject(self.transform, "bg/topBar/buyBtn") this.Text1 = Util.GetGameObject(this.buyBtn, "buy"):GetComponent("Text") this.tips = Util.GetGameObject(self.transform, "bg/topBar/tips"):GetComponent("Text") + this.topBarImage = Util.GetGameObject(self.transform, "bg/topBar"):GetComponent("Image") --Content this.scoreText = Util.GetGameObject(self.transform, "bg/pageContent/bg/score/number"):GetComponent("Text") this.treasureList = Util.GetGameObject(self.transform, "bg/pageContent/treasureList") this.itemPre = Util.GetGameObject(self.transform, "bg/pageContent/itemPro") - + local v = this.treasureList:GetComponent("RectTransform").rect --设置滚动条 - this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.treasureList.transform,this.itemPre,nil,Vector2.New(950, 1000),1,1,Vector2.New(100, 25)) + this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,this.treasureList.transform,this.itemPre,nil,Vector2.New(v.width, v.height),1,1,Vector2.New(100, 25)) this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, 0) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) @@ -92,6 +93,9 @@ end function this.OnPageTabChange(index) curPage = index + this.actId = configs[curPage].ActId + this.tips.text = configs[curPage].TitleText + this.topBarImage.sprite = this.spLoader:LoadSprite(configs[curPage].Icon[2]) this:refresh() end @@ -122,7 +126,6 @@ function RecruitTreasurePanel:OnShow(_sortingOrder) sortingOrder = _sortingOrder this.actType = this.actConfig.ActiveType > 0 and this.actConfig.ActiveType or this.actConfig.FunType this.titleImage.sprite = this.spLoader:LoadSprite(this.actConfig.Icon[3]) - local activeNum = 0 curPage = 0 for i = 1,#configs do @@ -148,15 +151,13 @@ function RecruitTreasurePanel:OnShow(_sortingOrder) if curPage < 1 then curPage = activeNum end - this.actData = ActivityGiftManager.GetActivityInfoByType(configs[curPage].ActId) this.PageTabCtrl:Init(this.tabbox.gameObject, configs,curPage) end function RecruitTreasurePanel:refresh() - this.actId = configs[curPage].ActId - this.tips.text = configs[curPage].TitleText - this.isBuy = RecruitTreasureManager.CheckIsBuyTreasureByGoodsId(configs[curPage].ShopData[1][1]) - LogGreen("this.isBuy:"..tostring(this.isBuy)) + this.treasureData = RecruitTreasureManager.GetRecruitTreasureData(configs[curPage].ActId,configs[curPage].ShopData[1][1]) + this.actData = ActivityGiftManager.GetActivityInfoByType(configs[curPage].ActId) + this.isBuy = RecruitTreasureManager.CheckIsBuyTreasureByGoodsId(configs[curPage].ShopData[1][1]) self:topBar() self:showTaskList() end @@ -318,6 +319,11 @@ end --界面销毁时调用(用于子类重写) function RecruitTreasurePanel:OnDestroy() this.spLoader:Destroy() + for k,v in pairs(this.itemsList) do + for n,m in pairs(v) do + SubUIManager.Close(m) + end + end this.itemsList = {} if this.ScrollView then SubUIManager.Close(this.ScrollView) From ad38176660d06d8188c42bad3a0fb43c857386ea Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 10 Dec 2021 15:08:17 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Data/ConfigData.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index 825350d8f8..5312c050e2 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -85,7 +85,7 @@ ConfigName = { GuildSetting = "GuildSetting", GuildLevelConfig = "GuildLevelConfig", GuildRewardConfig = "GuildRewardConfig", - ActivityRankingReward = "ActivityRankingRewardActivityRankingReward", + ActivityRankingReward = "ActivityRankingReward", ExchangeActivityConfig = "ExchangeActivityConfig", FloodConfig = "FloodConfig", LoginPosterConfig = "LoginPosterConfig", From 150e37ae786aeeafa6e8ab4b38b9ad74763f6b14 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 10 Dec 2021 15:22:18 +0800 Subject: [PATCH 03/10] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E6=95=88=E6=9E=9C144=E4=BF=AE=E6=94=B9=20=20=20=E6=8A=A4?= =?UTF-8?q?=E7=9B=BEbuff=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 4 +-- .../~Lua/Modules/Battle/Logic/Buff/Shield.lua | 35 +++++++++++-------- .../Battle/Logic/Misc/BattleDefine.lua | 2 +- .../Modules/Battle/View/Unit/EnemyView.lua | 2 ++ .../Modules/Battle/View/Unit/PlayerView.lua | 4 ++- .../Modules/Battle/View/Unit/RoleView.lua | 2 ++ 6 files changed, 31 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 70c966b18b..f41a79f475 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2822,7 +2822,7 @@ local effectList = { local round = args[3] BattleLogic.WaitForTrigger(interval, function () - local damage=floor(target:GetRoleData(p1)*v1) + local damage=floor(target:GetRoleData(BattlePropList[p1])*v1) local buff=Buff.Create(caster,BuffName.HOT,round,1,damage) buff.hotType=2 target:AddBuff(buff) @@ -2858,7 +2858,7 @@ local effectList = { local lessNum = max(maxNum - curNum, 0) local level = math.floor(lessNum/i1) local extra = BattleUtil.ErrorCorrection(level * v2) - local damage=floor(target:GetRoleData(pro)*(v1+extra)) + local damage=floor(target:GetRoleData(BattlePropList[pro])*(v1+extra)) BattleUtil.FinalDamageCountShield(nil,caster, target,damage) end) end, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua index 0b686a9eea..e8eac10a82 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua @@ -1,8 +1,7 @@ Shield = Buff:New() -- 无敌吸血盾的免疫状态 -local immune0 = function(buff) - return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT or buff.caster.camp~=buff.target.camp -end +local immune0 = nil +local onRoleBeHit=nil --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function Shield:SetData(...) @@ -16,26 +15,30 @@ function Shield:SetData(...) self.cover = self.shieldType ~= ShieldTypeName.NormalReduce -- 除固定减伤盾外都不能叠加 -- 刷新排序等级 self.sort = 4 -end - - -local onRoleBeHit=function(atkRole, damage, bCrit, finalDmg, damageType, skill) - --damagetype为3 是 舍身济世分摊伤害 - if damageType==3 then - return + immune0=function(buff) + return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT or buff.caster.camp~=self.target.camp end - if skill then --技能造成的直接伤害 - local rDamage = math.floor(damage*self.shieldValue) - if rDamage ~= 0 then - BattleUtil.ApplyDamage(nil,self.target,atkRole, rDamage) + onRoleBeHit=function(atkRole, damage, bCrit, finalDmg, damageType, skill) + --damagetype为3 是 舍身济世分摊伤害 + if damageType==3 then + return + end + if skill then --技能造成的直接伤害 + LogError("damage=="..damage.." shiledv=="..self.shieldValue.." type=="..self.shieldType) + local rDamage = math.floor(damage*self.shieldValue) + if rDamage ~= 0 then + BattleUtil.ApplyDamage(nil,self.target,atkRole, rDamage) + end end end end + --初始化后调用一次 function Shield:OnStart() self.target.shield:Add(self) + if self.shieldType == ShieldTypeName.AllReduce then self.target.buffFilter:Add(immune0) -- 清除所有负面buff @@ -96,6 +99,8 @@ function Shield:CountShield(damage, atkRole,skill) local treatValue = math.floor(BattleUtil.ErrorCorrection(damage * self.shieldValue)) BattleUtil.ApplyTreat(self.target, self.target, treatValue) end + elseif self.shieldType == ShieldTypeName.ThornsReduce then + finalDamage=damage end -- @@ -140,6 +145,8 @@ function Shield:PreCountShield(damage) elseif self.shieldType == ShieldTypeName.AllReduce then finalDamage = 0 + elseif self.shieldType == ShieldTypeName.ThornsReduce then + finalDamage=damage end return finalDamage end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 7ee2f06567..4e6faf4279 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -192,7 +192,7 @@ BattleEventName = { ImmuneDebuffSuccess = indexAdd(),--免疫debuff成功 ChangeRoleRage = indexAdd(),--改变角色怒气 PassiveChangeIgnoreDef = indexAdd(),--被动改变无视防御比例 - PassiveChangeDefDMGReFac = indexAdd(),--被动改变增伤比例 + PassiveChangeDefDMGReFac = indexAdd(),--被动改变防御方减伤比例 PassiveChangeRoleHit = indexAdd(),--被动改变角色命中 } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 0a7c1b7504..2d77d2bfc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -434,6 +434,8 @@ function EnemyView:OnShieldTrigger(shield,isImmuneAllReduceShield) if atkRole and not isImmuneAllReduceShield then self.Floater:ImageBuffFloating("z_zhandou_wudizi_zh") end + elseif shield.shieldType == ShieldTypeName.ThornsReduce then + -- body else self.Floater:ImageBuffFloating("z_zhandou_jianshang_zh") end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 9187ca9d6d..9bb4289c61 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -493,7 +493,9 @@ function PlayerView:OnShieldTrigger(shield,isImmuneAllReduceShield) if shield.shieldType == ShieldTypeName.AllReduce then if atkRole and not isImmuneAllReduceShield then self.Floater:ImageBuffFloating("z_zhandou_wudizi_zh") - end + end + elseif shield.shieldType == ShieldTypeName.ThornsReduce then + else self.Floater:ImageBuffFloating("z_zhandou_jianshang_zh") end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua index 1fc2dc86f5..ee4b653028 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua @@ -447,6 +447,8 @@ function RoleView:OnShieldTrigger(shield,isImmuneAllReduceShield) if atkRole and not isImmuneAllReduceShield then self.Floater:ImageBuffFloating("z_zhandou_wudizi_zh") end + elseif shield.shieldType == ShieldTypeName.ThornsReduce then + else self.Floater:ImageBuffFloating("z_zhandou_jianshang_zh") end From 9d218ee5126c9c9560d4c27b74e201aad4e541d0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 10 Dec 2021 16:09:28 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua index f99cffbfd8..6df5959a47 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua @@ -55,7 +55,6 @@ function RecruitTreasurePanel:BindEvent() this.PageTabCtrl:SetTabAdapter(this.PageTabAdapter) this.PageTabCtrl:SetTabIsLockCheck(this.PageTabIsLockCheck) this.PageTabCtrl:SetChangeTabCallBack(this.OnPageTabChange) - end function this.PageTabAdapter(tab, index, status) @@ -65,10 +64,11 @@ function this.PageTabAdapter(tab, index, status) local redpot = Util.GetGameObject(tab, "redpot") if status == "select" then select.gameObject:SetActive(true) + tip.text = string.format("%s","FDF4D6",configs[index].Icon[1]) else select.gameObject:SetActive(false) + tip.text = string.format("%s","B5A481",configs[index].Icon[1]) end - tip.text = configs[index].Icon[1] if redPointTypeList[configs[index].RpType] then ClearRedPointObject(configs[index].RpType,redPointTypeList[configs[index].RpType]) redPointTypeList[configs[index].RpType] = nil From 307264537c3bac10b7948479ac9d1e460b04196d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 10 Dec 2021 16:25:34 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8301=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 996c15825e..3a25a9c519 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -6999,17 +6999,19 @@ local passivityList = { local onPassiveDamaging = function(func, defRole, damage,skill) if skill and not skill.isTriggerJudge and judge==1 then return - end + end --观音,这个被动只有额外技能才能触发 by:王振兴 2021/1/21 17:48 - if skill and skill.type == BattleSkillType.Extra then + if skill and skill.isAdd and (skill.type == BattleSkillType.Extra or skill.type == BattleSkillType.Special ) then --如果是boss 并且额外伤害是根据最大生命则返回 if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then return end - local val = -floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1]))) - if func then - func(val) - end + local val = floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1]))) + -- LogError("val=="..val) + -- if func then + -- func(val) + -- end + BattleUtil.FinalDamageCountShield(nil,role,defRole,val) end end role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) From d2adaaba8de3d5881008cc0d3109efa9e799f149 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 10 Dec 2021 16:39:10 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=9D=83=E3=80=91?= =?UTF-8?q?=E4=BA=8C=E5=80=8D=E9=80=9F=E4=B8=8D=E5=86=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/PrivilegeManager.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index 4744fbcc81..a6921b59b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -255,12 +255,12 @@ function PrivilegeManager.GetPrivilegeOpenTip(privilegeType) -- end -- end -- end - if privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then - local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1) - -- local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1]) - -- return string.format("通关 %s 关卡解锁或玩家特权等级达到 %s 级解锁",GetLanguageStrById(fightConfig.Name),infoList[2]) - return string.format(Language[11406],lvOpenTimeScaleConFig.Condition[1][1]) - end + -- if privilegeType==PRIVILEGE_TYPE.DoubleTimesFight then + -- local lvOpenTimeScaleConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PrivilegeTypeConfig,"PrivilegeType",PRIVILEGE_TYPE.DoubleTimesFight,"UnlockType",1) + -- -- local fightConfig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, infoList[1]) + -- -- return string.format("通关 %s 关卡解锁或玩家特权等级达到 %s 级解锁",GetLanguageStrById(fightConfig.Name),infoList[2]) + -- return string.format(Language[11406],lvOpenTimeScaleConFig.Condition[1][1]) + -- end -- end local privilegeData = privilegeList[1] From 8fa3cfd2d199292731e11e10c36cd7eae312dc4d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 10 Dec 2021 17:36:04 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E3=80=90=E6=9C=88=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=88=E5=8D=A1=E6=BF=80=E6=B4=BB=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/MonthCardManager.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua index 2f363e8ec0..1c84a7f4f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua @@ -1,6 +1,10 @@ MonthCardManager = {} local this = MonthCardManager - +local MonthCardText = { + [MONTH_CARD_TYPE.MONTHCARD] = "普通月卡", + [MONTH_CARD_TYPE.LUXURYMONTHCARD] = "豪华月卡", + [MONTH_CARD_TYPE.GIFT] = "挚礼月卡", +} --初始化月卡数据 local monthCardData = {} function this.InitMonthCardData(data) @@ -24,8 +28,8 @@ function this.UpdateMonthCardData(msg) --当我数据没有 后端推过来的有数据 此时需要弹窗 this.showStr = "" for i = 1, #msg.monthinfos do - if monthCardData[i].endingTime <= 0 then - this.showStr = Language[11384] + if monthCardData[i].endingTime <= 0 then + this.showStr = string.format("恭喜您成功激活%s功能,是否立即前往月卡界面领取奖励。", MonthCardText[i])--Language[11384] end end monthCardData = {} From 3063e8244c955737fa0be2413d01ea0d6f95d187 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 10 Dec 2021 18:09:23 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E3=80=90=E5=8D=8F=E8=AE=AE=E3=80=91?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=89=AF=E6=9C=AC=E4=BC=A4=E5=AE=B3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Message/Family_pb.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/Family_pb.lua b/Assets/ManagedResources/~Lua/Message/Family_pb.lua index 5c3d1e9dcd..04cf72e9bc 100644 --- a/Assets/ManagedResources/~Lua/Message/Family_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Family_pb.lua @@ -3560,8 +3560,8 @@ GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.index = 5 GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.label = 1 GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.has_default_value = false GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.default_value = 0 -GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.type = 5 -GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.cpp_type = 1 +GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.type = 3 +GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.cpp_type = 2 GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.name = "refreshedBoss" GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.full_name = ".rpc.protocols.GetGuildChallengeInfoResponse.refreshedBoss" From eeda6a80c5dbbd0abfb29671fc28b398e88077c5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 10 Dec 2021 18:27:51 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E8=A7=92=E6=8A=80=E8=83=BD=E5=8D=A1?= =?UTF-8?q?=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/Unit/MonsterView.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua index 65d700bb97..3b24935098 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/MonsterView.lua @@ -144,6 +144,9 @@ end -- 播放动画 function MonsterView:PlaySpineAnim(gog, time, name, isLoop) + if self.isMainPlayer then + name = "idle" + end if isLoop then gog.AnimationState:SetAnimation(time, name, isLoop) else From 8ba26cd8b4f41c8f3ad05cee4a531ccf53852cab Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 10 Dec 2021 18:30:26 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E3=80=90=E5=8D=8F=E8=AE=AE=E3=80=91?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=89=AF=E6=9C=AC=E4=BC=A4=E5=AE=B3=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Message/Family_pb.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/Family_pb.lua b/Assets/ManagedResources/~Lua/Message/Family_pb.lua index 04cf72e9bc..5340ea3eb5 100644 --- a/Assets/ManagedResources/~Lua/Message/Family_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Family_pb.lua @@ -3656,8 +3656,8 @@ GUILDCHALLENGERESPONSE_DAMAGE_FIELD.index = 3 GUILDCHALLENGERESPONSE_DAMAGE_FIELD.label = 1 GUILDCHALLENGERESPONSE_DAMAGE_FIELD.has_default_value = false GUILDCHALLENGERESPONSE_DAMAGE_FIELD.default_value = 0 -GUILDCHALLENGERESPONSE_DAMAGE_FIELD.type = 5 -GUILDCHALLENGERESPONSE_DAMAGE_FIELD.cpp_type = 1 +GUILDCHALLENGERESPONSE_DAMAGE_FIELD.type = 3 +GUILDCHALLENGERESPONSE_DAMAGE_FIELD.cpp_type = 2 GUILDCHALLENGERESPONSE.name = "GuildChallengeResponse" GUILDCHALLENGERESPONSE.full_name = ".rpc.protocols.GuildChallengeResponse"