diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_kqmw01.mp3 b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_kqmw01.mp3 index 059ace5859..3c85e6b274 100644 Binary files a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_kqmw01.mp3 and b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_kqmw01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zbj01.mp3 b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zbj01.mp3 index 9a64159e2c..0bfa987a16 100644 Binary files a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zbj01.mp3 and b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_zbj01.mp3 differ diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index 13b742c1c4..cd54fa07a9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -17820,7 +17820,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 245, y: 245, z: 0} initFloat: 0 @@ -35242,7 +35241,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: -350, z: 0} initFloat: 0 @@ -83585,7 +83583,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 350, y: 0, z: 0} initFloat: 0 @@ -165732,7 +165729,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: -350, y: 0, z: 0} initFloat: 0 @@ -196660,7 +196656,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: -245, y: 245, z: 0} initFloat: 0 @@ -211825,7 +211820,7 @@ RectTransform: m_GameObject: {fileID: 5778745134577080660} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3327171285949190197} m_RootOrder: 0 @@ -259966,7 +259961,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 245, y: -245, z: 0} initFloat: 0 @@ -261456,7 +261450,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: -245, y: -245, z: 0} initFloat: 0 @@ -262329,7 +262322,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} m_Name: m_EditorClassIdentifier: - tweenSequeue1: tweenSequeue: - initV3: {x: 0, y: 350, z: 0} initFloat: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua index 60493c6534..21d8417ea6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua @@ -587,43 +587,69 @@ function this.ItemsSortData(_itemDatas) if sortIndex == 0 then --0全部 1装备 2材料 3消耗 4特殊 5碎片 if a.itemConfig.ItemBaseType == b.itemConfig.ItemBaseType then - if a.itemConfig.Quantity == b.itemConfig.Quantity then if a.itemConfig.ItemType == a.itemConfig.ItemType then if a.itemConfig.ItemType == ItemType.Talisman and b.itemConfig.ItemType == ItemType.Talisman then - if a.star == b.star then - return a.id < b.id + if a.itemConfig.Quantity == b.itemConfig.Quantity then + if a.star == b.star then + return a.id < b.id + else + return a.star > b.star + end else - return a.star > b.star + return a.itemConfig.Quantity > b.itemConfig.Quantity end end if a.itemConfig.ItemType == ItemType.HunYin and b.itemConfig.ItemType == ItemType.HunYin then - if a.quality == b.quality then - return a.id > b.id + if a.itemConfig.Quantity == b.itemConfig.Quantity then + if a.quality == b.quality then + return a.id > b.id + else + return a.quality > b.quality + end else - return a.quality > b.quality + return a.itemConfig.Quantity > b.itemConfig.Quantity end end if a.itemConfig.ItemType == ItemType.EquipTreasure and b.itemConfig.ItemType == ItemType.EquipTreasure then - if a.refineLv == b.refineLv then - if a.lv == b.lv then - return a.id > b.id + if a.itemConfig.Quantity == b.itemConfig.Quantity then + if a.refineLv == b.refineLv then + if a.lv == b.lv then + return a.id > b.id + else + return a.lv > b.lv + end else - return a.lv > b.lv + return a.refineLv > b.refineLv end else - return a.refineLv > b.refineLv + return a.itemConfig.Quantity > b.itemConfig.Quantity + end + end + if a.itemConfig.ItemType == ItemType.HeroDebris and b.itemConfig.ItemType == ItemType.HeroDebris then + local aNum = BagManager.GetItemCountById(a.itemConfig.Id) >= a.itemConfig.UsePerCount and 2 or 1 + local bNum = BagManager.GetItemCountById(b.itemConfig.Id) >= b.itemConfig.UsePerCount and 2 or 1 + if aNum == bNum then + if a.itemConfig.Quantity == b.itemConfig.Quantity then + if a.itemConfig.PropertyName == b.itemConfig.PropertyName then + return a.id < b.id + else + return a.itemConfig.PropertyName < b.itemConfig.PropertyName + end + else + return a.itemConfig.Quantity > b.itemConfig.Quantity + end + else + return aNum > bNum end end else return a.itemConfig.ItemType < b.itemConfig.ItemType end - else - return a.itemConfig.Quantity > b.itemConfig.Quantity - end + else return a.itemConfig.ItemBaseType < b.itemConfig.ItemBaseType end - elseif sortIndex == ItemBaseType.Equip or sortIndex == ItemBaseType.Materials or sortIndex == ItemBaseType.Special or sortIndex == ItemBaseType.HeroChip then + elseif sortIndex == ItemBaseType.Equip or sortIndex == ItemBaseType.Materials or sortIndex == ItemBaseType.Special then if a.itemConfig.Quantity == b.itemConfig.Quantity then if a.itemConfig.ItemType == b.itemConfig.ItemType then return a.id > b.id @@ -633,6 +659,22 @@ function this.ItemsSortData(_itemDatas) else return a.itemConfig.Quantity > b.itemConfig.Quantity end + elseif sortIndex == ItemBaseType.HeroChip then + local aNum = BagManager.GetItemCountById(a.itemConfig.Id) >= a.itemConfig.UsePerCount and 2 or 1 + local bNum = BagManager.GetItemCountById(b.itemConfig.Id) >= b.itemConfig.UsePerCount and 2 or 1 + if aNum == bNum then + if a.itemConfig.Quantity == b.itemConfig.Quantity then + if a.itemConfig.PropertyName == b.itemConfig.PropertyName then + return a.id < b.id + else + return a.itemConfig.PropertyName < b.itemConfig.PropertyName + end + else + return a.itemConfig.Quantity > b.itemConfig.Quantity + end + else + return aNum > bNum + end elseif sortIndex == ItemBaseType.DemonSoul then local aNum = BagManager.GetItemCountById(a.itemConfig.Id) >= a.itemConfig.UsePerCount and 2 or 1 local bNum = BagManager.GetItemCountById(b.itemConfig.Id) >= b.itemConfig.UsePerCount and 2 or 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 2c37f9cb4c..48c50c1c89 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1984,7 +1984,7 @@ local passivityList = { local i1 = args[1] -- 释放技能后 local onRoleHit = function(target) - if target:IsDead() then + if target:IsDead() and BattleLogic.BuffMgr:HasBuff(target,BuffName.NoDead)==false then for i = 1, i1 do role:AddSkill(BattleSkillType.Normal, false, true, nil) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua index c737d80b08..0ea440f379 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/RoleView.lua @@ -985,6 +985,10 @@ end -- 检测特效旋转 function RoleView:CheckRotate(go, orientation) -- 判断是否旋转 + if orientation==nil then + -- body + return false + end local isR = orientation[1] and orientation[1][1] or 0 local rt = orientation[2] rt = rt and Vector3.New(rt[1], rt[2], rt[3]) or Vector3.zero diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua index d614565baf..ea2eb73e1d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua @@ -94,7 +94,11 @@ function MainShopPanel:OnOpen(chooseIndex) -- 初始化tab数据 this.PageTabCtrl:Init(this.tabbox, _PageInfo) - this._CurPageIndex = chooseIndex or 1 + + this._CurPageIndex = 1 + if chooseIndex and _PageInfo[chooseIndex] then + this._CurPageIndex = chooseIndex + end end diff --git a/data_execl/base_data/RecommendTeam.xlsx b/data_execl/base_data/RecommendTeam.xlsx index f7b2fcaf0a..b084f4376b 100644 Binary files a/data_execl/base_data/RecommendTeam.xlsx and b/data_execl/base_data/RecommendTeam.xlsx differ diff --git a/data_execl/base_data/SpecialConfig.xlsx b/data_execl/base_data/SpecialConfig.xlsx index 187a5ec0ff..dac208fc6a 100644 Binary files a/data_execl/base_data/SpecialConfig.xlsx and b/data_execl/base_data/SpecialConfig.xlsx differ