From ce5042eb86b0c7bc86d64c3d9ab58cb175af1858 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 16 Nov 2021 16:59:59 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E3=80=90=E5=85=8B=E5=88=B6=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E3=80=91=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 23 +++-- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 20 ----- .../Modules/Battle/Logic/Base/Passivity.lua | 42 +-------- .../Battle/Logic/Misc/BattleDefine.lua | 87 ++++++++++--------- .../~Lua/Modules/Hero/HeroManager.lua | 66 +++++++------- 5 files changed, 91 insertions(+), 147 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 14367c4585..f023e243b7 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -30,7 +30,8 @@ SDKSubMitType = { TYPE_EXIT_GAME = 5, TYPE_ENTER_COPY = 6, TYPE_EXIT_COPY = 7, - TYPE_VIP_LEVELUP = 8 + TYPE_VIP_LEVELUP = 8, + TYPE_CHANGE_NAME = 9 } SDK_RESULT = { @@ -316,18 +317,14 @@ HeroProType = { PhysicalDefencePercentage = 64, --护甲百分比 SpeedPercentage = 65, --速度百分比 DifferDemonsBocusFactor = 66, --异妖伤害加成系数 - FireDamageBonusFactor = 101, --火攻(%) - WindDamageBonusFactor = 102, --风攻(%) - WaterDamageBonusFactor = 103, --水攻(%) - LandDamageBonusFactor = 104, --地攻(%) - LightDamageBonusFactor = 105, --光攻(%) - DarkDamageBonusFactor = 106, --暗攻(%) - FireDamageReduceFactor = 107, --火抗(%) - WindDamageReduceFactor = 108, --风抗(%) - WaterDamageReduceFactor = 109, --水抗(%) - LandDamageReduceFactor = 110, --地抗(%) - LightDamageReduceFactor = 111, --光抗(%) - DarkDamageReduceFactor = 112, --暗抗(%) + RenBonus = 101, --对人杰阵营神将造成伤害时获得的伤害加成 + FoBonus = 102, --对佛禅阵营神将造成伤害时获得的伤害加成 + YaoBonus = 103, --对妖灵阵营神将造成伤害时获得的伤害加成 + DaoBonus = 104, --对道玄阵营神将造成伤害时获得的伤害加成 + RenReduce = 107, --受到人杰阵营神将造成的直接伤害时获得的伤害减免 + FoReduce = 108, --受到佛禅阵营神将造成的直接伤害时获得的伤害减免 + YaoReduce = 109, --受到妖灵阵营神将造成的直接伤害时获得的伤害减免 + DaoReduce = 110, --受到道玄阵营神将造成的直接伤害时获得的伤害减免 WarPower = 1000, --英雄战斗力(获取英雄属性时会用到) InitRage = 200, -- 初始怒气值 } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 58d6186b67..dcc61c56d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -5,26 +5,6 @@ local max = math.max --local BattleLogic = BattleLogic --local BattleUtil = BattleUtil ---属性编号 --- local BattlePropList = { --- RoleDataName.Attack, --- RoleDataName.PhysicalDefence, --- RoleDataName.MagicDefence, --- RoleDataName.Speed, --- RoleDataName.DamageBocusFactor, --- RoleDataName.DamageReduceFactor, --- RoleDataName.Hit, --- RoleDataName.Dodge, --- RoleDataName.Crit, --- RoleDataName.CritDamageFactor, --- RoleDataName.TreatFacter, --- RoleDataName.MaxHp, --- RoleDataName.Hp, --- RoleDataName.CureFacter, --- RoleDataName.Tenacity, --- RoleDataName.InitRage, --- } - local function buffRandomAction(random, target, buff) -- 检测被动技能对技能的加成 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 1ae2bb6974..438a9a89a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1,31 +1,6 @@ local floor = math.floor local max = math.max local min = math.min ---local RoleDataName = RoleDataName ---local BattleLogic = BattleLogic ---local BattleUtil = BattleUtil ---local BattleEventName = BattleEventName ---local BuffName = BuffName - ---属性编号 --- local BattlePropList = { --- RoleDataName.Attack, --- RoleDataName.PhysicalDefence, --- RoleDataName.MagicDefence, --- RoleDataName.Speed, --- RoleDataName.DamageBocusFactor, --- RoleDataName.DamageReduceFactor, --- RoleDataName.Hit, --- RoleDataName.Dodge, --- RoleDataName.Crit, --- RoleDataName.CritDamageFactor, --- RoleDataName.TreatFacter, --- RoleDataName.MaxHp, --- RoleDataName.Hp, --- RoleDataName.CureFacter, --- RoleDataName.Tenacity, --- RoleDataName.InitRage, --- } PassiveManager = {} PassiveManager.passiveCountList = { [0] = {}, @@ -328,22 +303,7 @@ local passivityList = { --免疫[a]属性伤害。 --a[属性类型] [15] = function(role, args) - local pt = args[1] - local elementDamageReduceFactor - if pt == 1 then - elementDamageReduceFactor = RoleDataName.FireDamageReduceFactor - elseif pt == 2 then - elementDamageReduceFactor = RoleDataName.WindDamageReduceFactor - elseif pt == 3 then - elementDamageReduceFactor = RoleDataName.IceDamageReduceFactor - elseif pt == 4 then - elementDamageReduceFactor = RoleDataName.LandDamageReduceFactor - elseif pt == 5 then - elementDamageReduceFactor = RoleDataName.LightDamageReduceFactor - elseif pt == 6 then - elementDamageReduceFactor = RoleDataName.DarkDamageReduceFactor - end - role.data:AddValue(elementDamageReduceFactor, 10000) + -- TODO:原有老被动已无法使用 end, --发动技能后,[a]的概率将[b]*[c]算作[d]计算,持续[e]秒。 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 015ed0c565..ded488dcfc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -187,35 +187,63 @@ BattleMaxFrame = 1000000 index = 0 RoleDataName = { - Level = indexAdd(), --等级 - Hp = indexAdd(), --生命 - MaxHp = indexAdd(), --最大生命 - Attack = indexAdd(), --攻击力 - PhysicalDefence = indexAdd(),--护甲 - MagicDefence = indexAdd(),--魔抗 - Speed = indexAdd(),--速度 + Level = indexAdd(), --等级 + Hp = indexAdd(), --生命 + MaxHp = indexAdd(), --最大生命 + Attack = indexAdd(), --攻击力 + PhysicalDefence = indexAdd(), --护甲 + MagicDefence = indexAdd(), --魔抗 + Speed = indexAdd(), --速度 DamageBocusFactor = indexAdd(), --伤害加成系数(%) DamageReduceFactor = indexAdd(), --伤害减免系数(%) - Hit = indexAdd(), --施法率(%) + Hit = indexAdd(), --施法率(%) Dodge = indexAdd(), --后期基础施法率(%) - Crit = indexAdd(), --暴击率(%) + Crit = indexAdd(), --暴击率(%) CritDamageFactor = indexAdd(), --暴击伤害系数(%) Tenacity = indexAdd(), --抗暴率(%) - TreatFacter = indexAdd(),--治疗加成系数(%) + TreatFacter = indexAdd(), --治疗加成系数(%) CureFacter = indexAdd(),--受到治疗加成系数(%) - TeamDamageBocusFactor = indexAdd(),--队伍伤害加成系数(%) - TeamDamageReduceFactor = indexAdd(),--队伍伤害减免系数(%) - FireDamageReduceFactor = indexAdd(), --火系伤害减免系数(%) - WindDamageReduceFactor = indexAdd(), --风系伤害减免系数(%) - IceDamageReduceFactor = indexAdd(), --冰系伤害减免系数(%) - LandDamageReduceFactor = indexAdd(), --地系伤害减免系数(%) - LightDamageReduceFactor = indexAdd(), --光系伤害减免系数(%) - DarkDamageReduceFactor = indexAdd(), --暗系伤害减免系数(%) - ElementDamageBocusFactor = indexAdd(), --属性伤害加成系数(%) + RenBonus = indexAdd(), --人系伤害加成 + FoBonus = indexAdd(), --佛系伤害加成 + YaoBonus = indexAdd(), --妖系伤害加成 + DaoBonus = indexAdd(), --道系伤害加成 + RenReduce = indexAdd(), --人系伤害减免 + FoReduce = indexAdd(), --佛系伤害减免 + YaoReduce = indexAdd(), --妖系伤害减免 + DaoReduce = indexAdd(), --道系伤害减免 InitRage = indexAdd(), --初始怒气值 } +-- 战斗表属性id对应战斗中属性数据 +BattlePropList = { + RoleDataName.Attack, + RoleDataName.PhysicalDefence, + RoleDataName.MagicDefence, + RoleDataName.Speed, + RoleDataName.DamageBocusFactor, + RoleDataName.DamageReduceFactor, + RoleDataName.Hit, + RoleDataName.Dodge, + RoleDataName.Crit, + RoleDataName.CritDamageFactor, + RoleDataName.TreatFacter, + RoleDataName.MaxHp, + RoleDataName.Hp, + RoleDataName.CureFacter, + RoleDataName.Tenacity, + RoleDataName.InitRage, + RoleDataName.RenBonus, + RoleDataName.FoBonus, + RoleDataName.YaoBonus, + RoleDataName.DaoBonus, + RoleDataName.RenReduce, + RoleDataName.FoReduce, + RoleDataName.YaoReduce, + RoleDataName.DaoReduce, +} + + BuffName = { PropertyChange = 1, Control = 2, @@ -297,27 +325,6 @@ skill6={100923,0.15,1.5,1,{260004,{126,0.48,2,4,1,0,4,12,0}}}, } - --- 战斗表属性id对应战斗中属性数据 -BattlePropList = { - RoleDataName.Attack, - RoleDataName.PhysicalDefence, - RoleDataName.MagicDefence, - RoleDataName.Speed, - RoleDataName.DamageBocusFactor, - RoleDataName.DamageReduceFactor, - RoleDataName.Hit, - RoleDataName.Dodge, - RoleDataName.Crit, - RoleDataName.CritDamageFactor, - RoleDataName.TreatFacter, - RoleDataName.MaxHp, - RoleDataName.Hp, - RoleDataName.CureFacter, - RoleDataName.Tenacity, - RoleDataName.InitRage, -} - CurseTypeName = { ShareDamage = 1, } diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 80b528e88a..d1ad8e6389 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2165,56 +2165,56 @@ end function this.CalculateWarAllProVal(heroDid) local allEquipAddProVal = HeroPropManager.GetHeroProp(heroDid)--HeroManager.CalculateHeroAllProValList(1, heroDid, true) local allProVal = {} - table.insert(allProVal, 1, HeroManager.GetSingleHeroData(heroDid).lv) --等级 - table.insert(allProVal, 2, allEquipAddProVal[HeroProType.Hp]) + table.insert(allProVal, 1, HeroManager.GetSingleHeroData(heroDid).lv) --生命 - table.insert(allProVal, 3, allEquipAddProVal[HeroProType.Hp]) + table.insert(allProVal, 2, allEquipAddProVal[HeroProType.Hp]) --最大生命 - table.insert(allProVal, 4, allEquipAddProVal[HeroProType.Attack]) + table.insert(allProVal, 3, allEquipAddProVal[HeroProType.Hp]) --攻击力 - table.insert(allProVal, 5, allEquipAddProVal[HeroProType.PhysicalDefence]) + table.insert(allProVal, 4, allEquipAddProVal[HeroProType.Attack]) --护甲 - table.insert(allProVal, 6, allEquipAddProVal[HeroProType.MagicDefence]) + table.insert(allProVal, 5, allEquipAddProVal[HeroProType.PhysicalDefence]) --魔抗 - table.insert(allProVal, 7, allEquipAddProVal[HeroProType.Speed]) + table.insert(allProVal, 6, allEquipAddProVal[HeroProType.MagicDefence]) --速度 - table.insert(allProVal, 8, allEquipAddProVal[HeroProType.DamageBocusFactor]) + table.insert(allProVal, 7, allEquipAddProVal[HeroProType.Speed]) --伤害加成系数(%) - table.insert(allProVal, 9, allEquipAddProVal[HeroProType.DamageReduceFactor]) + table.insert(allProVal, 8, allEquipAddProVal[HeroProType.DamageBocusFactor]) --伤害减免系数(%) - table.insert(allProVal, 10, allEquipAddProVal[HeroProType.Hit]) + table.insert(allProVal, 9, allEquipAddProVal[HeroProType.DamageReduceFactor]) --命中率(%) - table.insert(allProVal, 11, allEquipAddProVal[HeroProType.Dodge]) + table.insert(allProVal, 10, allEquipAddProVal[HeroProType.Hit]) --闪避率(%) - table.insert(allProVal, 12, allEquipAddProVal[HeroProType.CritFactor]) + table.insert(allProVal, 11, allEquipAddProVal[HeroProType.Dodge]) --暴击率(%) - table.insert(allProVal, 13, allEquipAddProVal[HeroProType.CritDamageFactor]) + table.insert(allProVal, 12, allEquipAddProVal[HeroProType.CritFactor]) --暴击伤害系数(%) - table.insert(allProVal, 14, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) + table.insert(allProVal, 13, allEquipAddProVal[HeroProType.CritDamageFactor]) --抗暴率(%) - table.insert(allProVal, 15, allEquipAddProVal[HeroProType.TreatFacter]) + table.insert(allProVal, 14, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) --治疗加成系数(%) - table.insert(allProVal, 16, allEquipAddProVal[HeroProType.CureFacter]) + table.insert(allProVal, 15, allEquipAddProVal[HeroProType.TreatFacter]) --受到治疗系数(%) - table.insert(allProVal, 17, allEquipAddProVal[HeroProType.DifferDemonsBocusFactor]) - --异妖伤害加成系数(%) - table.insert(allProVal, 18, allEquipAddProVal[HeroProType.DifferDemonsReduceFactor]) - --异妖减伤率(%) - table.insert(allProVal, 19, allEquipAddProVal[HeroProType.FireDamageReduceFactor]) - --火系伤害减免系数(%) - table.insert(allProVal, 20, allEquipAddProVal[HeroProType.WindDamageReduceFactor]) - --风系伤害减免系数(%) - table.insert(allProVal, 21, allEquipAddProVal[HeroProType.WaterDamageReduceFactor]) - --冰系伤害减免系数(%) - table.insert(allProVal, 22, allEquipAddProVal[HeroProType.LandDamageReduceFactor]) - --地系伤害减免系数(%) - table.insert(allProVal, 23, allEquipAddProVal[HeroProType.LightDamageReduceFactor]) - --光系伤害减免系数(%) - table.insert(allProVal, 24, allEquipAddProVal[HeroProType.DarkDamageReduceFactor]) - --暗系伤害减免系数(%) + table.insert(allProVal, 16, allEquipAddProVal[HeroProType.CureFacter]) + -- 人系伤害加成 + table.insert(allProVal, 17, allEquipAddProVal[HeroProType.RenBonus]) + -- 佛系伤害加成 + table.insert(allProVal, 18, allEquipAddProVal[HeroProType.FoBonus]) + -- 妖系伤害加成 + table.insert(allProVal, 19, allEquipAddProVal[HeroProType.YaoBonus]) + -- 道系伤害加成 + table.insert(allProVal, 20, allEquipAddProVal[HeroProType.DaoBonus]) + -- 人系伤害减免 + table.insert(allProVal, 21, allEquipAddProVal[HeroProType.RenReduce]) + -- 佛系伤害减免 + table.insert(allProVal, 22, allEquipAddProVal[HeroProType.FoReduce]) + -- 妖系伤害减免 + table.insert(allProVal, 23, allEquipAddProVal[HeroProType.YaoReduce]) + -- 道系伤害减免 + table.insert(allProVal, 24, allEquipAddProVal[HeroProType.DaoReduce]) + -- 怒气 table.insert(allProVal, 25, 0) - --属性伤害加成系数(%) return allProVal end From 2911c5b77c25caf8047b6b62295dd123a0e895f9 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 17 Nov 2021 10:36:24 +0800 Subject: [PATCH 02/25] =?UTF-8?q?=E4=B9=BE=E5=9D=A4=E5=AE=9D=E5=9B=8A?= =?UTF-8?q?=E9=99=90=E6=97=B6=E5=95=86=E5=BA=97=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit e8df9ca87e9b6bf918b16755e36f2b1b46093618) --- Assets/ManagedResources/~Lua/View/ShopViewNew.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 7c112ce8f7..38d9a38d59 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -470,7 +470,7 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData) local empty = Util.GetGameObject(shopItem, "empty") local lock = Util.GetGameObject(shopItem, "lock") local lockTip = Util.GetGameObject(shopItem, "lock/tip"):GetComponent("Text") - + local new = Util.GetGameObject(shopItem, "GameObject/new") -- 计算数据 local itemInfo = ShopManager.GetShopItemInfo(itemData.id) local curBuyCount = itemData.buyNum @@ -560,6 +560,16 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData) if isshow then effect.gameObject:SetActive(true) end + + if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then + if SoulPrintManager.CheckSoulExist(con.Id) then + new.gameObject:SetActive(false) + else + new.gameObject:SetActive(true) + end + else + new.gameObject:SetActive(false) + end -- 购买事件 Util.AddOnceClick(lock, function() From b6ce191bff423a59bacf7cf75a06e85447b7c959 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 17 Nov 2021 12:34:39 +0800 Subject: [PATCH 03/25] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E6=97=A0=E6=B3=95=E5=8D=B8=E4=B8=8B=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Popup/RewardEquipSingleShowPopup2.lua | 8 ++++---- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index dd1dc06577..c17435a998 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -133,10 +133,10 @@ function RewardEquipSingleShowPopup2:BindEvent() local equipIdList={} local equipDataList={} table.insert(equipIdList,tostring(self.equipData.id)) - table.insert(equipDataList,self.nextEquip) + table.insert(equipDataList,self.equipData) NetManager.EquipWearRequest(self.curHeroData.dynamicId,equipIdList ,1, function () self:ClosePanel() - self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.equipData,self.position) + self.parent.UpdateEquipPosHeroData(1,typeToUpdate[self.openType],equipDataList,self.nextEquip,self.position) end) end) end @@ -173,7 +173,7 @@ end function RewardEquipSingleShowPopup2:SetBtns() local itemConfigData=ConfigManager.GetConfigData(ConfigName.ItemConfig, tonumber(self.equipData.id)) - self.btnSure:SetActive(itemConfigData.IfResolve==1) + self.btnSure:SetActive(itemConfigData.IfResolve==1 and BagManager.isBagPanel) self.btnJump:SetActive(itemConfigData.UseJump and itemConfigData.UseJump > 0 and BagManager.isBagPanel) self.btnWear:SetActive(self.openType == 3) self.btnDown:SetActive(self.openType == 2) @@ -202,7 +202,7 @@ function RewardEquipSingleShowPopup2:OnShow() self.powerNumUpDown.gameObject:SetActive(true) local Power = EquipManager.CalculateWarForce(self.equipData.id) local Power2 = EquipManager.CalculateWarForce(self.nextEquip.id) - LogGreen("Id:"..tostring(self.equipData.id).."Power:"..tostring(Power).." Id2:"..tostring(self.equipData.id).."Power2:"..tostring(Power2)) + -- LogGreen("Id:"..tostring(self.equipData.id).." Power:"..tostring(Power).." Id2:"..tostring(self.equipData.id).." Power2:"..tostring(Power2)) if(Power > Power2) then self.powerNumUpDown.sprite = self.spLoader:LoadSprite(PowerChangeIconDef[1]) elseif(Power < Power2)then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 1c5dd7e1ff..ce4ef6baaa 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -846,6 +846,7 @@ function this.SingleItemDataShow(_go, _itemData) if curHeroData.harmonyGongMing then this:OpenTips(nextEquipData,equipConfig[_itemData.id].Position) else + -- Log("当前装备:"..tostring(nextEquipData.id).." 准备替换装备:"..tostring(_itemData.id)) UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup2, this,_itemData,4,false,nil, curHeroData,equipConfig[_itemData.id].Position,nextEquipData) end else @@ -857,6 +858,12 @@ function this.SingleItemDataShow(_go, _itemData) end --刷新当前英雄装备坑位的信息 function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataList, _oldSelectEquip, position) --type + -- if _selectEquipDataList then + -- LogYellow("_type:"..tostring(_type).." 新装备:"..tostring(_selectEquipDataList[1].id)) + -- end + -- if _oldSelectEquip then + -- LogYellow("旧装备:"..tostring(_oldSelectEquip.id)) + -- end --1 穿单件装备 2 卸单件装备 3 替换单件装备 4 一键穿装备 5一键脱装备 if _type == 1 then effectList[position]:SetActive(false) @@ -920,11 +927,11 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi end --英雄替换新选择装备 - if curHeroEquipDatas[curSelectEquipData.equipConfig.Position] then + if curHeroEquipDatas[equipConfig[curSelectEquipData.id].Position] then for i = 1, #curHeroData.equipIdList do if tonumber(curHeroData.equipIdList[i]) == - tonumber(curHeroEquipDatas[curSelectEquipData.equipConfig.Position].id) + tonumber(curHeroEquipDatas[equipConfig[curSelectEquipData.id].Position].id) then curHeroData.equipIdList[i] = curSelectEquipData.id break From 1362e8b4f661a7c22282648ff0981b542ccf59ba Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 17 Nov 2021 15:01:24 +0800 Subject: [PATCH 04/25] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=E7=AC=AC=E4=B8=89=E6=89=B9=E7=A5=9E=E9=AD=82?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Buff.lua | 1 + .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 38 +- .../Modules/Battle/Logic/Base/Passivity.lua | 461 ++++++++++++++++-- .../Modules/Battle/Logic/Buff/BanBlood.lua | 33 ++ .../Battle/Logic/Buff/BanBlood.lua.meta | 7 + .../Battle/Logic/Misc/BattleDefine.lua | 4 + .../Modules/Battle/Logic/Misc/BattleUtil.lua | 59 ++- .../Modules/Battle/Logic/Role/RoleLogic.lua | 1 + .../~Lua/Modules/Battle/Logic/Role/Skill.lua | 1 + .../Modules/Battle/View/Unit/BuffCtrl.lua | 3 + 10 files changed, 521 insertions(+), 87 deletions(-) create mode 100644 Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua.meta diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua index cdf831649e..28d7620012 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua @@ -16,6 +16,7 @@ local BuffRegister = { [BuffName.Aura] = "Aura", [BuffName.Brand] = "Brand", [BuffName.Blood] = "Blood", + [BuffName.BanBlood] = "BanBlood", } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 58d6186b67..0a2212c210 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -101,7 +101,7 @@ local effectList = { local cb1 = args[2] local f2 = args[3] BattleLogic.WaitForTrigger(interval, function () - BattleUtil.RandomControl(f1, cb1, caster, target, f2) + BattleUtil.RandomControl(f1, cb1, caster, target, f2,skill) end) end, --[d]改变[a]属性[b]%,持续[c]秒 @@ -394,7 +394,7 @@ local effectList = { BattleLogic.WaitForTrigger(interval, function () BattleUtil.CalDamage(skill, caster, target, dt, f1) if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return dot == 0 or buff.damageType == dot end,caster,dot) then - BattleUtil.RandomControl(f1, ct, caster, target, f3) + BattleUtil.RandomControl(f1, ct, caster, target, f3,skill) end end) end, @@ -958,7 +958,7 @@ local effectList = { local f3 = args[4] BattleLogic.WaitForTrigger(interval, function () if BattleUtil.GetHPPencent(target) < f1 then - BattleUtil.RandomControl(f2, ct, caster, target, f3) + BattleUtil.RandomControl(f2, ct, caster, target, f3,skill) end end) end, @@ -1169,7 +1169,7 @@ local effectList = { -- 伤害 BattleUtil.CalDamage(skill, caster, target, dt, f1) -- 控制未命中则施加增伤印记 - if not BattleUtil.RandomControl(f2, 1, caster, target, f3) then + if not BattleUtil.RandomControl(f2, 1, caster, target, f3,skill) then local brand = Buff.Create(caster, BuffName.Brand, 0, "zengshang") brand.maxLayer = i1 brand.clear = false @@ -1314,7 +1314,7 @@ local effectList = { else BattleUtil.CalDamage(skill, caster, target, dt, f1) end - BattleUtil.RandomControl(f2, c1, caster, target, f4) + BattleUtil.RandomControl(f2, c1, caster, target, f4,skill) end) end) end @@ -1416,9 +1416,9 @@ local effectList = { local arr = BattleUtil.ChooseTarget(caster, 20000) for i=1, #arr do if arr[i] == target then - BattleUtil.RandomControl(f1+f3, cb1, caster, arr[i], f2) + BattleUtil.RandomControl(f1+f3, cb1, caster, arr[i], f2,skill) else - BattleUtil.RandomControl(f1, cb1, caster, arr[i], f2) + BattleUtil.RandomControl(f1, cb1, caster, arr[i], f2,skill) end end end) @@ -1472,7 +1472,7 @@ local effectList = { end return b end) - BattleUtil.RandomControl(f1+f3*layer, ct, caster, target, f2) + BattleUtil.RandomControl(f1+f3*layer, ct, caster, target, f2,skill) end) end, --添加[a]的[b]%护盾,持续[c]秒。为自身挂护盾印记,每层额外增加护盾值[d]%,印记最多[e]层。印记不显示。(增益印记,不可驱散) @@ -1683,7 +1683,7 @@ local effectList = { end end) if hasBuff then - BattleUtil.RandomControl(f2, ct, caster, target, f3) + BattleUtil.RandomControl(f2, ct, caster, target, f3,skill) end end) end, @@ -1705,7 +1705,7 @@ local effectList = { end end) if hasBuff then - BattleUtil.RandomControl(f2, ct, caster, target, f3) + BattleUtil.RandomControl(f2, ct, caster, target, f3,skill) end end) end, @@ -1902,7 +1902,7 @@ local effectList = { else BattleUtil.CalDamage(skill, caster, target, dt, f1) end - BattleUtil.RandomControl(f2, c1, caster, target, f4) + BattleUtil.RandomControl(f2, c1, caster, target, f4,skill) end) end) end @@ -2216,7 +2216,7 @@ local effectList = { BattleLogic.WaitForTrigger(interval, function () BattleUtil.CalDamage(skill, caster, target, dt, f1) if BattleLogic.BuffMgr:HasBuff(target, BuffName.DOT, function (buff) return dot == 0 or buff.damageType == dot end,caster,dot) then - BattleUtil.RandomControl(f2, ct, caster, target, f3) + BattleUtil.RandomControl(f2, ct, caster, target, f3,skill) end end) end, @@ -2326,7 +2326,7 @@ local effectList = { BattleUtil.CalDamage(skill, caster, target, dt, f1) --伤害命中才会给目标上buff if skill and skill:CheckTargetIsHit(target) then - BattleUtil.RandomControl(pro1,ctrl, caster, target,r1) + BattleUtil.RandomControl(pro1,ctrl, caster, target,r1,skill) end end) end, @@ -2471,11 +2471,13 @@ local effectList = { value=0 end if damage-value>0 then - if target.bloodShield then - target.bloodShield:AddValue(damage-value) - else - target:AddBuff(Buff.Create(caster,BuffName.Blood,0,damage-value)) - end + if not target.isBanBlood then + if target.bloodShield then + target.bloodShield:AddValue(damage-value) + else + target:AddBuff(Buff.Create(caster,BuffName.Blood,0,damage-value)) + end + end end end) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 1ae2bb6974..02aa735663 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2058,10 +2058,14 @@ local passivityList = { end, - -- 战斗第[a]回合造成伤害必定暴击 - -- a[int] + -- 战斗第[a]回合造成伤害必定暴击,[b]是否包含前面的回合 + -- a[int],b[int 0:不包含 1:包含] [112] = function(role, args,id,judge) local i1 = args[1] + local type = args[2] + if not type then + type=0 + end local function onRoleDamageAfter(target) target.isFlagCrit = false role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter) @@ -2077,7 +2081,8 @@ local passivityList = { if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return end - if BattleLogic.GetCurRound() == i1 then + local curRound=BattleLogic.GetCurRound() + if (curRound== i1 and type==0) or (curRound<=i1 and type==1) then target.isFlagCrit = true role.Event:AddEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter,nil,nil,role) end @@ -4364,7 +4369,7 @@ local passivityList = { local i1 = args[1] local f1 = args[2] BattleUtil.CalRage(role,role,i1,CountTypeName.Add) - local function onPassiveSeckill(func) + local function onPassiveSeckill(func,defRole) local isBoss=BattleUtil.CheckIsBoss(defRole) if isBoss then return @@ -5017,10 +5022,6 @@ local passivityList = { role.Event:AddEvent(BattleEventName.PassiveDamaging, OnPassiveDamaging,nil,nil,role) end, - - - - -- 同阵营只生效一次 -- 敌方武将[c]改变[a]的[b] -- a[float],b[属性],c[改变类型] @@ -5688,11 +5689,13 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role) end, - --技能追加的普攻额外造成目标[a][b]%的伤害。 - --a[int 属性id] b[float] + --技能追加的普攻额外造成目标[a][b]%的伤害。,生命每下降[c]%,额外生命百分比加[d]%(c d 不填不增加) + --a[int 属性id] b[float],c[float],d[float] [258]=function(role,args,id,judge) local f1 = args[1] local dt = args[2] + local p1 = args[3] + local p2 = args[4] -- 直接伤害后 local onPassiveDamaging = function(func, defRole, damage,skill) if skill and not skill.isTriggerJudge and judge==1 then @@ -5703,16 +5706,20 @@ local passivityList = { if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then return end + if (f1==12 or f1==13) and p1 and p2 then + local levelDamage = floor(role:GetRoleData(RoleDataName.MaxHp)*p1) + local lostDamage = role:GetRoleData(RoleDataName.MaxHp) - role:GetRoleData(RoleDataName.Hp) + local level = floor(lostDamage/levelDamage) + dt=dt+(level*p2) + end local val = -floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1]))) if f1==12 or f1==13 then - BattleUtil.FinalDamage(nil,role,defRole,-val) + BattleUtil.FinalDamageCountShield(nil,role,defRole,-val) else if func then func(val) end end - - end end role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) @@ -5937,14 +5944,17 @@ local passivityList = { role.Event:AddEvent(BattleEventName.PassiveDamaging,passiveBeBeDamage,nil,nil,role) end, - --技能击中受到[a,控制效果]的目标,会额外降低[b]点怒气,额外造成其[c]属性[d]%的间接伤害 - -- a[int 控制效果]b[int],c[int 属性],d[float] + --技能击中受到[a,控制效果]的目标,会额外降低[b]点怒气,额外造成其[c]属性[d]%的间接伤害,控制效果的添加条件[e](e: 0 不限制 1:自身) + -- a[int 控制效果]b[int],c[int 属性],d[float],e[int] [267]=function(role,args,id,judge) local dot=args[1] local i1 = args[2] local pro = args[3] local v1 = args[4] - --defRole, damage, bCrit, finalDmg, damageType, skill + local limitType = args[5] + if not limitType then + limitType=0 + end local OnRoleHit = function(skill) if skill and not skill.isTriggerJudge and judge==1 then return @@ -5956,12 +5966,12 @@ local passivityList = { end local num=0 for key, value in pairs(list) do - local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.Control, function(buff) return buff.ctrlType == dot end) + local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.Control, function(buff) return buff.ctrlType == dot and (limitType==0 or (limitType==1 and buff.caster==role)) end) if isHave then if i1>0 then BattleUtil.CalRage(role, value, i1, CountTypeName.Sub) end - if pro and v1 then + if pro and v1 and pro~=0 and v1~=0 then --如果是boss 并且额外伤害是根据最大生命则返回 local isBoss=BattleUtil.CheckIsBoss(value) if isBoss and pro==12 then @@ -6414,8 +6424,8 @@ local passivityList = { end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, OnRoundChange,nil,nil,role) end, - --释放技能后,额外[a]改变[b]方怒气最少的[c]阵营目标[d]点怒气,目标人数[e](e 不填默认为 1人 填10为敌方燃烧数 ) - --a[int 改变类型],b[int 0:己方 1:敌方],c[int],d[int],e[int] + --释放技能后,额外[a]改变[b]方怒气最少的[c]阵营目标[d]点怒气,目标人数[e](e 不填默认为 1人 填10为敌方燃烧数)属性[f]改变[g][h]% 持续[i]回合;属性[j]改变[k][l]% 持续[m]回合 + --a[int 改变类型],b[int 0:己方 1:敌方],c[int],d[int],e[int],f[int], g[int],h[float],i[int],j[int]k[int],l[float],m[int] [283]=function(role,args,id,judge) local ct=args[1] local camp=args[2] @@ -6425,7 +6435,14 @@ local passivityList = { if not num then num=1 end - + local p1=args[6] + local ct1=args[7] + local f1=args[8] + local r1=args[9] + local p2=args[10] + local ct2=args[11] + local f2=args[12] + local r2=args[13] local onSkillCastEnd=function(skill) local fireNum=0 if skill and not skill.isTriggerJudge and judge==1 then @@ -6459,6 +6476,12 @@ local passivityList = { for i = 1, #list do if i<=num then BattleUtil.CalRage(role, list[i], v1, ct) + if p1 and ct1 and f1 and r1 then + list[i]:AddBuff(Buff.Create(role, BuffName.PropertyChange, r1, BattlePropList[p1], f1,ct1)) + end + if p2 and ct2 and f2 and r2 then + list[i]:AddBuff(Buff.Create(role, BuffName.PropertyChange, r2, BattlePropList[p2], f2,ct2)) + end end end end @@ -7591,14 +7614,18 @@ local passivityList = { role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,role) end, - --[a]攻击时,如果目标处于持续伤害[b]状态,则有[c]%的概率使目标[d][e]回合 - --a[int 攻击类型 1:普攻 4:死亡技能] + --[a]攻击时,如果目标处于持续伤害[b]状态,则有[c]%的概率使目标[d][e]回合,触发条件[f](f: 0/不填 灼烧目标, 1:没有条件)() + --a[int 攻击类型 1:普攻 4:死亡技能],b[int],c[flaot],d[int],e[int],f[int] [323]=function(role,args,id,judge) local st = args[1] local dt = args[2] local p1 = args[3] local ct = args[4] local round=args[5] + local type=args[6] + if not type then + type=0 + end local onRoleBeDamage=function (defRole, atkRole, damage, bCrit, finalDmg, damageType, dotType, skill) if atkRole and atkRole~=role then return @@ -7609,9 +7636,18 @@ local passivityList = { if skill and not skill.isTriggerJudge and judge==1 then return end - if BattleLogic.BuffMgr:HasBuff(defRole, BuffName.DOT, function(buff) return buff.damageType == dt end,role,dt) then - BattleUtil.RandomControl(p1,ct,role,defRole,round) - end + local isTrigger=false + if type==0 then + if BattleLogic.BuffMgr:HasBuff(defRole, BuffName.DOT, function(buff) return buff.damageType == dt end,role,dt) then + isTrigger=true + end + elseif type==1 then + isTrigger=true + end + + if isTrigger then + BattleUtil.RandomControl(p1,ct,role,defRole,round) + end end BattleLogic.Event:AddEvent(BattleEventName.RoleBeDamaged,onRoleBeDamage,nil,nil,role) end, @@ -8066,12 +8102,13 @@ local passivityList = { end local rDamage =floor(f1 * damage) - if role.bloodShield then - role.bloodShield:AddValue(rDamage) - else - role:AddBuff(Buff.Create(role, BuffName.Blood,0, rDamage)) - end - + if not role.isBanBlood then + if role.bloodShield then + role.bloodShield:AddValue(rDamage) + else + role:AddBuff(Buff.Create(role, BuffName.Blood,0, rDamage)) + end + end end role.Event:AddEvent(BattleEventName.RoleBeHit, onBeHit,nil,nil,role) end, @@ -8421,11 +8458,14 @@ local passivityList = { local onRoundChange=function(curRound) local val = floor(BattleUtil.FP_Mul(v1, role:GetRoleData(BattlePropList[pro]))) --如果身上有御甲就添加御甲的值 - if role.bloodShield then - role.bloodShield:AddValue(val) - else--没有就上御甲buff - role:AddBuff(Buff.Create(role, BuffName.Blood,0, val)) + if not role.isBanBlood then + if role.bloodShield then + role.bloodShield:AddValue(val) + else--没有就上御甲buff + role:AddBuff(Buff.Create(role, BuffName.Blood,0, val)) + end end + end role.Event:AddEvent(BattleEventName.RoleTurnStart, onRoundChange,nil,nil,role) end, @@ -8522,12 +8562,14 @@ local passivityList = { end local val = floor(BattleUtil.FP_Mul(v1, role:GetRoleData(BattlePropList[pro]))) --如果身上有御甲就添加御甲的值 - if role.bloodShield then - role.bloodShield:AddValue(val) - else--没有就上御甲buff - role:AddBuff(Buff.Create(role, BuffName.Blood,0, val)) + if not role.isBanBlood then + if role.bloodShield then + role.bloodShield:AddValue(val) + else--没有就上御甲buff + role:AddBuff(Buff.Create(role, BuffName.Blood,0, val)) + end end - time=time+1 + time=time+1 end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart,onRoundStart,nil,nil,role) end, @@ -8806,10 +8848,12 @@ local passivityList = { if list then local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1)) for _, r in ipairs(list) do - if r.bloodShield then - r.bloodShield:AddValue(tv) - else - r:AddBuff(Buff.Create(role, BuffName.Blood,0,tv)) + if not r.isBanBlood then + if r.bloodShield then + r.bloodShield:AddValue(tv) + else + r:AddBuff(Buff.Create(role, BuffName.Blood,0,tv)) + end end end end @@ -9150,10 +9194,12 @@ local passivityList = { if skill.type == BattleSkillType.Special then role.Event:RemoveEvent(BattleEventName.RoleHit, OnHit) local value=floor(BattleUtil.ErrorCorrection(allDamage*f1)) - if role.bloodShield then - role.bloodShield:AddValue(value) - else - role:AddBuff(Buff.Create(role, BuffName.Blood,0,value)) + if not role.isBanBlood then + if role.bloodShield then + role.bloodShield:AddValue(value) + else + role:AddBuff(Buff.Create(role, BuffName.Blood,0,value)) + end end -- 清空伤害记录 allDamage = 0 @@ -9273,6 +9319,323 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleHit,onRoleHit,nil,nil,role) end, + --受到处于[a][b]效果的目标的[c]类型攻击,则有[d]%的概率使目标[e][f][g]回合(c: 1:技能攻击) + --a[int],b[int],c[int],d[float],e[int],f[int],g[int] + [379]=function(role,args,id,judge) + local t1 = args[1] + local t2 = args[2] + local t3 = args[3] + local pro = args[4] + local t4=args[5] + local t5=args[6] + local round=args[7] + + local onRoleBeDamage=function (atkRole, damage, bCrit, finalDmg, damageType, dotType, skill) + if atkRole and atkRole.camp==role.camp then + return + end + if not skill or skill.type==BattleSkillType.Monster then + return + end + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra then + return + end + + local isTrigger=false + if BattleLogic.BuffMgr:HasBuff(atkRole, t1, function(buff) return buff.damageType == t2 end,role,t2) then + isTrigger=true + end + if isTrigger then + if t4==BuffName.Control then + BattleUtil.RandomControl(pro,t5,role,atkRole,round) + end + end + end + role.Event:AddEvent(BattleEventName.RoleBeDamaged,onRoleBeDamage,nil,nil,role) + end, + + -- 死亡时[a]%斩杀生命低于[b]%,且处于[c]类型[d]效果的敌人 + -- a[float],b[float],c[int],d[int] + [380] = function(role, args,id,judge) + local f1 = args[1] + local p1 = args[2] + local t1 = args[3] + local t2 = args[4] + local onRoleDead = function() + local list = RoleManager.Query(function(v) return v.camp ~= role.camp end) + BattleUtil.RandomAction(f1,function() + for i = 1, #list do + if BattleLogic.BuffMgr:HasBuff(list[i], t1, function (buff) return buff.damageType==t2 end) then + local isBoss=BattleUtil.CheckIsBoss(list[i]) + if not isBoss then + local ft = list[i]:GetRoleData(RoleDataName.Hp)/list[i]:GetRoleData(RoleDataName.MaxHp) + if ft < p1 then + -- 秒杀 + BattleUtil.Seckill(nil, role,list[i]) + end + end + end + end + end) + + end + role.Event:AddEvent(BattleEventName.RoleDead, onRoleDead,nil,nil,role) + end, + --被自身添加[a]类型[b]效果的目标,己方[c]系神将对其暴击率改变[d][e]%,且暴击必定命中 + --a[int],b[int],c[int],d[int],e[float] + [381]=function(role, args,id,judge) + local t1 = args[1] + local t2 = args[2] + local ele = args[3] + local ct = args[4] + local v1 = args[5] + local changeCrit=function(func,atkRole,defRole,skill) + if atkRole.camp~=role.camp or atkRole.element~=ele then + return + end + if not BattleLogic.BuffMgr:HasBuff(defRole, t1, function (buff) return buff.ctrlType==t2 and buff.caster==role end) then + return + end + if func then + func(v1,ct,true) + end + end + BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit,changeCrit,nil,nil,role) + end, + --技能对自身释放[a]类型buff [b]成功后,有[c]%概率控制[d][e]回合;每回合最多触发[f]次,具体控制效果有[g][h][i][j] + --a[int],b[int 0:失败/成功 1:只有成功],c[float],d[int],e[int],f[int],g[int],h[int],i[int] + [382]=function(role, args,id,judge) + local ctrls={} + local t1 = args[1] + local t2 = args[2] + local pro = args[3] + local t3 = args[4] + local r1 = args[5] + local time = args[6] + local v1 = args[7] + if v1 then + table.insert(ctrls,v1) + end + local v2 = args[8] + if v2 then + table.insert(ctrls,v2) + end + local v3 = args[9] + if v3 then + table.insert(ctrls,v3) + end + local v4 = args[10] + if v4 then + table.insert(ctrls,v4) + end + local triggerTime=0 + local addBuff=function(buff,isAdd,caster,target,skill) + if not skill then + return + end + if time==triggerTime then + return + end + if not BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType) then + return + end + if t2==1 and not isAdd then + return + end + BattleUtil.RandomControl(pro,t3,role,caster,r1) + triggerTime=triggerTime+1 + end + + BattleLogic.Event:AddEvent(BattleEventName.RoleAddCtrlBuff,addBuff,nil,nil,role) + + local onRoundChange=function() + triggerTime=0 + end + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role) + end, + --目标存在御甲,追击的普攻对御甲额外造成[a]倍伤害,不存在御甲,追击的普攻额外造成目标[b][c]%的伤害 + --【御甲不足以抵扣a倍伤害 对神将造成血量伤害=([d]属性*[e]-御甲值)/[f]】 + --a[int],b[int],c[float],d[int],e[int],f[int] + [383]=function(role, args,id,judge) + local d1 = args[1] + local p1 = args[2] + local v1 = args[3] + local p2 = args[4] + local v2 = args[5] + local d2 = args[6] + local passiveDmg=function(func, defRole, damage, skill, dotType, bCrit,damageType, dotType,isDirect) + if not skill then + return + end + if skill.type~=BattleSkillType.Normal or not skill.isAdd then + return + end + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if defRole.bloodShield==nil or defRole.bloodShield.bloodValue==0 then + local isBoss=BattleUtil.CheckIsBoss(defRole) + if isBoss and p1==12 then + return + end + local val = floor(BattleUtil.FP_Mul(v1, defRole:GetRoleData(BattlePropList[p1]))) + BattleUtil.FinalDamageCountShield(nil,role, defRole, val) + else + local jia=defRole.bloodShield.bloodValue + if damage*d1>jia then + local aaa=(role:GetRoleData(BattlePropList[p2])*v2-jia)/d2 + func(-floor(aaa)) + else + func(-floor(damage*(d1-1))) + end + end + end + role.Event:AddEvent(BattleEventName.PassiveDamaging, passiveDmg,nil,nil,role) + end, + -- 技能治疗的目标[a]属性[b]改变[c]%,持续[d]回合 + -- a[int],b[改变类型],c[float],d[int] + [384] = function(role, args,id,judge) + local f1 = args[1] + local ct = args[2] + local v1 = args[3] + local round = args[4] + local onPassiveTreatingFactor = function(func, target) + target:AddBuff(Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[f1], v1,ct)) + end + + local function onSkillCast(skill) + if skill then + if skill and not skill.isTriggerJudge and judge==1 then + return + end + role.Event:AddEvent(BattleEventName.PassiveTreatingFactor, onPassiveTreatingFactor,nil,nil,role) + end + end + local function onSkillCastEnd(skill) + if skill then + if skill and not skill.isTriggerJudge and judge==1 then + return + end + role.Event:RemoveEvent(BattleEventName.PassiveTreatingFactor, onPassiveTreatingFactor) + end + end + role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role) + role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role) + end, + -- 技能目标每[a]改变[b]个,暴击率增加[c]%,[d]改变 + -- a[改变类型],b[int],c[float],d[改变类型] + [385] = function(role, args,id,judge) + local ct = args[1] + local i1 = args[2] + local f1 = args[3] + local ct2 = args[4] + + -- 每次释放技能时提前计算额外加成的伤害 + local extra = 0 + + + local changeCrit=function(func,atkRole,defRole,skill) + if not skill or skill.type~=BattleSkillType.Special then + return + end + if atkRole~=role then + return + end + if func then + func(extra,ct2,false) + end + end + local onSkillCast = function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + extra = 0 + if skill and skill.type == BattleSkillType.Special then + -- 改变值 = 技能最大目标数 - 当前目标数 + local maxNum = skill:GetMaxTargetNum() + local curNum = #skill:GetDirectTargets() + local lessNum = max(maxNum - curNum, 0) + local level = math.floor(lessNum/i1) + extra = BattleUtil.ErrorCorrection(level * f1) + end + BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit,changeCrit,nil,nil,role) + end + role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role) + + local onSkillCastEnd=function() + BattleLogic.Event:RemoveEvent(BattleEventName.TemporaryChangeCrit,changeCrit,nil,nil,role) + end + role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,role) + + end, + --释放技能时,如果目标怒气不足[a]点,每少[b]技能暴击伤害额外[c] [d]% + -- a[int,怒气值],b[int],c[改变类型],d[float] + [386]=function(role,args,id,judge) + local anger = args[1] + local num = args[2] + local type = args[3] + local v1 = args[4] + local onPassiveDamaging = function(func, defRole, damage,skill,dotType,bcrit) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if not bcrit then + return + end + --怒气小于规定值 + if defRole.Rage>=anger then + return + end + local add=floor((anger-defRole.Rage)/num)*v1 + if skill and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill ) then + local dmgDeduction = damage - floor(BattleUtil.ErrorCorrection(BattleUtil.CountValue(damage,add,type))) + if func then func(dmgDeduction) end + end + end + role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) + end, + --技能追加的普攻额外造成目标[a][b]%的伤害,如果放技能前自身怒气大于目标,额外生命百分比加[c]%;小于等于目标添加禁御甲,持续[d]回合 + --a[int 属性id] b[float],c[float],d[float] + [387]=function(role,args,id,judge) + local f1 = args[1] + local dt = args[2] + local p1 = args[3] + local p2 = args[4] + local haveRage=0 + -- 直接伤害后 + local onPassiveDamaging = function(func, defRole, damage,skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if skill and skill.type == BattleSkillType.Normal and skill.isAdd and skill.owner==role then + --如果是boss 并且额外伤害是根据最大生命则返回 + if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then + return + end + if (f1==12 or f1==13) and p1 then + if haveRage>defRole.Rage then + dt=dt+p1 + else + defRole:AddBuff(Buff.Create(role, BuffName.BanBlood, p2)) + end + end + local val = -floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1]))) + if f1==12 or f1==13 then + BattleUtil.FinalDamageCountShield(nil,role,defRole,-val) + else + if func then + func(val) + end + end + end + end + role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) + local onSkillCast=function(caster) + haveRage=caster.Rage + end + role.Event:AddEvent(BattleEventName.RoleTurnStart,onSkillCast,nil,nil,role) + end, + } return passivityList \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua new file mode 100644 index 0000000000..a3871a69c1 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua @@ -0,0 +1,33 @@ +BanBlood = Buff:New() + +--初始化Buff,通过传入一些自定义参数控制成长相关的数值 +function BanBlood:SetData(...) + + -- 刷新排序等级 + self.sort = 4 +end + + +--初始化后调用一次 +function BanBlood:OnStart() + self.target.isBanBlood = true + +end + +--间隔N帧触发,返回true时表示继续触发,返回false立刻触发OnEnd +function BanBlood:OnTrigger() + return true +end + +--效果结束时调用一次 +function BanBlood:OnEnd() + self.target.isBanBlood = false + +end + +--只有当cover字段为true时触发,返回true则被新效果覆盖 +function BanBlood:OnCover(newBuff) + return true +end + +return BanBlood \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua.meta b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua.meta new file mode 100644 index 0000000000..425a26f126 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/BanBlood.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 18cb21cb8f3fd3042af24720c82d4c26 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 015ed0c565..0bcafc3cf2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -180,6 +180,9 @@ BattleEventName = { CheckLiZhanZhiQu = indexAdd(),--检测历战之躯 SkillCastCostRageEnd = indexAdd(), --技能释放最后扣除怒气 BloodValuePassiveChange = indexAdd(),--被动修改御甲值 + TemporaryChangeCrit = indexAdd(),--临时改变暴击率 + RoleAddCtrlBuff = indexAdd(),--角色添加控制类buff + CastRageBrfore = indexAdd(),--扣除怒气之前 } BattleMaxFrame = 1000000 @@ -230,6 +233,7 @@ BuffName = { Aura = 11, Brand = 12, Blood = 13, + BanBlood = 14, } DotType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 74b94544ee..13349520ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -906,13 +906,42 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i if defRole.type == BattleUnitType.Monster or defRole.type == BattleUnitType.Player then return end - -- 判断是否命中 - if skill and not skill:CheckTargetIsHit(defRole) and atkRole.type==BattleUnitType.Role then - BattleLogic.Event:DispatchEvent(BattleEventName.HitMiss, atkRole, defRole, skill) - atkRole.Event:DispatchEvent(BattleEventName.HitMiss, defRole, skill) - defRole.Event:DispatchEvent(BattleEventName.BeHitMiss, atkRole, skill) - return 0 + + -- 是否暴击: 暴击率 = 自身暴击率 - 对方抗暴率 + local bCrit = false + local critRandom = Random.Range01() + --特殊处理 白骨精附加的普攻不会必定暴击 + local mustCrit=atkRole.mustCrit + if atkRole.roleId==10091 and skill and skill.type==BattleSkillType.Normal and skill.isAdd then + mustCrit=false end + local addCrit=0 + local isMustHit=false + -- 计算被动对暴击概率的影响 + local critFunc = function(df, dt,hit) + addCrit = BattleUtil.CountValue(addCrit, df, dt) + isMustHit = hit + end + BattleLogic.Event:DispatchEvent(BattleEventName.TemporaryChangeCrit,critFunc,atkRole,defRole,skill) + local critCondition = clamp(atkRole:GetRoleData(RoleDataName.Crit)+addCrit - defRole:GetRoleData(RoleDataName.Tenacity), 0, 1) + bCrit = critRandom <= critCondition + --处理达摩神魂被动必定命中 + if not bCrit or addCrit==0 then + isMustHit=false + end + + bCrit =mustCrit or bCrit or defRole.isFlagCrit == true -- 必定暴击 + + -- 判断是否命中 + if not isMustHit then + if (skill and not skill:CheckTargetIsHit(defRole) and atkRole.type==BattleUnitType.Role) then + BattleLogic.Event:DispatchEvent(BattleEventName.HitMiss, atkRole, defRole, skill) + atkRole.Event:DispatchEvent(BattleEventName.HitMiss, defRole, skill) + defRole.Event:DispatchEvent(BattleEventName.BeHitMiss, atkRole, skill) + return 0 + end + end + -- 如果是队伍技能,计算真实伤害,则damageType为伤害值 if atkRole.isTeam and not defRole:IsDead() then return BattleUtil.ApplyDamage(skill, atkRole, defRole, damageType), false @@ -942,18 +971,7 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i -- 基础伤害增加系数 local addDamageFactor = 1 + atkRole:GetRoleData(RoleDataName.DamageBocusFactor) - defRole:GetRoleData(RoleDataName.DamageReduceFactor) - -- 是否暴击: 暴击率 = 自身暴击率 - 对方抗暴率 - local bCrit = false - local critRandom = Random.Range01() - --特殊处理 白骨精附加的普攻不会必定暴击 - local mustCrit=atkRole.mustCrit - if atkRole.roleId==10091 and skill and skill.type==BattleSkillType.Normal and skill.isAdd then - mustCrit=false - end - local critCondition = clamp(atkRole:GetRoleData(RoleDataName.Crit) - defRole:GetRoleData(RoleDataName.Tenacity), 0, 1) - bCrit = critRandom <= critCondition - bCrit =mustCrit or bCrit or defRole.isFlagCrit == true -- 必定暴击 - + -- 计算暴伤害系数 local critDamageFactor = 1 local critDamageReduceFactor = 0 -- 暴击伤害减免 @@ -1174,7 +1192,7 @@ function BattleUtil.RandomAction(rand, action) end -- -function BattleUtil.RandomControl(rand, ctrl, caster, target, round) +function BattleUtil.RandomControl(rand, ctrl, caster, target, round,skill) local cl = {} local function _CallBack(v, ct) @@ -1193,6 +1211,7 @@ function BattleUtil.RandomControl(rand, ctrl, caster, target, round) buff.target=target BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddBuffFail,buff) end + BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddCtrlBuff,buff,isAdd,caster,target,skill) return isAdd end @@ -1361,7 +1380,7 @@ function BattleUtil.CheckSeckill(bf, kf, caster, target) table.insert(kcl, {kv, kct}) end end - caster.Event:DispatchEvent(BattleEventName.PassiveSeckill, _CallBack) + caster.Event:DispatchEvent(BattleEventName.PassiveSeckill, _CallBack,target) target.Event:DispatchEvent(BattleEventName.PassiveBeSeckill, _CallBack) bf = BattleUtil.CountChangeList(bf, bcl) kf = BattleUtil.CountChangeList(kf, kcl) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 5e14fd41d0..142674f7df 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -83,6 +83,7 @@ function RoleLogic:Init(uid, data, position) self.IsCanAddSkill = true -- 是否可以追加技能 self.mustHit=false --必定命中 self.mustCrit=false --必定暴击 + self.isBanBlood=false --是否禁止上御甲 self.isImmuneAllReduceShield = false --免疫敌方无敌盾(敌方无敌盾对自己无效) self.ignoreShara = false --忽略敌方分摊 self.type = BattleUnitType.Role diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua index 68a8958b38..2d8abc4422 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/Skill.lua @@ -70,6 +70,7 @@ function Skill:Cast(func) local targets=BattleUtil.LengthOfTable(self:GetDirectTargetsNoExile()) if targets==0 and self.castDoneFunc then self.isRage=false + self.owner.Event:DispatchEvent(BattleEventName.CastRageBrfore, self) self.castDoneFunc() return end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index d0f291a180..28ca7fd2ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -11,6 +11,7 @@ local BuffTypeToConfigType = { [BuffName.KylinMark] = 8, [BuffName.Exile] = 9, [BuffName.Blood] = 10, + [BuffName.BanBlood] = 11, } local function _GetPropChangeBuffCType(pName) for cType, pn in ipairs(BattlePropList) do @@ -49,6 +50,8 @@ local function _GetBuffEffectConfig(buff) cType = 1 elseif bType== BuffName.Blood then cType = 1 + elseif bType==BuffName.BanBlood then + cType = 1 end local type = BuffTypeToConfigType[bType] From 12fe3eb3e42335e2e0686227df949d94fa27aaaa Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 17 Nov 2021 15:55:37 +0800 Subject: [PATCH 05/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E5=8A=9B?= =?UTF-8?q?=E3=80=91=E5=85=AC=E5=BC=8F=E5=8F=82=E6=95=B0=E8=B5=B0=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=A3=85=E5=A4=87=EF=BC=8C=E6=B3=95=E5=AE=9D=E6=88=98?= =?UTF-8?q?=E6=96=97=E5=8A=9B=E8=AE=A1=E7=AE=97=E5=85=AC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Equip/TalismanManager.lua | 20 ++----------------- .../~Lua/Modules/Hero/HeroPowerManager.lua | 13 ++++++------ .../Modules/RoleInfo/EquipTreasureManager.lua | 20 ++----------------- 3 files changed, 10 insertions(+), 43 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua index 407be348b0..af269427f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua @@ -128,24 +128,8 @@ function this.CalculateWarForceBase(curTalismanConFigData,heroPos) end end end - local heroPropertyScore={} - for i, v in ConfigPairs(propertyConfig) do - heroPropertyScore[i]=v.Score - end - local powerEndVal=0 - for i, v in pairs(addAllProVal) do - if v > 0 then - local curProConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig,i) - if curProConfigData then - if curProConfigData.Style == 1 then - powerEndVal=powerEndVal+v*heroPropertyScore[i] - else - powerEndVal=powerEndVal+v/100*heroPropertyScore[i] - end - end - end - end - return math.floor(powerEndVal) + local powerEndVal = HeroPowerManager.CalPower(addAllProVal) + return powerEndVal end end function this.GetAllTalismanByCondition(curTalismanData,upStarConFigData) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua index b7e1022de1..4c5153fe8b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroPowerManager.lua @@ -29,20 +29,20 @@ local function CalculateWarForce2(powerVal) if v > 0 and i < HeroProType.WarPower then if propertyConfig[i].IfShow == 1 then if propertyConfig[i].TargetPropertyId == 0 then - basePower = basePower + v * propertyConfig[i].Score + basePower = basePower + v*propertyConfig[i].Score end elseif propertyConfig[i].IfShow == 2 then -- 这里百分比数要转换成小数,用于计算战斗力 - HighPower = HighPower + v/100 + HighPower = HighPower + v/100*propertyConfig[i].Score end - elseif v > 0 and i >= HeroProType.WarPower then + elseif v > 0 and i == HeroProType.WarPower then extPower = extPower + v end end LogBlue_Prop("basePower: "..basePower) LogBlue_Prop("HighPower: "..HighPower) LogBlue_Prop("extPower: "..extPower) - powerEndVal = basePower * (1 + HighPower / 2) + extPower + powerEndVal = basePower * (1 + HighPower) + extPower return math.floor(powerEndVal) end @@ -89,8 +89,7 @@ function this.InitAllPower() end -function this.CalPower(heroData, propList) - -- return CalculateWarForce(propList) +function this.CalPower(propList) return CalculateWarForce2(propList) end @@ -108,7 +107,7 @@ function this.GetHeroPower(dId, formationId, NoFuncProp) -- 重新计算人物属性 local propList = HeroPropManager.GetHeroProp(dId, formationId, NoFuncProp) -- 计算战斗力 - local allPower = this.CalPower(heroData, propList) + local allPower = this.CalPower(propList) -- 旧战斗力 if HeroPropManager.IsDebug() and not NoFuncProp then -- local curHeroData = HeroManager.GetSingleHeroData(dId) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index f431245a95..868d314cd7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -660,24 +660,8 @@ function this.CalculateWarForceBase(sId, lv, rlv, tlv,curTreasure) end end end - local heroPropertyScore = {} - for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.PropertyConfig)) do - heroPropertyScore[i] = v.Score - end - local powerEndVal = 0 - for i, v in pairs(addAllProVal) do - if v > 0 then - local curProConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, i) - if curProConfigData then - if curProConfigData.Style == 1 then - powerEndVal = powerEndVal + v * heroPropertyScore[i] - else - powerEndVal = powerEndVal + v / 100 * heroPropertyScore[i] - end - end - end - end - return math.floor(powerEndVal) + local powerEndVal = HeroPowerManager.CalPower(addAllProVal) + return powerEndVal end end --获取宝物升级消耗 From fe13249728343d219b25cb4568abb3c7ee502832 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 17 Nov 2021 16:01:14 +0800 Subject: [PATCH 06/25] =?UTF-8?q?=E3=80=90=E4=BA=BA=E7=89=A9=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E3=80=91=E6=96=B0=E5=A2=9E=E7=88=86=E4=BC=A4=E5=87=8F?= =?UTF-8?q?=E5=85=8D=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=88=98=E6=96=97=E9=80=82?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 12 +++-------- .../~Lua/Modules/Battle/BattleManager.lua | 21 ++++++++++--------- .../Modules/Battle/Logic/Base/Passivity.lua | 2 +- .../Battle/Logic/Misc/BattleDefine.lua | 7 ++++--- .../Modules/Battle/Logic/Misc/BattleUtil.lua | 13 ++---------- .../~Lua/Modules/Hero/HeroManager.lua | 7 +++++-- 6 files changed, 26 insertions(+), 36 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f023e243b7..feee310805 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -301,22 +301,17 @@ HeroProType = { PhysicalDefence = 3, --护甲 MagicDefence = 4, --魔抗 Speed = 5, --速度 + InitRage = 7, -- 初始怒气值 DamageBocusFactor = 51, --伤害加成百分比 DamageReduceFactor = 52, --伤害减免百分比 Hit = 53, --效果命中率 Dodge = 54, --效果抵抗率 CritFactor = 55, --暴击率 CritDamageFactor = 56, --暴伤 + AntiCritFactor = 60, --抗暴率 + AntiCritDamageFactor = 113, --暴击伤害减免 CureFacter = 57, --受到治疗系数 TreatFacter = 58, --治疗系数 - DifferDemonsReduceFactor = 59, --异妖减伤率 - AntiCritDamageFactor = 60, --抗暴率 - MaxHpPercentage = 61, --生命值百分比 - AttackPercentage = 62, --攻击力百分比 - MaxHpPercentage = 63, --生命值百分比 - PhysicalDefencePercentage = 64, --护甲百分比 - SpeedPercentage = 65, --速度百分比 - DifferDemonsBocusFactor = 66, --异妖伤害加成系数 RenBonus = 101, --对人杰阵营神将造成伤害时获得的伤害加成 FoBonus = 102, --对佛禅阵营神将造成伤害时获得的伤害加成 YaoBonus = 103, --对妖灵阵营神将造成伤害时获得的伤害加成 @@ -326,7 +321,6 @@ HeroProType = { YaoReduce = 109, --受到妖灵阵营神将造成的直接伤害时获得的伤害减免 DaoReduce = 110, --受到道玄阵营神将造成的直接伤害时获得的伤害减免 WarPower = 1000, --英雄战斗力(获取英雄属性时会用到) - InitRage = 200, -- 初始怒气值 } --异妖图片资源 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 894fd1f127..c681b7ae94 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -633,18 +633,19 @@ function this.GetMonsterPros(id, lv, star) table.insert(allProVal, 11, proList[HeroProType.Dodge] or 0) --闪避率(%) table.insert(allProVal, 12, proList[HeroProType.CritFactor] or 0) --暴击率(%) table.insert(allProVal, 13, proList[HeroProType.CritDamageFactor] or 0) --暴击伤害系数(%) - table.insert(allProVal, 14, proList[HeroProType.AntiCritDamageFactor] or 0) --抗暴率(%) + table.insert(allProVal, 14, proList[HeroProType.AntiCritFactor] or 0) --抗暴率(%) table.insert(allProVal, 15, proList[HeroProType.TreatFacter] or 1) --治疗加成系数(%) 默认为1 table.insert(allProVal, 16, proList[HeroProType.CureFacter] or 1) --受到治疗系数(%)默认为1 - table.insert(allProVal, 17, 0) --异妖伤害加成系数(%) - table.insert(allProVal, 18, 0) --异妖减伤率(%) - table.insert(allProVal, 19, 0) --火系伤害减免系数(%) - table.insert(allProVal, 20, 0) --风系伤害减免系数(%) - table.insert(allProVal, 21, 0) --冰系伤害减免系数(%) - table.insert(allProVal, 22, 0) --地系伤害减免系数(%) - table.insert(allProVal, 23, 0) --光系伤害减免系数(%) - table.insert(allProVal, 24, 0) --暗系伤害减免系数(%) - table.insert(allProVal, 25, 0) + table.insert(allProVal, 17, proList[HeroProType.RenBonus] or 0) -- 灭人 + table.insert(allProVal, 18, proList[HeroProType.FoBonus] or 0) -- 灭佛 + table.insert(allProVal, 19, proList[HeroProType.YaoBonus] or 0) -- 灭妖 + table.insert(allProVal, 20, proList[HeroProType.DaoBonus] or 0) -- 灭道 + table.insert(allProVal, 21, proList[HeroProType.RenReduce] or 0) -- 抗人 + table.insert(allProVal, 22, proList[HeroProType.FoReduce] or 0) -- 抗佛 + table.insert(allProVal, 23, proList[HeroProType.YaoReduce] or 0) -- 抗妖 + table.insert(allProVal, 24, proList[HeroProType.DaoReduce] or 0) -- 抗道 + table.insert(allProVal, 25, proList[HeroProType.InitRage] or 0) -- 初始怒气 + table.insert(allProVal, 26, proList[HeroProType.AntiCritDamageFactor] or 0) -- 爆伤减免 local pros = table.concat(allProVal, "#") return pros end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 438a9a89a0..37197197a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1333,7 +1333,7 @@ local passivityList = { local OnPassiveCriting = function(crit,skill) BattleUtil.RandomAction(f1, function () - crit(role:GetRoleData(RoleDataName.CritDamageFactor)+f2) + crit(role:GetRoleData(RoleDataName.CritDamageBonus)+f2) end) end role.Event:AddEvent(BattleEventName.PassiveCriting, OnPassiveCriting,nil,nil,role) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index ded488dcfc..86a3b106f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -199,7 +199,7 @@ RoleDataName = { Hit = indexAdd(), --施法率(%) Dodge = indexAdd(), --后期基础施法率(%) Crit = indexAdd(), --暴击率(%) - CritDamageFactor = indexAdd(), --暴击伤害系数(%) + CritDamageBonus = indexAdd(), --暴击伤害系数(%) Tenacity = indexAdd(), --抗暴率(%) TreatFacter = indexAdd(), --治疗加成系数(%) CureFacter = indexAdd(),--受到治疗加成系数(%) @@ -212,7 +212,7 @@ RoleDataName = { YaoReduce = indexAdd(), --妖系伤害减免 DaoReduce = indexAdd(), --道系伤害减免 InitRage = indexAdd(), --初始怒气值 - + CritDamageReduce = indexAdd(), --暴击伤害减免 } -- 战斗表属性id对应战斗中属性数据 @@ -226,7 +226,7 @@ BattlePropList = { RoleDataName.Hit, RoleDataName.Dodge, RoleDataName.Crit, - RoleDataName.CritDamageFactor, + RoleDataName.CritDamageBonus, RoleDataName.TreatFacter, RoleDataName.MaxHp, RoleDataName.Hp, @@ -241,6 +241,7 @@ BattlePropList = { RoleDataName.FoReduce, RoleDataName.YaoReduce, RoleDataName.DaoReduce, + RoleDataName.CritDamageReduce, } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 74b94544ee..44b8e184a9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -607,15 +607,6 @@ function BattleUtil.ApplyDamage(skill, atkRole, defRole, damage, bCrit, damageTy bCrit = bCrit or false damageType = damageType or 0 - -- if atkRole.isTeam then - -- --max(技能基础伤害*(1+已方异妖伤害加成-目标异妖伤害减免),30%×技能基础伤害) - -- local arr = RoleManager.Query(function (r) return r.camp == atkRole.camp end) - -- local n = 0 - -- for i=1, #arr do - -- n = n + arr[i]:GetRoleData(RoleDataName.TeamDamageBocusFactor) - -- end - -- damage = floor(max(damage * (1 + n / #arr - defRole:GetRoleData(RoleDataName.TeamDamageReduceFactor)), 0.3 * damage)) - -- end -- 计算护盾减伤 damage = BattleUtil.CalShield(atkRole, defRole, damage,skill) @@ -972,7 +963,7 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i critDamageReduceFactor = max(BattleUtil.CountChangeList(critDamageReduceFactor, cl), 0) -- 计算额外暴击伤害 - critDamageFactor = 1.3 + atkRole:GetRoleData(RoleDataName.CritDamageFactor) - critDamageReduceFactor + critDamageFactor = 1.3 + atkRole:GetRoleData(RoleDataName.CritDamageBonus) - defRole:GetRoleData(RoleDataName.CritDamageReduce) - critDamageReduceFactor --加入被动效果 触发暴击被动 local critFunc = function(critEx) critDamageFactor = critEx end atkRole.Event:DispatchEvent(BattleEventName.PassiveCriting, critFunc,skill) @@ -1019,7 +1010,7 @@ function BattleUtil.CalTreat(castRole, targetRole, value, baseFactor,skill) --计算暴击 if bCrit then --伤害有个+1.3 不知道干什么用的就给去了 by:wangxhenxing 2020/10/10 18:46 - critDamageFactor = 1.3 + castRole:GetRoleData(RoleDataName.CritDamageFactor) + critDamageFactor = 1.3 + castRole:GetRoleData(RoleDataName.CritDamageBonus) end -- 基础伤害增加系数 local addDamageFactor = 1 + castRole:GetRoleData(RoleDataName.DamageBocusFactor) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index d1ad8e6389..a5595afef8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2192,7 +2192,7 @@ function this.CalculateWarAllProVal(heroDid) --暴击伤害系数(%) table.insert(allProVal, 13, allEquipAddProVal[HeroProType.CritDamageFactor]) --抗暴率(%) - table.insert(allProVal, 14, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) + table.insert(allProVal, 14, allEquipAddProVal[HeroProType.AntiCritFactor]) --治疗加成系数(%) table.insert(allProVal, 15, allEquipAddProVal[HeroProType.TreatFacter]) --受到治疗系数(%) @@ -2214,7 +2214,10 @@ function this.CalculateWarAllProVal(heroDid) -- 道系伤害减免 table.insert(allProVal, 24, allEquipAddProVal[HeroProType.DaoReduce]) -- 怒气 - table.insert(allProVal, 25, 0) + table.insert(allProVal, 25, allEquipAddProVal[HeroProType.InitRage]) + -- 爆伤减免 + table.insert(allProVal, 26, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) + return allProVal end From 8bb710452cf10c82e95b3440fe80b0fd65771b3a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 17 Nov 2021 16:50:16 +0800 Subject: [PATCH 07/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E5=8A=9B?= =?UTF-8?q?=E3=80=91=E8=A3=85=E5=A4=87=E6=88=98=E6=96=97=E5=8A=9B=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Equip/EquipManager.lua | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index 893e54c7ec..55ce872748 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -243,29 +243,21 @@ function this.CalculateEquipWarForce(curEquip) for index, prop in pairs(mainAttribute) do local id = prop.propertyId local value = prop.propertyValue + -- + if propertyConfig[id].Style == 2 then + value = value / 100 + end if addAllProVal[id] then addAllProVal[id] = addAllProVal[id] + value else addAllProVal[id] = value end end - local powerEndVal = 0 - for i, v in pairs(addAllProVal) do - if v > 0 then - local curProConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, i) - if curProConfigData then - if curProConfigData.Style == 1 then - powerEndVal = powerEndVal + v * HeroManager.heroPropertyScore[i] - else - powerEndVal = powerEndVal + v / 100 * HeroManager.heroPropertyScore[i] - end - end - end - end if curEquip and curEquip.Score > 0 then - powerEndVal = powerEndVal + curEquip.Score + addAllProVal[HeroProType.WarPower] = curEquip.Score end - return math.floor(powerEndVal) + local powerEndVal = HeroPowerManager.CalPower(addAllProVal) + return powerEndVal end -- 判断是否是新装备 From b1954f543f03cbf266d2a3b27d88b24644adc6e9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 17 Nov 2021 16:57:29 +0800 Subject: [PATCH 08/25] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E5=9F=BA=E7=A1=80=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=A4=9A=E5=85=B3=E9=97=AD=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=B0=91=E7=9A=84=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index dd1dc06577..0afa56ccdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -217,6 +217,9 @@ function RewardEquipSingleShowPopup2:OnShow() --basePro基础属性 if equipConfigData.Property then self.basePro:SetActive(true) + for _, pro in ipairs(_BaseProList) do + pro:SetActive(false) + end for index, prop in ipairs(equipConfigData.Property) do local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1]) if proConfigData then From 1aa2efc1b1f51aad18d3f3d932a41a06c2db0f7a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 17 Nov 2021 16:57:29 +0800 Subject: [PATCH 09/25] =?UTF-8?q?=E3=80=90=E8=A3=85=E5=A4=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=E5=9F=BA=E7=A1=80=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=A4=9A=E5=85=B3=E9=97=AD=E6=89=93=E5=BC=80?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=B0=91=E7=9A=84=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua index c17435a998..5f20111b15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua @@ -217,6 +217,9 @@ function RewardEquipSingleShowPopup2:OnShow() --basePro基础属性 if equipConfigData.Property then self.basePro:SetActive(true) + for _, pro in ipairs(_BaseProList) do + pro:SetActive(false) + end for index, prop in ipairs(equipConfigData.Property) do local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1]) if proConfigData then From 6ee80e7a9f17c1995aa443f66485072a77b20955 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 17 Nov 2021 17:29:17 +0800 Subject: [PATCH 10/25] =?UTF-8?q?[=E6=88=98=E6=96=97=E8=A1=A8=E7=8E=B0]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=88=98=E6=96=97?= =?UTF-8?q?=E8=A1=A8=E7=8E=B0=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 --- .../Prefabs/UI/Battle/BattlePanel.prefab | 1527 +++++++++++++---- .../Modules/Battle/Logic/Base/Passivity.lua | 2 +- .../~Lua/Modules/Battle/View/BattleView.lua | 4 +- .../Modules/Battle/View/Unit/PlayerView.lua | 155 +- 4 files changed, 1290 insertions(+), 398 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index faa74a127c..e193a69642 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -4881,7 +4881,7 @@ ParticleSystem: --- !u!199 &4899634819696531688 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9637,7 +9637,7 @@ ParticleSystem: --- !u!199 &4644274050042266027 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14542,7 +14542,7 @@ ParticleSystem: --- !u!199 &-6568434204472551825 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15064,7 +15064,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: -5754310586346547793} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -20032,7 +20032,7 @@ ParticleSystem: --- !u!199 &4504004418399676027 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25411,7 +25411,7 @@ ParticleSystem: --- !u!199 &-6320650307698832674 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25571,7 +25571,7 @@ RectTransform: m_GameObject: {fileID: -1780998917173018576} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 99.9786} - m_LocalScale: {x: 0.9, y: 0.9, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: -3258366035422410537} - {fileID: 2464737965211906784} @@ -26549,7 +26549,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &437121364 RectTransform: m_ObjectHideFlags: 0 @@ -27047,7 +27047,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &850367821 RectTransform: m_ObjectHideFlags: 0 @@ -27330,11 +27330,9 @@ RectTransform: - {fileID: 1407123839} - {fileID: 850367821} - {fileID: 6024857892893401655} - - {fileID: 2874419574134861352} - - {fileID: 2874419575473712772} - - {fileID: 2874419574997479806} - {fileID: 1035529114371269779} - {fileID: 5721896765191474331} + - {fileID: 2714294960037612476} m_Father: {fileID: -4381370023651553062} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27678,7 +27676,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1407123839 RectTransform: m_ObjectHideFlags: 0 @@ -32509,7 +32507,7 @@ ParticleSystem: --- !u!199 &1498398485 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33450,7 +33448,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121143691748430958} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -39044,7 +39042,7 @@ ParticleSystem: --- !u!199 &5218046717783627369 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43816,7 +43814,7 @@ ParticleSystem: --- !u!199 &4973672912865784035 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44779,6 +44777,64 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 990887414542774962} m_CullTransparentMesh: 0 +--- !u!1 &1004967687612880886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5541316517095428245} + - component: {fileID: 4823737723693298344} + m_Layer: 5 + m_Name: live_5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5541316517095428245 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004967687612880886} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 4060928337411048415} + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 5 + 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: 77, y: 142.99997} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4823737723693298344 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1004967687612880886} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1 &1052138092767458865 GameObject: m_ObjectHideFlags: 0 @@ -44907,7 +44963,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1059868455729065215} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -44982,7 +45038,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1135407609777027850} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -49571,7 +49627,7 @@ ParticleSystem: --- !u!199 &8115754504008755670 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54197,7 +54253,7 @@ ParticleSystem: --- !u!199 &9076588630997100118 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54786,7 +54842,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713230017729812030} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -55064,7 +55120,7 @@ RectTransform: m_Children: - {fileID: 7021852296201406370} m_Father: {fileID: 1044302835} - m_RootOrder: 14 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -59747,7 +59803,7 @@ ParticleSystem: --- !u!199 &4884976521430742359 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59842,7 +59898,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 98.45501, y: -3.6900005} + m_AnchoredPosition: {x: 98.45501, y: -3.6899986} m_SizeDelta: {x: 15.37, y: 38.62} m_Pivot: {x: 0, y: 1} --- !u!222 &7105677471423820838 @@ -64765,7 +64821,7 @@ ParticleSystem: --- !u!199 &8971589303256642876 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69545,7 +69601,7 @@ ParticleSystem: --- !u!199 &908326538797127167 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74222,7 +74278,7 @@ ParticleSystem: --- !u!199 &3424815464729120938 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79423,7 +79479,7 @@ ParticleSystem: --- !u!199 &5261670500339204049 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79611,7 +79667,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2480781000727656164} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -79781,7 +79837,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2571187854533709431} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -80963,8 +81019,8 @@ RectTransform: m_LocalScale: {x: 1.2, y: 1.2, z: 1} m_Children: - {fileID: 2874419574127282484} - m_Father: {fileID: 1044302835} - m_RootOrder: 10 + m_Father: {fileID: 2714294960037612476} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -81025,7 +81081,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2874419574162345741 RectTransform: m_ObjectHideFlags: 0 @@ -81135,7 +81191,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2874419574504976917 RectTransform: m_ObjectHideFlags: 0 @@ -81672,8 +81728,8 @@ RectTransform: - {fileID: 2874419575683843497} - {fileID: 2874419575883036544} - {fileID: 3002666930049225663} - m_Father: {fileID: 1044302835} - m_RootOrder: 12 + m_Father: {fileID: 2714294960037612476} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -82366,8 +82422,8 @@ RectTransform: - {fileID: 2874419575757642720} - {fileID: 2874419575420701304} - {fileID: 9111004418300883058} - m_Father: {fileID: 1044302835} - m_RootOrder: 11 + m_Father: {fileID: 2714294960037612476} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -87415,7 +87471,7 @@ ParticleSystem: --- !u!199 &2874419575716874138 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87967,7 +88023,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2978732997840884618} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -88306,7 +88362,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 84.975, y: -3.6900005} + m_AnchoredPosition: {x: 84.975, y: -3.6899986} m_SizeDelta: {x: 15.37, y: 38.62} m_Pivot: {x: 0, y: 1} --- !u!222 &8016750144293385882 @@ -88491,7 +88547,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 88.345, y: -3.6900005} + m_AnchoredPosition: {x: 88.345, y: -3.6899986} m_SizeDelta: {x: 15.37, y: 38.62} m_Pivot: {x: 0, y: 1} --- !u!222 &1453837576514420961 @@ -93480,7 +93536,7 @@ ParticleSystem: --- !u!199 &-4646563412136487132 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98408,7 +98464,7 @@ ParticleSystem: --- !u!199 &-1472657892369082979 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -98559,7 +98615,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6024857892893401655 RectTransform: m_ObjectHideFlags: 0 @@ -103717,7 +103773,7 @@ ParticleSystem: --- !u!199 &1190906450238264296 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -103989,12 +104045,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3360585188075601704} - m_Father: {fileID: 4024934114733561411} - m_RootOrder: 5 + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 12 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: 1832, y: -78} + m_AnchoredPosition: {x: 377, y: 142.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4141209481787949115 @@ -104035,6 +104091,80 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &3743472943261694546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9139396969791315054} + - component: {fileID: 4434997914039246419} + - component: {fileID: 4478424797393184294} + m_Layer: 5 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9139396969791315054 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3743472943261694546} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0009689331} + m_LocalScale: {x: 1.8518518, y: 1.8518518, z: 1} + m_Children: [] + m_Father: {fileID: 2593633115569930101} + m_RootOrder: 0 + 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: -1.6666565, y: -197.03697} + m_SizeDelta: {x: 322, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4434997914039246419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3743472943261694546} + m_CullTransparentMesh: 0 +--- !u!114 &4478424797393184294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3743472943261694546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8be619d76a33ac4e9905a8d3e66bfde, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3749483718813766235 GameObject: m_ObjectHideFlags: 0 @@ -108687,7 +108817,7 @@ ParticleSystem: --- !u!199 &303874950425780290 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -108798,7 +108928,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3845411203315897176} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -113497,7 +113627,7 @@ ParticleSystem: --- !u!199 &6491226494071429411 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -118235,7 +118365,7 @@ ParticleSystem: --- !u!199 &7665643744862724267 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -122960,7 +123090,7 @@ ParticleSystem: --- !u!199 &3356793107164812852 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127806,7 +127936,7 @@ ParticleSystem: --- !u!199 &2105574043811551045 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -128156,12 +128286,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7502186766485076338} - m_Father: {fileID: 4024934114733561411} - m_RootOrder: 1 + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 8 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: -1683.0001, y: 277} + m_AnchoredPosition: {x: -73, y: 448.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &7657108788432695688 @@ -133210,7 +133340,7 @@ ParticleSystem: --- !u!199 &3873208337485661605 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -137836,7 +137966,7 @@ ParticleSystem: --- !u!199 &7638952314412277887 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -142687,7 +142817,7 @@ ParticleSystem: --- !u!199 &7217318690555267618 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -147413,7 +147543,7 @@ ParticleSystem: --- !u!199 &5163551958220482345 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -152111,7 +152241,7 @@ ParticleSystem: --- !u!199 &1275831586270848987 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -157020,7 +157150,7 @@ ParticleSystem: --- !u!199 &6459582860832847666 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -157591,7 +157721,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8032969764776295951} - - component: {fileID: 1048028496800183147} m_Layer: 5 m_Name: RolePanel m_TagString: Untagged @@ -157611,6 +157740,18 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 834692241} + - {fileID: 7485940279673153507} + - {fileID: 6585631384616885062} + - {fileID: 4417892464660579975} + - {fileID: 2593633115569930101} + - {fileID: 5541316517095428245} + - {fileID: 7786658268145073970} + - {fileID: 3198430005102515251} + - {fileID: 4733835317090964167} + - {fileID: 4053770132861701690} + - {fileID: 8665821495714301826} + - {fileID: 8011628067624866770} + - {fileID: 4330148323958158182} - {fileID: 4024934114733561411} - {fileID: 3135399791809543747} m_Father: {fileID: -4381370023651553062} @@ -157621,178 +157762,6 @@ RectTransform: m_AnchoredPosition: {x: -20, y: 206} m_SizeDelta: {x: 1100, y: 202.5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1048028496800183147 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4891115421400729440} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} - m_Name: - m_EditorClassIdentifier: - tweenSequeue: - - initV3: {x: -1399, y: 277, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: 211, y: 365, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 2 - changeType: 0 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 3198430005102515251} - - initV3: {x: 1287, y: -78, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: -196, y: 10, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 2 - changeType: 0 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 8665821495714301826} - - initV3: {x: -1683, y: 277, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: -73, y: 365, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 2 - changeType: 0 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 4733835317090964167} - - initV3: {x: 1567, y: -78, z: 1} - initFloat: 0 - isInit: 1 - changeV3: {x: 84, y: 10, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 2 - changeType: 0 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 8011628067624866770} - - initV3: {x: -1971, y: 277, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: -352, y: 365, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 2 - changeType: 0 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 4053770132861701690} - - initV3: {x: 1846, y: -78, z: 0} - initFloat: 0 - isInit: 1 - changeV3: {x: 363, y: 10, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 2 - changeType: 0 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 4330148323958158182} - - initV3: {x: 1, y: 1, z: 1} - initFloat: 0 - isInit: 1 - changeV3: {x: 0.82, y: 0.82, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 0 - loop: 0 - loopType: 0 - targetObj: {fileID: 3198430005102515251} - - initV3: {x: 1, y: 1, z: 1} - initFloat: 0 - isInit: 1 - changeV3: {x: 0.82, y: 0.82, z: 0.82} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 8665821495714301826} - - initV3: {x: 1, y: 1, z: 1} - initFloat: 0 - isInit: 1 - changeV3: {x: 0.82, y: 0.82, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 4733835317090964167} - - initV3: {x: 1, y: 1, z: 1} - initFloat: 0 - isInit: 1 - changeV3: {x: 0.82, y: 0.82, z: 0.82} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 8011628067624866770} - - initV3: {x: 1, y: 1, z: 1} - initFloat: 0 - isInit: 1 - changeV3: {x: 0.82, y: 0.82, z: 0} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 4053770132861701690} - - initV3: {x: 1, y: 1, z: 1} - initFloat: 0 - isInit: 1 - changeV3: {x: 0.82, y: 0.82, z: 0.82} - changeFloat: 0 - duration: 0.2 - delay: 0 - curveType: 1 - changeType: 4 - sequeueType: 1 - loop: 0 - loopType: 0 - targetObj: {fileID: 4330148323958158182} - isPlayAudio: 1 - isHaveCloseBtn: 0 - isPlayOnOpen: 1 --- !u!1 &4929751347603845043 GameObject: m_ObjectHideFlags: 0 @@ -157987,6 +157956,64 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 +--- !u!1 &4979482859470697798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4417892464660579975} + - component: {fileID: 3681946865722538890} + m_Layer: 5 + m_Name: live_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4417892464660579975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4979482859470697798} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 8339478454819500014} + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 3 + 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: 227, y: 448.99994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3681946865722538890 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4979482859470697798} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &4997491602013275279 GameObject: m_ObjectHideFlags: 0 @@ -162991,7 +163018,7 @@ ParticleSystem: --- !u!199 &6379215747265299312 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -168359,7 +168386,7 @@ ParticleSystem: --- !u!199 &-6104293520298689822 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -168755,7 +168782,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 95.08501, y: -3.6900005} + m_AnchoredPosition: {x: 95.08501, y: -3.6899986} m_SizeDelta: {x: 15.37, y: 38.62} m_Pivot: {x: 0, y: 1} --- !u!222 &767584753469698652 @@ -173641,7 +173668,7 @@ ParticleSystem: --- !u!199 &4760249444529865488 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178436,7 +178463,7 @@ ParticleSystem: --- !u!199 &5880366811561489219 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178789,7 +178816,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6039127062570686598} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -178920,7 +178947,7 @@ RectTransform: - {fileID: 3691979404969139093} - {fileID: 631228591500787782} m_Father: {fileID: 8032969764776295951} - m_RootOrder: 2 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -179504,7 +179531,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6333955142193622447} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -179874,6 +179901,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6417922134418976930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 176820800635632652} + - component: {fileID: 241017459577456947} + - component: {fileID: 2095132530077552989} + m_Layer: 5 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &176820800635632652 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6417922134418976930} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0009689331} + m_LocalScale: {x: 1.8518518, y: 1.8518518, z: 1} + m_Children: [] + m_Father: {fileID: 6585631384616885062} + m_RootOrder: 0 + 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: -198.99997} + m_SizeDelta: {x: 322, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &241017459577456947 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6417922134418976930} + m_CullTransparentMesh: 0 +--- !u!114 &2095132530077552989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6417922134418976930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8be619d76a33ac4e9905a8d3e66bfde, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6420060666125700753 GameObject: m_ObjectHideFlags: 0 @@ -180075,6 +180176,176 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &6634363849289259518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7485940279673153507} + - component: {fileID: 8683155064434081473} + m_Layer: 5 + m_Name: live_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7485940279673153507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6634363849289259518} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 1691281247155542861} + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 1 + 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: -373, y: 448.99994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &8683155064434081473 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6634363849289259518} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!1 &6720422172481530535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2714294960037612476} + m_Layer: 5 + m_Name: lvObj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2714294960037612476 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6720422172481530535} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2874419574134861352} + - {fileID: 2874419575473712772} + - {fileID: 2874419574997479806} + m_Father: {fileID: 1044302835} + m_RootOrder: 12 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6725380291275006345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5298674135033318747} + - component: {fileID: 2907416238825184065} + - component: {fileID: 5585800151663329178} + m_Layer: 5 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5298674135033318747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6725380291275006345} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0009689331} + m_LocalScale: {x: 1.8518518, y: 1.8518518, z: 1} + m_Children: [] + m_Father: {fileID: 7786658268145073970} + m_RootOrder: 0 + 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: -197.03705} + m_SizeDelta: {x: 322, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2907416238825184065 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6725380291275006345} + m_CullTransparentMesh: 0 +--- !u!114 &5585800151663329178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6725380291275006345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8be619d76a33ac4e9905a8d3e66bfde, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6762912150882839980 GameObject: m_ObjectHideFlags: 0 @@ -180109,7 +180380,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: 363.5, y: 10} + m_AnchoredPosition: {x: -86, y: 10} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4767782372238396446 @@ -180175,17 +180446,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6802990670121464878} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 890082298661879197} - m_Father: {fileID: 4024934114733561411} - m_RootOrder: 2 + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 9 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: -1971.5001, y: 277} + m_AnchoredPosition: {x: -373, y: 448.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &6784883404659137753 @@ -180700,7 +180971,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7050181661935535465} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -185294,7 +185565,7 @@ ParticleSystem: --- !u!199 &8058989397371758890 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -185540,7 +185811,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: 84, y: 10} + m_AnchoredPosition: {x: -73, y: 10} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &7197171550801188729 @@ -185581,6 +185852,80 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &7260294328112529688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8339478454819500014} + - component: {fileID: 3952871096868932115} + - component: {fileID: 7954928238015160936} + m_Layer: 5 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8339478454819500014 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260294328112529688} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0009689331} + m_LocalScale: {x: 1.8518518, y: 1.8518518, z: 1} + m_Children: [] + m_Father: {fileID: 4417892464660579975} + m_RootOrder: 0 + 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: -198.99997} + m_SizeDelta: {x: 322, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3952871096868932115 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260294328112529688} + m_CullTransparentMesh: 0 +--- !u!114 &7954928238015160936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7260294328112529688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8be619d76a33ac4e9905a8d3e66bfde, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7266045469032723626 GameObject: m_ObjectHideFlags: 0 @@ -185655,6 +186000,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7286183922312593683 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1691281247155542861} + - component: {fileID: 6315271290467485817} + - component: {fileID: 4195644244672835087} + m_Layer: 5 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1691281247155542861 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7286183922312593683} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0009689331} + m_LocalScale: {x: 1.8518518, y: 1.8518518, z: 1} + m_Children: [] + m_Father: {fileID: 7485940279673153507} + m_RootOrder: 0 + 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: -199} + m_SizeDelta: {x: 322, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6315271290467485817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7286183922312593683} + m_CullTransparentMesh: 0 +--- !u!114 &4195644244672835087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7286183922312593683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8be619d76a33ac4e9905a8d3e66bfde, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7302737250732754932 GameObject: m_ObjectHideFlags: 0 @@ -185671,7 +186090,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4024934114733561411 RectTransform: m_ObjectHideFlags: 0 @@ -185682,20 +186101,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3198430005102515251} - - {fileID: 4733835317090964167} - - {fileID: 4053770132861701690} - - {fileID: 8665821495714301826} - - {fileID: 8011628067624866770} - - {fileID: 4330148323958158182} + m_Children: [] m_Father: {fileID: 8032969764776295951} - m_RootOrder: 1 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -17.469788} - m_SizeDelta: {x: 0, y: 177} + 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: 1100, y: 202} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4086070584687758473 MonoBehaviour: @@ -190923,7 +191336,7 @@ ParticleSystem: --- !u!199 &3915694397730101422 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -195865,7 +196278,7 @@ ParticleSystem: --- !u!199 &2480133432062228239 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -196065,7 +196478,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.715004, y: -3.6900005} + m_AnchoredPosition: {x: 91.715004, y: -3.6899986} m_SizeDelta: {x: 15.37, y: 38.62} m_Pivot: {x: 0, y: 1} --- !u!222 &2199748303209743461 @@ -200811,7 +201224,7 @@ ParticleSystem: --- !u!199 &912766437007132055 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -201048,7 +201461,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1044302835} - m_RootOrder: 13 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -205651,7 +206064,7 @@ ParticleSystem: --- !u!199 &5882683786084557201 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -210322,7 +210735,7 @@ ParticleSystem: --- !u!199 &333661895225793953 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -215305,7 +215718,7 @@ ParticleSystem: --- !u!199 &4000754657521103867 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -215458,6 +215871,64 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8170718850834794939 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7786658268145073970} + - component: {fileID: 3196897155070244967} + m_Layer: 5 + m_Name: live_6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7786658268145073970 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170718850834794939} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 5298674135033318747} + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 6 + 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: 377, y: 142.99997} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3196897155070244967 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170718850834794939} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1 &8177684299086069626 GameObject: m_ObjectHideFlags: 0 @@ -220178,7 +220649,7 @@ ParticleSystem: --- !u!199 &6245463154932388831 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -220290,7 +220761,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8221891029976546640} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -220312,6 +220783,64 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8231987885102035235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2593633115569930101} + - component: {fileID: 3329905336858514894} + m_Layer: 5 + m_Name: live_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2593633115569930101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8231987885102035235} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 9139396969791315054} + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 4 + 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: -223, y: 143} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3329905336858514894 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8231987885102035235} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1 &8237456443914175765 GameObject: m_ObjectHideFlags: 0 @@ -220342,12 +220871,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4127916411277389435} - m_Father: {fileID: 4024934114733561411} - m_RootOrder: 4 + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 11 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: 1567, y: -78} + m_AnchoredPosition: {x: 77, y: 142.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4750705131862230612 @@ -220703,12 +221232,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 666760566860824669} - m_Father: {fileID: 4024934114733561411} - m_RootOrder: 0 + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 7 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: -1399, y: 277} + m_AnchoredPosition: {x: 227, y: 448.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &7630528602242784194 @@ -225541,7 +226070,7 @@ ParticleSystem: --- !u!199 &3385089575464667298 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -231192,7 +231721,7 @@ ParticleSystem: --- !u!199 &334997627562404853 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -231548,6 +232077,64 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 67, y: 58} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9079469702286480067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6585631384616885062} + - component: {fileID: 6752199970212708454} + m_Layer: 5 + m_Name: live_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6585631384616885062 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9079469702286480067} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 99.9786} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} + m_Children: + - {fileID: 176820800635632652} + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 2 + 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: -73, y: 448.99994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &6752199970212708454 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9079469702286480067} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &9085051516399267733 GameObject: m_ObjectHideFlags: 0 @@ -236115,7 +236702,7 @@ ParticleSystem: --- !u!199 &7957960085504555880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -236356,12 +236943,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2069895754318839184} - m_Father: {fileID: 4024934114733561411} - m_RootOrder: 3 + m_Father: {fileID: 8032969764776295951} + m_RootOrder: 10 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: 1287, y: -78} + m_AnchoredPosition: {x: -223, y: 142.99994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &2692712066515308316 @@ -236402,6 +236989,80 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &9172718403482092365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4060928337411048415} + - component: {fileID: 4517479186349036690} + - component: {fileID: 4913987591224341519} + m_Layer: 5 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4060928337411048415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9172718403482092365} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0009689331} + m_LocalScale: {x: 1.8518518, y: 1.8518518, z: 1} + m_Children: [] + m_Father: {fileID: 5541316517095428245} + m_RootOrder: 0 + 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: -197.03702} + m_SizeDelta: {x: 322, y: 81} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4517479186349036690 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9172718403482092365} + m_CullTransparentMesh: 0 +--- !u!114 &4913987591224341519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9172718403482092365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8be619d76a33ac4e9905a8d3e66bfde, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1001 &611863740 PrefabInstance: m_ObjectHideFlags: 0 @@ -237149,12 +237810,37 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237164,22 +237850,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237314,12 +238005,37 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237329,22 +238045,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237624,12 +238345,37 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237639,22 +238385,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237789,12 +238540,37 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237804,22 +238580,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237954,12 +238735,37 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -237969,22 +238775,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -238514,12 +239325,37 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 4685108442502571046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.6899986 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -238529,22 +239365,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 02aa735663..fa02a54f36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -7614,7 +7614,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,role) end, - --[a]攻击时,如果目标处于持续伤害[b]状态,则有[c]%的概率使目标[d][e]回合,触发条件[f](f: 0/不填 灼烧目标, 1:没有条件)() + --[a]攻击时,如果目标处于持续伤害[b]状态,则有[c]%的概率使目标[d][e]回合,触发条件[f](f: 0/不填 灼烧目标, 1:没有条件) --a[int 攻击类型 1:普攻 4:死亡技能],b[int],c[flaot],d[int],e[int],f[int] [323]=function(role,args,id,judge) local st = args[1] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index 15f83aef36..a9a151b0c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -640,7 +640,7 @@ function this.BattleOrderChange(order) enemyPos.localScale = Vector3.zero enemyLivePos.localScale = Vector3.zero - local myPos = Util.GetTransform(this.PlayerPanel, "View/"..i.."/root") + local myPos = Util.GetTransform(this.PlayerPanel,i.."/root") myPos:GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinkapaifan") myPos.localScale = Vector3.one end @@ -650,7 +650,7 @@ end function this.OnAddRole(data) local go if data.camp == 0 then - local parent = Util.GetTransform(this.PlayerPanel, "View/"..data.position.."/root") + local parent = Util.GetTransform(this.PlayerPanel,data.position.."/root") go = BattlePool.GetItem(parent, BATTLE_POOL_TYPE.MY_ROLE) playerHP = playerHP + data:GetRoleData(RoleDataName.Hp) playerMaxHP = playerMaxHP + data:GetRoleData(RoleDataName.MaxHp) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 933beacf1d..f0fe3fb7d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -25,16 +25,16 @@ function PlayerView:onCreate(go, role, position, root) self.camp = role.camp self.spLoader = SpriteLoader.New() - + self.castingEfectNode = self.RootPanel.mySkillCast self.castingNameNode = Util.GetGameObject(self.castingEfectNode, "TongYong_Casting_Xia/DongHua/MingZi") - self.hpSlider = Util.GetGameObject(go, "hpProgress/hp"):GetComponent("Image") - self.hpPassSlider = Util.GetGameObject(go, "hpProgress/hpPass"):GetComponent("Image") - self.yujiaSlider=Util.GetGameObject(go, "hpProgress/yujia"):GetComponent("Image") + self.hpSlider = Util.GetGameObject(go, "lvObj/hpProgress/hp"):GetComponent("Image") + self.hpPassSlider = Util.GetGameObject(go, "lvObj/hpProgress/hpPass"):GetComponent("Image") + self.yujiaSlider=Util.GetGameObject(go, "lvObj/hpProgress/yujia"):GetComponent("Image") local nameParent = Util.GetGameObject(go, "Name") self.nameText = Util.GetGameObject(go, "Text"):GetComponent("Text") - self.level = Util.GetGameObject(go, "lv/Text"):GetComponent("Text") + self.level = Util.GetGameObject(go, "lvObj/lv/Text"):GetComponent("Text") self.elementImg = Util.GetGameObject(go, "Pro/Image"):GetComponent("Image") self.bg1 = Util.GetGameObject(go, "Bg1"):GetComponent("Image") self.bg2 = Util.GetGameObject(go, "Bg2"):GetComponent("Image") @@ -86,27 +86,37 @@ function PlayerView:onCreate(go, role, position, root) SetCardStars(self.starGrid, star, starType) local zs = Util.GetGameObject(go, "zs") local zsName = GetHeroCardStarZs[role.roleData.star] - if zsName == "" then - zs:SetActive(false) - else - zs:SetActive(true) - zs:GetComponent("Image").sprite = self.spLoader:LoadSprite(zsName) - end - - -- 卡牌立绘显示 - self.liveRender = Util.GetGameObject(go, "Mask/icon"):GetComponent("RawImage") - self.liveRender.texture, self.RoleLiveGO , _, self.RoleLiveParnet = CardRendererManager.GetSpineTexture(role.position, self.livePath, Vector3.one * self.play_liveScale, Vector3.New(self.offset[1], self.offset[2], 0), false) --self.spLoader:LoadSprite(heroData.painting) - self.liveRender.material = resMgr:LoadAsset("UI_AlphaMask "..position) - self.liveRender.transform:SetParent(Util.GetGameObject(go, "Mask").transform) - self.liveRender.transform.localScale = Vector3.one --* self.play_liveScale * 2 - self.liveRender.transform.anchoredPosition = Vector3.zero--Vector2.New(self.offset[1], self.offset[2]) - self.liveRender.gameObject:SetActive(true) - self.liveRender.material:SetInt("_IsMask", 1) - + -- if zsName == "" then + -- zs:SetActive(false) + -- else + -- zs:SetActive(true) + -- zs:GetComponent("Image").sprite = self.spLoader:LoadSprite(zsName) + -- end + + self.RoleLiveGO = poolManager:LoadLive(self.livePath, go.transform.parent, Vector3.one, Vector3.zero) self.RoleLiveGOGraphic = self.RoleLiveGO:GetComponent("SkeletonGraphic") self.RoleLiveGOTran = self.RoleLiveGO:GetComponent("RectTransform") self.RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true) self.RoleLiveGOTran.sizeDelta = Vector2.New(1000, 1000) + --self.RootPanel.PlayerPanel, "live_"..position + self.RoleLiveGO.transform:SetParent(Util.GetTransform(self.RootPanel.PlayerPanel, "live_"..position)) + self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5 + self.RoleLiveGO.transform.localScale = Vector3.one * self.enemy_liveScale + self.RoleLiveGO:SetActive(true) + + + -- 卡牌立绘显示 + --self.liveRender = Util.GetGameObject(go, "Mask/icon"):GetComponent("RawImage") + --self.liveRender.texture, self.aaa , _, self.RoleLiveParnet = CardRendererManager.GetSpineTexture(role.position, self.livePath, Vector3.one * self.play_liveScale, Vector3.New(self.offset[1], self.offset[2], 0), false) --self.spLoader:LoadSprite(heroData.painting) + --self.liveRender.gameObject:SetActive(false) + -- self.liveRender.material = resMgr:LoadAsset("UI_AlphaMask "..position) + -- self.liveRender.transform:SetParent(Util.GetGameObject(go, "Mask").transform) + -- self.liveRender.transform.localScale = Vector3.one --* self.play_liveScale * 2 + -- self.liveRender.transform.anchoredPosition = Vector3.zero--Vector2.New(self.offset[1], self.offset[2]) + -- self.liveRender.gameObject:SetActive(true) + -- self.liveRender.material:SetInt("_IsMask", 1) + + -- casting技能立绘 self.RoleLiveGO2 = poolManager:LoadLive(self.livePath, go.transform.parent, Vector3.one, Vector3.zero) @@ -132,14 +142,19 @@ function PlayerView:onCreate(go, role, position, root) -- 怒气显示 self.rageCache = nil - self.rageSlider = Util.GetGameObject(go, "rageProgress/rage"):GetComponent("Image") - self.rageText = Util.GetGameObject(go, "rageProgress/Text"):GetComponent("Text") - self.effect_rage = Util.GetGameObject(go, "rageProgress/effect") + self.rageSlider = Util.GetGameObject(go, "lvObj/rageProgress/rage"):GetComponent("Image") + self.rageText = Util.GetGameObject(go, "lvObj/rageProgress/Text"):GetComponent("Text") + self.effect_rage = Util.GetGameObject(go, "lvObj/rageProgress/effect") self.effect_rage:SetActive(self.role.Rage >= 4) self.rageSlider.fillAmount = self.role.Rage / 4 self.rageText.gameObject:SetActive(false) self.rageText.text = "" - + self.lvHpObj=Util.GetGameObject(go, "lvObj") + if position<=3 then + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,450,0) + else + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,0,0) + end -- 伤害文字显示 self.LastBuffFloatingTime = Time.realtimeSinceStartup self.BuffFloatingCount = 0 @@ -295,17 +310,25 @@ function PlayerView:DoScale(scale, dur, func) func() end end) + if self.dsTween2 then + self.dsTween2:Kill() + end + local liveScale = self.role.position <= 3 and 0.6 or 0.5 + self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) end --角色被放逐 function PlayerView:OnRoleExile(role) - local color = Color.New(1, 1, 1, 0.4) - Util.SetColor(self.liveRender, color) + local color1 = Color.New(1, 1, 1, 0.4) + + --Util.SetColor(self.liveRender, color) + Util.SetColor(self.RoleLiveGOGraphic, color1) end --角色放逐结束 function PlayerView:OnRoleExileEnd(role) - local color = Color.New(1, 1, 1, 1) - Util.SetColor(self.liveRender, color) + local color2 = Color.New(1, 1, 1, 1) + --Util.SetColor(self.liveRender, color) + Util.SetColor(self.RoleLiveGOGraphic, color2) end -- 设置高亮 function PlayerView:SetHighLight(isLight, eScale, dur, func) @@ -332,7 +355,11 @@ function PlayerView:SetHighLight(isLight, eScale, dur, func) end self.hlTween3 = DoTween.To(DG.Tweening.Core.DOGetter_float( function () return sc end), DG.Tweening.Core.DOSetter_float(function (progress) - local color = Color.New(progress, progress, progress, 1) + local aaa=1 + if self.role.isExile then + aaa=0.4 + end + local color = Color.New(progress, progress, progress,aaa) Util.SetColor(self.GameObject, color) Util.SetColor(self.RoleLiveGOGraphic, color) end), ec, dur):SetEase(Ease.Linear) @@ -366,24 +393,26 @@ end function PlayerView:OnSkillPlay() if not self.GameObject then + LogError("111111111") return end - local battleSorting = BattleManager.GetBattleSorting() - self:ChangeCardSorting(battleSorting + 20) + self.lvHpObj:SetActive(false) + --local battleSorting = BattleManager.GetBattleSorting() + -- self:ChangeCardSorting(battleSorting + 20) -- 立绘缩小 - if self.rlgTween2 then self.rlgTween2:Kill() end - self.rlgTween2 = self.RoleLiveParnet.transform:DOScale(Vector3.one * 0.85, 0.3):SetEase(Ease.OutSine) - -- 立绘位置剧中 - if self.rlgTween3 then self.rlgTween3:Kill() end - self.rlgTween3 = self.RoleLiveParnet.transform:DOLocalMove(Vector3.New(0, 100, 0), 0.3, false):SetEase(Ease.OutSine) - if self.liveRender then - local mask2 = Util.GetGameObject(self.GameObject, "Mask2") - if mask2 then - self.liveRender.transform:SetParent(mask2.transform) - end - end - local cardRenderMat = self.liveRender.material - cardRenderMat:SetInt("_IsMask", 0) + -- if self.rlgTween2 then self.rlgTween2:Kill() end + -- self.rlgTween2 = self.RoleLiveParnet.transform:DOScale(Vector3.one * 0.85, 0.3):SetEase(Ease.OutSine) + -- -- 立绘位置剧中 + -- if self.rlgTween3 then self.rlgTween3:Kill() end + -- self.rlgTween3 = self.RoleLiveParnet.transform:DOLocalMove(Vector3.New(0, 100, 0), 0.3, false):SetEase(Ease.OutSine) + -- if self.liveRender then + -- local mask2 = Util.GetGameObject(self.GameObject, "Mask2") + -- if mask2 then + -- self.liveRender.transform:SetParent(mask2.transform) + -- end + -- end + -- local cardRenderMat = self.liveRender.material + -- cardRenderMat:SetInt("_IsMask", 0) self:PlaySpineAnim(self.RoleLiveGOGraphic, 0, "attack", false) end @@ -393,20 +422,22 @@ function PlayerView:OnSkillEnd() end local battleSorting = BattleManager.GetBattleSorting() self:ChangeCardSorting(battleSorting + self.role.position) - self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask").transform) - local cardRenderMat = self.liveRender.material - cardRenderMat:SetInt("_IsMask", 1) + -- self.liveRender.transform:SetParent(Util.GetGameObject(self.GameObject, "Mask").transform) + --local cardRenderMat = self.liveRender.material + --cardRenderMat:SetInt("_IsMask", 1) -- 动画播放就停止 if self.rlgTween2 then self.rlgTween2:Kill() end if self.rlgTween3 then self.rlgTween3:Kill() end - self.RoleLiveParnet.transform.localScale = Vector3.one --Vector2.New(self.offset[1], self.offset[2]) - self.RoleLiveParnet.transform.localPosition = Vector3(0, 0, 0) - self.liveRender.transform.anchoredPosition = Vector2.zero--Vector2.New(self.offset[1], self.offset[2]) + --self.RoleLiveParnet.transform.localScale = Vector3.one --Vector2.New(self.offset[1], self.offset[2]) + --self.RoleLiveParnet.transform.localPosition = Vector3(0, 0, 0) + --self.liveRender.transform.anchoredPosition = Vector2.zero--Vector2.New(self.offset[1], self.offset[2]) + self.lvHpObj:SetActive(true) end function PlayerView:OnSkillCastingStart() -- 提前进入下一阶段 self.RoleLiveGO2:SetActive(true) + self.lvHpObj:SetActive(false) self:PlaySpineAnim(self.RoleLiveGOGraphic2, 0, "touch", false) end @@ -613,6 +644,8 @@ function PlayerView:OnDead() self.hpSlider.fillAmount = 0 self.hpPassSlider.fillAmount = 0 self.yujiaSlider.fillAmount = 0 + --self.RoleLiveGO.gameObject:SetActive(false) + self.lvHpObj:SetActive(false) --死亡后不把怒气条显示清空,处理触发不灭怒气不足四点 怒气条清空 2021/09/01 --self.rageSlider.fillAmount = 0 self.rageText.text = "" @@ -627,6 +660,21 @@ function PlayerView:OnRealDead() Util.SetGray(self.RoleIconGO, true) self.effect_dead:SetActive(true) self.effect_rage:SetActive(false) + local order = BattleLogic.CurOrder + BattleManager.PauseBattle() + self.RoleLiveGOGraphic:DOFade(1, 0):OnComplete(function () + self.RoleLiveGOGraphic:DOFade(0, 1):OnComplete(function () + BattleManager.ResumeBattle() + self.RoleLiveGOGraphic.color = Color.New(1,1,1,1) + if order ~= BattleLogic.CurOrder then return end + self.GameObject:SetActive(false) + self.RoleLiveGO:SetActive(false) + self.effect_dead:SetActive(false) + if self.shadow then + self.shadow:SetActive(false) + end + end) + end) self.deadIconGO:SetActive(true) local color = Color.New(75, 75, 75, 255)/255 @@ -673,6 +721,8 @@ function PlayerView:onRoleRelive() BattleManager.AddDelayRecycleRes(reliveEffect1, go, 3) BattleManager.AddDelayRecycleRes(reliveEffect2, go, 3) self.Floater:ImageBuffFloating("z_zhandou_fuhuo_zh") + self.RoleLiveGO.gameObject:SetActive(true) + self.lvHpObj:SetActive(true) end @@ -692,6 +742,7 @@ function PlayerView:onDispose() self.RoleLiveGOGraphic.freeze = false self.RoleLiveGOGraphic2.freeze = false poolManager:UnLoadLive(self.livePath, self.RoleLiveGO2) + poolManager:UnLoadLive(self.livePath, self.RoleLiveGO) -- 回收本节点 BattlePool.RecycleItem(self.GameObject, BATTLE_POOL_TYPE.MY_ROLE) self.GameObject = nil From 37000619e314da26e334704712dd3749223f84b0 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 17 Nov 2021 17:29:46 +0800 Subject: [PATCH 11/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=85=8B=E5=88=B6=E5=B1=9E=E6=80=A7=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Misc/BattleDefine.lua | 14 ++++++++++++++ .../~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua | 7 +++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 86a3b106f5..7494a35a97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -357,4 +357,18 @@ BattleArtFontType = { Immune = 1, -- 免疫文字 Shield = 2, --破盾文字 clear = 3, --清除文字 +} + + +BattleMieProp = { + [BattleRoleElementType.REN] = RoleDataName.RenBonus, + [BattleRoleElementType.FO] = RoleDataName.FoBonus, + [BattleRoleElementType.YAO] = RoleDataName.YaoBonus, + [BattleRoleElementType.DAO] = RoleDataName.DaoBonus +} +BattleKangProp = { + [BattleRoleElementType.REN] = RoleDataName.RenReduce, + [BattleRoleElementType.FO] = RoleDataName.FoReduce, + [BattleRoleElementType.YAO] = RoleDataName.YaoReduce, + [BattleRoleElementType.DAO] = RoleDataName.DaoReduce } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 44b8e184a9..f5f2d5b722 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -969,8 +969,11 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i atkRole.Event:DispatchEvent(BattleEventName.PassiveCriting, critFunc,skill) end - -- 公式伤害 = 基础伤害 * 基础伤害系数 * 增伤系数 * 爆伤系数 - local fixDamage = floor(BattleUtil.FP_Mul(baseDamage, baseFactor, addDamageFactor, critDamageFactor)) + -- 计算克制伤害系数 + local MieKangFactor = 1 + atkRole:GetRoleData(BattleMieProp[defRole.element]) - defRole:GetRoleData(BattleKangProp[atkRole.element]) + + -- 公式伤害 = 基础伤害 * 基础伤害系数 * 增伤系数 * 爆伤系数 * 克制伤害系数 + local fixDamage = floor(BattleUtil.FP_Mul(baseDamage, baseFactor, addDamageFactor, critDamageFactor, MieKangFactor)) -- 公式计算完成 local damageFunc = function(damage) fixDamage = damage end From bf5f664fb83b1469b8c4d5e7d7dbe7e3869a8bba Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 17 Nov 2021 17:36:20 +0800 Subject: [PATCH 12/25] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=E5=9B=B0=E9=9A=BE=E5=89=AF=E6=9C=AC=20=E7=A6=81?= =?UTF-8?q?=E7=96=97=E4=B8=8D=E7=AE=97=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/HardStageEventManager.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua index 95afc82fc5..912db073c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua @@ -114,6 +114,9 @@ function this.OnBuffAdd(caster,target,buff) if caster and target and buff then if caster.camp==0 and buff.type==BuffName.Control then local type=buff.ctrlType + if type==4 then + return + end if ctrlNumList[type] then ctrlNumList[type]=ctrlNumList[type]+1 else From d87d9f621ea0305de871f31284e4a49c1fc22bf6 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 17 Nov 2021 18:37:43 +0800 Subject: [PATCH 13/25] =?UTF-8?q?[=E6=88=98=E6=96=97=E8=A1=A8=E7=8E=B0]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=E6=88=98=E6=96=97=E7=95=8C=E9=9D=A2=E5=8D=A1?= =?UTF-8?q?=E7=89=8C=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index e193a69642..f1fa17fb97 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -33131,7 +33131,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1894362187 RectTransform: m_ObjectHideFlags: 0 From 071b7e62de536611217c84b1fd93e09b1e5ccf54 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 18 Nov 2021 11:06:19 +0800 Subject: [PATCH 14/25] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E8=A2=AB=E5=8A=A8362=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 | 48 +++++++++++++++++-- .../Battle/Logic/Misc/BattleDefine.lua | 1 + 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index fa02a54f36..ee568d4e69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -8797,14 +8797,18 @@ local passivityList = { role.Event:AddEvent(BattleEventName.PassiveDamaging, OnPassiveDamaging,nil,nil,role) end, - --处于[a]类型[b]效果的目标,获得御甲时得效果改变[c][d]%,[e](e 1:自身释放) - --a[int buff类型],b[int 具体类型],c[int 改变类型],d[float],e[int] + --处于[a]类型[b]效果的目标,获得御甲时得效果改变[c][d]%,[e](e 1:自身释放),改变概率[f](f不填为100%,a填0:为没有buff限制) + --a[int buff类型],b[int 具体类型],c[int 改变类型],d[float],e[int],f[float] [362]=function(role, args,id,judge) local type1 = args[1] local type2 = args[2] local ct = args[3] local v1 = args[4] local type3 = args[5] + local p1 = args[6] + if not p1 then + p1=1 + end local onPassiveBlood=function(func,trigger,caster,value) if not func then return @@ -8819,10 +8823,14 @@ local passivityList = { if BattleLogic.BuffMgr:HasBuff(trigger, type1, nil) then isPlay=true end + elseif type1==0 then + isPlay=true end if isPlay and func then - local dd = BattleUtil.CountValue(value,v1, ct) - value - func(floor(BattleUtil.ErrorCorrection(dd))) + BattleUtil.RandomAction(p1,function() + local dd = BattleUtil.CountValue(value,v1, ct) - value + func(floor(BattleUtil.ErrorCorrection(dd))) + end) end end BattleLogic.Event:AddEvent(BattleEventName.BloodValuePassiveChange,onPassiveBlood,nil,nil,role) @@ -9635,6 +9643,38 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleTurnStart,onSkillCast,nil,nil,role) end, + --非[a]职业神将[b]怒气时,有[c]概率使目标[d]属性[e]改变[f]%,持续[g]回合 + --a[int],b[int],c[float],d[int],e[int],f[float],g[int] + [388]=function(role,args,id,judge) + local prof = args[1] + local ct1 = args[2] + local pro = args[3] + local p1 = args[4] + local ct2 = args[5] + local v1 = args[6] + local round = args[7] + local onRageChange = function(caster, target, deltaRage, countType, value) + if caster~=role then + return + end + + if countType~=ct1 then + return + end + if target.camp~=role.camp then + return + end + if prof~=0 and caster.job==prof then + return + end + + BattleUtil.RandomAction(pro,function() + target:AddBuff(Buff.Create(role, BuffName.PropertyChange,round, BattlePropList[p1],v1, ct2)) + end) + + end + BattleLogic.Event:AddEvent(BattleEventName.RecordRageChange, onRageChange,nil,nil,role) + end, } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 0bcafc3cf2..9ffb438f61 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -183,6 +183,7 @@ BattleEventName = { TemporaryChangeCrit = indexAdd(),--临时改变暴击率 RoleAddCtrlBuff = indexAdd(),--角色添加控制类buff CastRageBrfore = indexAdd(),--扣除怒气之前 + PassiveAddCritDamageFactor = indexAdd(), --被动增加爆伤系数 } BattleMaxFrame = 1000000 From ad0e84485226523b6d62a2bd33a28d069b2c3224 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 18 Nov 2021 15:44:16 +0800 Subject: [PATCH 15/25] =?UTF-8?q?[=E6=88=98=E4=B8=AD=E8=A1=A8=E7=8E=B0]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E6=88=91=E6=96=B9=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=AB=8B=E7=BB=98=E5=A4=A7=E5=B0=8F=E8=AF=BB=E5=8F=96=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index f0fe3fb7d4..c4fb88c900 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -101,7 +101,7 @@ function PlayerView:onCreate(go, role, position, root) --self.RootPanel.PlayerPanel, "live_"..position self.RoleLiveGO.transform:SetParent(Util.GetTransform(self.RootPanel.PlayerPanel, "live_"..position)) self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5 - self.RoleLiveGO.transform.localScale = Vector3.one * self.enemy_liveScale + self.RoleLiveGO.transform.localScale = Vector3.one * self.play_liveScale self.RoleLiveGO:SetActive(true) @@ -121,7 +121,7 @@ function PlayerView:onCreate(go, role, position, root) -- casting技能立绘 self.RoleLiveGO2 = poolManager:LoadLive(self.livePath, go.transform.parent, Vector3.one, Vector3.zero) self.RoleLiveGO2.transform:SetParent(self.RootPanel.mySkillCastRoot.transform) - self.RoleLiveGO2.transform.localScale = Vector3.one * self.enemy_liveScale -- * 0.75--* 1.5 + self.RoleLiveGO2.transform.localScale = Vector3.one * self.play_liveScale -- * 0.75--* 1.5 self.RoleLiveGO2.transform.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2] - 300) self.RoleLiveGO2:SetActive(false) self.RoleLiveGOGraphic2 = self.RoleLiveGO2:GetComponent("SkeletonGraphic") From e705049135725cc28cf80e18cbcd505de89f6df1 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 18 Nov 2021 16:02:16 +0800 Subject: [PATCH 16/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D362=E4=BF=AE=E6=94=B9=20=20=E5=A1=AB=E5=8A=A0?= =?UTF-8?q?388-391=E8=A2=AB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 90 +++++++++++++++++++ .../Battle/Logic/Misc/BattleDefine.lua | 1 + .../Modules/Battle/Logic/Misc/BattleUtil.lua | 28 ++++-- .../Modules/Battle/Logic/Role/RoleLogic.lua | 32 ++++--- 4 files changed, 131 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 4a67091a27..a3db20f4f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -9635,7 +9635,97 @@ local passivityList = { end BattleLogic.Event:AddEvent(BattleEventName.RecordRageChange, onRageChange,nil,nil,role) end, + --暴击时[a]%概率使爆伤改变[b][c]% + --a[float],b[int],c[float] + [389]=function(role,args,id,judge) + local pro=args[1] + local ct = args[2] + local v1 = args[3] + local addCritDamageFa=function(func) + BattleUtil.RandomAction(pro,function() + if func then + func(v1,ct) + end + end) + end + role.Event:AddEvent(BattleEventName.PassiveAddCritDamageFactor,addCritDamageFa,nil,nil,role) + end, + --释放技能时[a]%概率 改变[b]无视目标的[c]buff免疫 + --a[float],b[int],c[int] + [390]=function(role,args,id,judge) + local pro=args[1] + local ct = args[2] + local v1 = args[3] + local addCritDamageFa=function(func,buff) + + if buff and buff.type~=v1 then + return + end + if func then + func(pro,ct) + end + end + + local OnSkillCast = function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill then + role.Event:AddEvent(BattleEventName.PassiveChangeIgnoreImmuneValue,addCritDamageFa,nil,nil,role) + end + end + local OnSkillCastEnd = function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill then + role.Event:RemoveEvent(BattleEventName.PassiveChangeIgnoreImmuneValue,addCritDamageFa,nil,nil,role) + end + end + role.Event:AddEvent(BattleEventName.SkillCast, OnSkillCast,nil,nil,role) + role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd,nil,nil,role) + end, + + --释放技能时[a]%概率 清除目标一个减异效果 + --a[float] + [391]=function(role,args,id,judge) + local pro=args[1] + local onRoleTreat=function(targetRole, treat, baseTreat,skill) + if not skill then + return + end + BattleUtil.RandomAction(pro, function() + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.caster.camp~=targetRole.camp and buff.target==targetRole end) + local len=BattleUtil.LengthOfTable(list) + if list and len>0 then + local index=Random.RangeInt(1,len) + BattleLogic.BuffMgr:ClearBuff(targetRole, function (buff) + return buff==list[index] + end) + end + end) + end + + local OnSkillCast = function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill then + role.Event:AddEvent(BattleEventName.RoleTreat,onRoleTreat,nil,nil,role) + end + end + local OnSkillCastEnd = function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra or skill.type==BattleSkillType.DeadSkill then + role.Event:RemoveEvent(BattleEventName.RoleTreat,onRoleTreat,nil,nil,role) + end + end + role.Event:AddEvent(BattleEventName.SkillCast, OnSkillCast,nil,nil,role) + role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd,nil,nil,role) + end, } return passivityList \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index cfc14b2bd0..51a10a37a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -184,6 +184,7 @@ BattleEventName = { RoleAddCtrlBuff = indexAdd(),--角色添加控制类buff CastRageBrfore = indexAdd(),--扣除怒气之前 PassiveAddCritDamageFactor = indexAdd(), --被动增加爆伤系数 + PassiveChangeIgnoreImmuneValue = indexAdd(),--被动修改无视 } BattleMaxFrame = 1000000 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 389fcb7613..88f1941739 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -979,12 +979,22 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i defRole.Event:DispatchEvent(BattleEventName.CritDamageReduceFactor, onCritDamageReduceFactor, atkRole, defRole) BattleLogic.Event:DispatchEvent(BattleEventName.CritDamageReduceFactor, onCritDamageReduceFactor, atkRole, defRole) critDamageReduceFactor = max(BattleUtil.CountChangeList(critDamageReduceFactor, cl), 0) - - -- 计算额外暴击伤害 - critDamageFactor = 1.3 + atkRole:GetRoleData(RoleDataName.CritDamageBonus) - defRole:GetRoleData(RoleDataName.CritDamageReduce) - critDamageReduceFactor + + local critDamageAddFactor=0 --加入被动效果 触发暴击被动 - local critFunc = function(critEx) critDamageFactor = critEx end - atkRole.Event:DispatchEvent(BattleEventName.PassiveCriting, critFunc,skill) + local cl2 = {} + local onCritDamageAddFactor = function(v, ct) + if v then + table.insert(cl2, {v, ct}) + end + end + atkRole.Event:DispatchEvent(BattleEventName.PassiveAddCritDamageFactor, onCritDamageAddFactor, atkRole, defRole) + critDamageAddFactor = max(BattleUtil.CountChangeList(critDamageAddFactor, cl2), 0) + -- 计算额外暴击伤害 + critDamageFactor = 1.3 + atkRole:GetRoleData(RoleDataName.CritDamageBonus) - defRole:GetRoleData(RoleDataName.CritDamageReduce)+critDamageAddFactor - critDamageReduceFactor + --加入被动效果 触发暴击被动 废弃不用 + -- local critFunc = function(critEx) critDamageFactor = critEx end + -- atkRole.Event:DispatchEvent(BattleEventName.PassiveCriting, critFunc,skill) end -- 计算克制伤害系数 @@ -1066,8 +1076,8 @@ function BattleUtil.FinalTreat(castRole, targetRole, value, baseFactor,skill) targetRole.data:AddValue(RoleDataName.Hp, treat) end - castRole.Event:DispatchEvent(BattleEventName.RoleTreat, targetRole, treat, baseTreat) - targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, treat, baseTreat) + castRole.Event:DispatchEvent(BattleEventName.RoleTreat, targetRole, treat, baseTreat,skill) + targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, treat, baseTreat,skill) --添加发送到battleLogic的治疗消息,用于计算总的战斗伤害值 BattleLogic.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, treat, baseTreat) -- 战斗记录用 @@ -1131,8 +1141,8 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag if treat > 0 then targetRole.data:AddValue(RoleDataName.Hp, treat) end - castRole.Event:DispatchEvent(BattleEventName.RoleTreat, targetRole, treat, baseTreat) - targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, treat, baseTreat) + castRole.Event:DispatchEvent(BattleEventName.RoleTreat, targetRole, treat, baseTreat,skill) + targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, treat, baseTreat,skill) --添加发送到battleLogic的治疗消息,用于计算总的战斗伤害值 BattleLogic.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, treat, baseTreat) -- 战斗记录用 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 142674f7df..e9b2f74337 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -346,17 +346,27 @@ function RoleLogic:AddBuff(buff) "missF", missF) -- 如果概率为0 或者没有miss if missF == 0 or not BattleUtil.RandomAction(missF, function() BattleLogic.BuffMgr:PutBuff(buff) end) then - for i=1, self.buffFilter.size do - if self.buffFilter.buffer[i](buff,self) then - BattleLogManager.Log( - "Buff Filter", - "camp", buff.caster.camp, - "position", buff.caster.position, - "id", buff.id, - "type", buff.type) - BattleLogic.BuffMgr:PutBuff(buff) - BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddBuffFail,buff,self) - return + + --概率忽略免疫 + local ignoreProb=0 + local changeIgnore=function(v1,ct) + ignoreProb=BattleUtil.CountValue(ignoreProb,v1,ct) + end + buff.caster.Event:DispatchEvent(BattleEventName.PassiveChangeIgnoreImmuneValue,changeIgnore,buff) + local isIgnor=BattleUtil.RandomAction(ignoreProb,function()end) + if not isIgnor then + for i=1, self.buffFilter.size do + if self.buffFilter.buffer[i](buff,self) then + BattleLogManager.Log( + "Buff Filter", + "camp", buff.caster.camp, + "position", buff.caster.position, + "id", buff.id, + "type", buff.type) + BattleLogic.BuffMgr:PutBuff(buff) + BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddBuffFail,buff,self) + return + end end end BattleLogic.BuffMgr:AddBuff(self, buff) From 77c3376d826bb53c52aaf636d348945cd10efa96 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Nov 2021 16:03:34 +0800 Subject: [PATCH 17/25] =?UTF-8?q?=E3=80=90=E5=9D=90=E9=AA=91=E7=A2=8E?= =?UTF-8?q?=E7=89=87=E5=90=88=E6=88=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 1 + .../Modules/Bag/BagResolveAnCompoundPanel.lua | 20 ++++--- .../Popup/RewardItemSingleShowPopup.lua | 56 ++++++++++++++++++- 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index feee310805..31e3205d2b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1031,6 +1031,7 @@ ItemType = { heroDogFood =25,--英雄狗粮 linglongbaojingkaimen = 26, likeabilityItem = 27, + ZuoQiChip = 28, -- 坐骑碎片 } JumpType = { Lottery = 1, --招募 diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index 32c4fcbc88..0a7e5b4fc4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -133,7 +133,8 @@ function BagResolveAnCompoundPanel:BindEvent() end end) Util.AddClick(this.btnCompound, function() - if itemData.itemConfig.ItemType==ItemType.HeroDebris then--碎片 + if itemData.itemConfig.ItemType==ItemType.HeroDebris + or itemData.itemConfig.ItemType==ItemType.ZuoQiChip then--碎片 if compoundNum>0 then local item={} item.itemId=itemData.id @@ -292,7 +293,8 @@ function this.OnShowLayout3Data() this.chipFrame:SetActive(false) this.propertyIma:SetActive(false) local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) - if itemData.itemConfig.ItemType==ItemType.HeroDebris then--碎片 + if itemData.itemConfig.ItemType==ItemType.HeroDebris + or itemData.itemConfig.ItemType==ItemType.ZuoQiChip then--碎片 this.chipFrame:SetActive(true) this.chipFrame:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroChipQuantityImageByquality(itemData.itemConfig.Quantity)) if itemData.itemConfig.PropertyName and itemData.itemConfig.PropertyName > 0 then @@ -305,12 +307,13 @@ function this.OnShowLayout3Data() this.nameText.text=Language[10192] this.btnCompoundText.text=Language[10193] local maxCompoundValue = math.floor(itemData.num/itemData.itemConfig.UsePerCount) - compoundMaxNum=maxCompoundValue > gameSetting.HeroCompoundLimit and gameSetting.HeroCompoundLimit or maxCompoundValue - endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) - compoundMaxNum=compoundMaxNum >endHeroNum and endHeroNum or compoundMaxNum - if compoundMaxNum > compoundMaxNum then - compoundMaxNum = compoundMaxNum + -- + if itemData.itemConfig.ItemType==ItemType.HeroDebris then -- 神将碎片 + compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit, gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())) + elseif itemData.itemConfig.ItemType==ItemType.ZuoQiChip then -- 坐骑碎片 + compoundMaxNum = math.min(maxCompoundValue, gameSetting.HeroCompoundLimit) end + elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱 this.nameText.text=Language[10194] this.btnCompoundText.text=Language[10195] @@ -448,7 +451,8 @@ function this.ShowCompoundNumData(value) compoundNum=value this.Slider:GetComponent("Slider").value=value this.numText1.text = value - if itemData.itemConfig.ItemType==ItemType.HeroDebris then--碎片 + if itemData.itemConfig.ItemType==ItemType.HeroDebris + or itemData.itemConfig.ItemType==ItemType.ZuoQiChip then--碎片 this.numText.text= Language[10198]..value*itemData.itemConfig.UsePerCount..Language[10199]..value..Language[10200].. string.gsub(GetLanguageStrById(itemData.itemConfig.Name),Language[10201],"") elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱 this.numText.text= Language[10202]..value..Language[10200]..GetLanguageStrById(itemData.itemConfig.Name).."。" diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 0e6dec6aa1..795ae5a5a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -150,6 +150,57 @@ function RewardItemSingleShowPopup:BindEvent() self:ClosePanel() end) end,Language[10731],Language[10732],Language[11511],false,"") + elseif itemConfigData.ItemType == ItemType.ZuoQiChip then + -- local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) + -- local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) + local sum = BagManager.GetItemCountById(itemSid) / BagManager.bagDatas[itemSid].itemConfig.UsePerCount + sum = math.floor(sum) + if sum >= 2 then + local _itemData = BagManager.bagDatas[itemSid] + UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() + func() + end) + elseif sum >= 1 then + local _itemData = BagManager.bagDatas[itemSid] + local item={} + item.itemId= _itemData.id + item.itemNum= sum * _itemData.itemConfig.UsePerCount + NetManager.HeroComposeRequest(item,function (drop) + this.SendBackCompoundReCallBack(drop) + end) + else + PopupTipPanel.ShowTip(Language[11509]) + end + + -- if sum >= 2 then + -- local _itemData = BagManager.bagDatas[itemSid] + -- if endHeroNum > 0 then + -- UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() + -- func() + -- end) + -- else + -- PopupTipPanel.ShowTip(Language[12157]) + -- end + -- elseif sum >= 1 and sum < 2 then + -- -- body + -- local compoundNum = 1 + -- local _itemData = BagManager.bagDatas[itemSid] + -- local item={} + -- item.itemId= _itemData.id + -- item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount + -- if endHeroNum > 0 then + -- NetManager.HeroComposeRequest(item,function (drop) + -- this.SendBackCompoundReCallBack(drop) + -- end) + -- if compoundNum<=0 then + -- PopupTipPanel.ShowTip(Language[10183]) + -- end + -- else + -- PopupTipPanel.ShowTip(Language[12157]) + -- end + -- else + -- PopupTipPanel.ShowTip(Language[11509]) + -- end else local _itemData = BagManager.bagDatas[itemSid] UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() @@ -312,7 +363,10 @@ function RewardItemSingleShowPopup:OnShow() elseif isBagPanel and itemConfigData.IfResolve == 1 and func then--是否可分解 this.btnSure:SetActive(true) this.btnSureText.text = Language[10197] - elseif isBagPanel and itemConfigData.ItemType == 2 and func then--是否是碎片可合成 + elseif isBagPanel and func --是否是碎片可合成 + and (itemConfigData.ItemType == ItemType.HeroDebris + or itemConfigData.ItemType == ItemType.ZuoQiChip) + then this.btnSureText.text = Language[10193] this.btnSure:SetActive(true) elseif isBagPanel and itemConfigData.ItemType == 10 and func then--是否宝箱可使用 From cd291429f1d6f2a737c1b7248841c80e7814c271 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Nov 2021 16:05:26 +0800 Subject: [PATCH 18/25] =?UTF-8?q?=E3=80=90=E5=9D=90=E9=AA=91=E7=A2=8E?= =?UTF-8?q?=E7=89=87=E5=90=88=E6=88=90=E3=80=91=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardItemSingleShowPopup.lua | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 795ae5a5a0..d2998aaddb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -151,8 +151,6 @@ function RewardItemSingleShowPopup:BindEvent() end) end,Language[10731],Language[10732],Language[11511],false,"") elseif itemConfigData.ItemType == ItemType.ZuoQiChip then - -- local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) - -- local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) local sum = BagManager.GetItemCountById(itemSid) / BagManager.bagDatas[itemSid].itemConfig.UsePerCount sum = math.floor(sum) if sum >= 2 then @@ -171,36 +169,6 @@ function RewardItemSingleShowPopup:BindEvent() else PopupTipPanel.ShowTip(Language[11509]) end - - -- if sum >= 2 then - -- local _itemData = BagManager.bagDatas[itemSid] - -- if endHeroNum > 0 then - -- UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() - -- func() - -- end) - -- else - -- PopupTipPanel.ShowTip(Language[12157]) - -- end - -- elseif sum >= 1 and sum < 2 then - -- -- body - -- local compoundNum = 1 - -- local _itemData = BagManager.bagDatas[itemSid] - -- local item={} - -- item.itemId= _itemData.id - -- item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount - -- if endHeroNum > 0 then - -- NetManager.HeroComposeRequest(item,function (drop) - -- this.SendBackCompoundReCallBack(drop) - -- end) - -- if compoundNum<=0 then - -- PopupTipPanel.ShowTip(Language[10183]) - -- end - -- else - -- PopupTipPanel.ShowTip(Language[12157]) - -- end - -- else - -- PopupTipPanel.ShowTip(Language[11509]) - -- end else local _itemData = BagManager.bagDatas[itemSid] UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() From 670320141cd28ee6a292c9e5b9c9da9c3e13fff3 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 18 Nov 2021 17:17:53 +0800 Subject: [PATCH 19/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=80=92=E6=B0=94=E5=92=8C=E7=88=86=E4=BC=A4?= =?UTF-8?q?=E5=87=8F=E5=85=8D=E7=9A=84=E9=A1=BA=E5=BA=8F=E4=BA=A4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 4 ++-- .../~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index c681b7ae94..155151c37b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -644,8 +644,8 @@ function this.GetMonsterPros(id, lv, star) table.insert(allProVal, 22, proList[HeroProType.FoReduce] or 0) -- 抗佛 table.insert(allProVal, 23, proList[HeroProType.YaoReduce] or 0) -- 抗妖 table.insert(allProVal, 24, proList[HeroProType.DaoReduce] or 0) -- 抗道 - table.insert(allProVal, 25, proList[HeroProType.InitRage] or 0) -- 初始怒气 - table.insert(allProVal, 26, proList[HeroProType.AntiCritDamageFactor] or 0) -- 爆伤减免 + table.insert(allProVal, 25, proList[HeroProType.AntiCritDamageFactor] or 0) -- 爆伤减免 + table.insert(allProVal, 26, proList[HeroProType.InitRage] or 0) -- 初始怒气 local pros = table.concat(allProVal, "#") return pros end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 51a10a37a2..507b2e3d61 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -216,8 +216,8 @@ RoleDataName = { FoReduce = indexAdd(), --佛系伤害减免 YaoReduce = indexAdd(), --妖系伤害减免 DaoReduce = indexAdd(), --道系伤害减免 - InitRage = indexAdd(), --初始怒气值 CritDamageReduce = indexAdd(), --暴击伤害减免 + InitRage = indexAdd(), --初始怒气值 } -- 战斗表属性id对应战斗中属性数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index a5595afef8..bb4c28c090 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2213,10 +2213,10 @@ function this.CalculateWarAllProVal(heroDid) table.insert(allProVal, 23, allEquipAddProVal[HeroProType.YaoReduce]) -- 道系伤害减免 table.insert(allProVal, 24, allEquipAddProVal[HeroProType.DaoReduce]) - -- 怒气 - table.insert(allProVal, 25, allEquipAddProVal[HeroProType.InitRage]) -- 爆伤减免 - table.insert(allProVal, 26, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) + table.insert(allProVal, 25, allEquipAddProVal[HeroProType.AntiCritDamageFactor]) + -- 怒气 + table.insert(allProVal, 26, allEquipAddProVal[HeroProType.InitRage]) return allProVal end From b74561d70b4910c6d9821cb5ac7eca040959bca7 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 18 Nov 2021 18:29:13 +0800 Subject: [PATCH 20/25] =?UTF-8?q?[=E6=88=98=E6=96=97=E8=A1=A8=E7=8E=B0]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=95=8C=E6=88=91?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E6=8E=92=E7=AB=8B=E7=BB=98=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 2 +- .../~Lua/Modules/Battle/View/Unit/EnemyView.lua | 3 ++- .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index f1fa17fb97..a8700be160 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -157759,7 +157759,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -20, y: 206} + m_AnchoredPosition: {x: -20, y: 161} m_SizeDelta: {x: 1100, y: 202.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4929751347603845043 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 3ed0e19415..27ed58902c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -289,7 +289,8 @@ function EnemyView:DoScale(scale, dur, func) if self.dsTween2 then self.dsTween2:Kill() end - local liveScale = self.role.position <= 3 and 0.6 or 0.5 + --local liveScale = self.role.position <= 3 and 0.6 or 0.5 + local liveScale=0.6 self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index c4fb88c900..cf97bd211b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -151,7 +151,7 @@ function PlayerView:onCreate(go, role, position, root) self.rageText.text = "" self.lvHpObj=Util.GetGameObject(go, "lvObj") if position<=3 then - self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,450,0) + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,470,0) else self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,0,0) end @@ -313,7 +313,8 @@ function PlayerView:DoScale(scale, dur, func) if self.dsTween2 then self.dsTween2:Kill() end - local liveScale = self.role.position <= 3 and 0.6 or 0.5 + --local liveScale = self.role.position <= 3 and 0.6 or 0.5 + local liveScale = 0.6 self.dsTween2 = self.RoleLiveGO.transform.parent:DOScale(Vector3.one * liveScale * scale, dur) end From 45bc2139a68814d87210c6c8a5b48624556da29b Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 18 Nov 2021 18:37:14 +0800 Subject: [PATCH 21/25] =?UTF-8?q?[=E6=88=98=E6=96=97=E8=A1=A8=E7=8E=B0]=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=E6=88=91=E6=96=B9=E5=89=8D=E6=8E=92?= =?UTF-8?q?=E8=A1=80=E6=9D=A1=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab | 6 +++--- .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index a8700be160..2f8fe81e54 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -79894,7 +79894,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: -86.19996, y: 259} + m_AnchoredPosition: {x: -86.19996, y: 265.7803} m_SizeDelta: {x: 44, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7683721027093544007 @@ -178724,7 +178724,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: 11.0000725, y: 266.6198} + m_AnchoredPosition: {x: 11.0000725, y: 273.40012} m_SizeDelta: {x: 116, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6792614551820874869 @@ -236798,7 +236798,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: 10.980068, y: 248.21973} + m_AnchoredPosition: {x: 10.980068, y: 255} m_SizeDelta: {x: 115.64, y: 12} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7147047745219255636 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index cf97bd211b..cf51dd608a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -151,7 +151,7 @@ function PlayerView:onCreate(go, role, position, root) self.rageText.text = "" self.lvHpObj=Util.GetGameObject(go, "lvObj") if position<=3 then - self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,470,0) + self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,485,0) else self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,0,0) end From fc82b7bbc7f7c5282dd8ae72d43002f532d4f36d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 19 Nov 2021 10:00:04 +0800 Subject: [PATCH 22/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D323=20=20=20258=20=20112=20=E8=A2=AB=E5=8A=A8?= =?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 | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index a3db20f4f5..158c5ed2e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2030,24 +2030,27 @@ local passivityList = { target.isFlagCrit = false role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter) end - local function onRoleDamageBefore(target, factorFunc, damageType, skill) + role.Event:AddEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter,nil,nil,role) + local function onRoleDamageBefore(critFunc,atkRole,defRole,skill) + if atkRole~=role then + return + end if not skill then return end if skill and not skill.isTriggerJudge and judge==1 then return end - --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing - if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then - return - end + local curRound=BattleLogic.GetCurRound() + LogError("currround=="..curRound.." il=="..i1.." type=="..type) if (curRound== i1 and type==0) or (curRound<=i1 and type==1) then - target.isFlagCrit = true - role.Event:AddEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter,nil,nil,role) + LogError("1111111111") + defRole.isFlagCrit = true + end end - role.Event:AddEvent(BattleEventName.RoleDamageBefore, onRoleDamageBefore,nil,nil,role) + BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit, onRoleDamageBefore,nil,nil,role) end, @@ -5666,9 +5669,9 @@ local passivityList = { if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then return end - if (f1==12 or f1==13) and p1 and p2 then - local levelDamage = floor(role:GetRoleData(RoleDataName.MaxHp)*p1) - local lostDamage = role:GetRoleData(RoleDataName.MaxHp) - role:GetRoleData(RoleDataName.Hp) + if (f1==12 or f1==13) and p1 and p2 and p1~=0 and p2~=0 then + local levelDamage = floor(defRole:GetRoleData(RoleDataName.MaxHp)*p1) + local lostDamage = defRole:GetRoleData(RoleDataName.MaxHp) - defRole:GetRoleData(RoleDataName.Hp) local level = floor(lostDamage/levelDamage) dt=dt+(level*p2) end @@ -5680,6 +5683,7 @@ local passivityList = { func(val) end end + dt=args[2] end end role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) @@ -7586,6 +7590,7 @@ local passivityList = { if not type then type=0 end + local ctrs={} local onRoleBeDamage=function (defRole, atkRole, damage, bCrit, finalDmg, damageType, dotType, skill) if atkRole and atkRole~=role then return @@ -7605,11 +7610,16 @@ local passivityList = { isTrigger=true end - if isTrigger then + if isTrigger and not ctrs[defRole.position] then BattleUtil.RandomControl(p1,ct,role,defRole,round) + ctrs[defRole.position]=1 end end BattleLogic.Event:AddEvent(BattleEventName.RoleBeDamaged,onRoleBeDamage,nil,nil,role) + local onSkillCastEnd=function() + ctrs={} + end + role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,role) end, --释放技能怒气不足时,损失自身([a]-我方活着的[b]系神将数)%生命*不足怒气数 后释放技能 --a[int],b[int] @@ -9651,7 +9661,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.PassiveAddCritDamageFactor,addCritDamageFa,nil,nil,role) end, - --释放技能时[a]%概率 改变[b]无视目标的[c]buff免疫 + --释放技能时[a]%概率 改变[b]自身无视目标的[c]类型buff的免疫概率 --a[float],b[int],c[int] [390]=function(role,args,id,judge) local pro=args[1] From 9830c04a4b58f60fab13c6de02810db0d7e9e251 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 19 Nov 2021 11:18:15 +0800 Subject: [PATCH 23/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E5=BE=A1=E7=94=B2=E5=A2=9E=E5=8A=A0=E8=A1=A8?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/BattleManager.lua | 2 + .../Modules/Battle/Logic/Base/Passivity.lua | 41 +++---------------- .../Battle/Logic/Misc/BattleDefine.lua | 1 + .../Modules/Battle/Logic/Misc/BattleUtil.lua | 13 ++++++ 4 files changed, 22 insertions(+), 35 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 155151c37b..ad00846b42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -1070,6 +1070,8 @@ function this.GetArtFontConfig(_ArtFontType) return "z_zhandou_podun_zh" elseif _ArtFontType == BattleArtFontType.clear then return "z_zhandou_qingchu_zh" + elseif _ArtFontType == BattleArtFontType.Blood then + return "z_zhandou_jinjia_zh" end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 158c5ed2e3..b937d17892 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -8072,13 +8072,8 @@ local passivityList = { end local rDamage =floor(f1 * damage) - if not role.isBanBlood then - if role.bloodShield then - role.bloodShield:AddValue(rDamage) - else - role:AddBuff(Buff.Create(role, BuffName.Blood,0, rDamage)) - end - end + BattleUtil.AddBlood(role,rDamage) + end role.Event:AddEvent(BattleEventName.RoleBeHit, onBeHit,nil,nil,role) end, @@ -8428,13 +8423,7 @@ local passivityList = { local onRoundChange=function(curRound) local val = floor(BattleUtil.FP_Mul(v1, role:GetRoleData(BattlePropList[pro]))) --如果身上有御甲就添加御甲的值 - if not role.isBanBlood then - if role.bloodShield then - role.bloodShield:AddValue(val) - else--没有就上御甲buff - role:AddBuff(Buff.Create(role, BuffName.Blood,0, val)) - end - end + BattleUtil.AddBlood(role,val) end role.Event:AddEvent(BattleEventName.RoleTurnStart, onRoundChange,nil,nil,role) @@ -8532,13 +8521,7 @@ local passivityList = { end local val = floor(BattleUtil.FP_Mul(v1, role:GetRoleData(BattlePropList[pro]))) --如果身上有御甲就添加御甲的值 - if not role.isBanBlood then - if role.bloodShield then - role.bloodShield:AddValue(val) - else--没有就上御甲buff - role:AddBuff(Buff.Create(role, BuffName.Blood,0, val)) - end - end + BattleUtil.AddBlood(role,val) time=time+1 end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundStart,onRoundStart,nil,nil,role) @@ -8826,13 +8809,7 @@ local passivityList = { if list then local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1)) for _, r in ipairs(list) do - if not r.isBanBlood then - if r.bloodShield then - r.bloodShield:AddValue(tv) - else - r:AddBuff(Buff.Create(role, BuffName.Blood,0,tv)) - end - end + BattleUtil.AddBlood(r,tv) end end end @@ -9172,13 +9149,7 @@ local passivityList = { if skill.type == BattleSkillType.Special then role.Event:RemoveEvent(BattleEventName.RoleHit, OnHit) local value=floor(BattleUtil.ErrorCorrection(allDamage*f1)) - if not role.isBanBlood then - if role.bloodShield then - role.bloodShield:AddValue(value) - else - role:AddBuff(Buff.Create(role, BuffName.Blood,0,value)) - end - end + BattleUtil.AddBlood(role,value) -- 清空伤害记录 allDamage = 0 end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 507b2e3d61..998eda5b2c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -363,6 +363,7 @@ BattleArtFontType = { Immune = 1, -- 免疫文字 Shield = 2, --破盾文字 clear = 3, --清除文字 + Blood = 4, --禁甲文字 } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 88f1941739..d47deb06a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -1175,6 +1175,19 @@ function BattleUtil.CheckIsHit(atkRole, defRole,skill) end +function BattleUtil.AddBlood(target,value) + if not target.isBanBlood then + if target.bloodShield then + target.bloodShield:AddValue(value) + else + target:AddBuff(Buff.Create(target, BuffName.Blood,0,value)) + end + else + target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Blood) + end +end + + --获取table的长度 function BattleUtil.LengthOfTable(table) if not table then From 3d4211740c0b90fcd0f570dd9454bca1a9e2feda Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 19 Nov 2021 11:19:18 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E8=A1=A8?= =?UTF-8?q?=E7=8E=B0=E3=80=91=3D=3D=3D=3D=3D=3D=3D=3D=3D=E6=88=91=E6=96=B9?= =?UTF-8?q?=E6=88=98=E4=B8=AD=E7=AB=8B=E7=BB=98=E7=BC=A9=E6=94=BE=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/Unit/PlayerView.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index cf51dd608a..3a73fca7a7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -101,7 +101,7 @@ function PlayerView:onCreate(go, role, position, root) --self.RootPanel.PlayerPanel, "live_"..position self.RoleLiveGO.transform:SetParent(Util.GetTransform(self.RootPanel.PlayerPanel, "live_"..position)) self.RoleLiveGO:GetComponent("RectTransform").anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2])-- * 0.5 - self.RoleLiveGO.transform.localScale = Vector3.one * self.play_liveScale + self.RoleLiveGO.transform.localScale = Vector3.one * self.enemy_liveScale self.RoleLiveGO:SetActive(true) @@ -121,7 +121,7 @@ function PlayerView:onCreate(go, role, position, root) -- casting技能立绘 self.RoleLiveGO2 = poolManager:LoadLive(self.livePath, go.transform.parent, Vector3.one, Vector3.zero) self.RoleLiveGO2.transform:SetParent(self.RootPanel.mySkillCastRoot.transform) - self.RoleLiveGO2.transform.localScale = Vector3.one * self.play_liveScale -- * 0.75--* 1.5 + self.RoleLiveGO2.transform.localScale = Vector3.one * self.enemy_liveScale -- * 0.75--* 1.5 self.RoleLiveGO2.transform.anchoredPosition = Vector2.New(self.outOffset[1], self.outOffset[2] - 300) self.RoleLiveGO2:SetActive(false) self.RoleLiveGOGraphic2 = self.RoleLiveGO2:GetComponent("SkeletonGraphic") From 1a623036fa6c8dd15d5c1e77abab61d1b7153c03 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 19 Nov 2021 11:30:42 +0800 Subject: [PATCH 25/25] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E7=A6=81=E7=94=B2=E5=9B=BE=E7=89=87=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/z_zhandou_jinjia_zh.png | Bin 0 -> 5308 bytes .../ArtFont/z_zhandou_jinjia_zh.png.meta | 110 ++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_jinjia_zh.png create mode 100644 Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_jinjia_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_jinjia_zh.png b/Assets/ManagedResources/Atlas/FloatingViewAtlas/ArtFont/z_zhandou_jinjia_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..82591cbd10fab4404a2d89213d4288e731eb1f27 GIT binary patch literal 5308 zcmV;t6hrHYP)5GyP2SAb@!$l#@f0%76gdd3_mVcY_oFFN^BE3Sf&8t$P*N>j2*9L-}bYbV6Tg zKGH``n-3rjfR_nnO&w%+136)F$Y(9gNpXfbeRFd0_C7r~Iz3@A_x~5M@_n3JTZE6! z|AV`oc5?A{Re?pPC&U_~S=>~KcYfVQ(==IN(dh}M3X5QwiJE>l;Mu5{A2t8%8?~mn}yG*2ib?W=e@>QB$Ra z=JfQ02=f1l#oM!0c#h(P733UWpSj9s9fED8wVfolO454uMAbgRx58AeB zj_`-kciQzffI>(FX6TE^5W)R3!7W&^t|FEi?#3cS}(H9bRkJ+=5ry1!Pp-8i( zvyHy3pPrsT60C7YDD5o$9Wqt?a z2&tF$a&02Ah#Eo{>gm-KlZ6FJ!{jdVM>;cc{G&*nxgK#NqfMe2$c{cGnl#+3U9m3w zDQuYZES85Xq_d`yCBn?Te~M2V7a{PT=BrLv2=T;2~DEGfcSkcL~z2I z&yO{QQS_VdCt=6BY< zM1wf3zj3Xh497~(;f3*!4ha3SmTDxQOrcG%Gk_apnjkmd&EEoRbIqU=5(gRnnKhwA z!&uaF4QuVv4M@YtJVEBSfg0sxexMqgf9SDK>*wr$(TPjYm{}@5`*dXBA~ zIbs?ndxj|Hi@a;%?RG(B9hS)n>~d}K9fL1|x1F0&&1>)OU{>&AT&^o&ghgLO|cm$5!I*0AKyCvmfhEHY6^wj|&9slN(7xDV3Pf@EAn85dl8QeGj zBP~UfpTle{tQ4PhqoG`!^uOYS@L{2}n@h?m;YMRQ{2janxgNI8ST$iW@@ooFtEl4#_ zZR+!Q>(o|;CW{Xj{jg>wfTZ1zY(6B|1#lj&_&kzM4=6eKIeM$|OY#AA8X9v8RUVX} zXcCwFxQ@j9d5>Xv$RY&0jOvrw`ux&9Bu!inCymhkt!%AfI(ClVOhkK!NodLmg#%e5 z#rRB+q^G}B6 z;=ou*o!put{BrA@BF(f5yO?#BT%M(w1rkFS;f2tr;cVqhH*Fa`hiS|-cWr`ykE>d^ zXjc&!3|M;bKcd-*mRS&yhQB;viNuR(>+Zlu=f6fN=YEwC(u^(Ad$4 zWx;b{$(V)S^5v~HNW1V20-Z*v()_C6u&ReO%_j_hjai3hLLR4^$FIYN**XvEps$(@ z69{bC!6bpOoUELXJo!0hO==9kn9-y*jIQ(a$qWk;o z_Z0Kw+9Sq-fZ4Kqb7*EaeObt^!_qimIa)bk?Zg#uvvr0Z2L8&gE5=`c+b$3mDNC23 zuhQn*0w!JzUnZd0s_(%5>&Imqr$qBsbCsanf$N8HPFo--b51I(Q*7{*fkB17-o#@_ zYV}*X+l|(@ve2l~;H($H=d<6Hti$-zPmUT#tbO3$B_`|G&0n#*;Csn~z3n_v+$f0* zFlg-(GXCAwV|X%XHZ$Q@wbtR=g2TwKxh$zS!hVDz&1#t~k56-U;4f2N!bp2hoYxj& z>-n8@_Ni^N-i~_y=MC$7>3b@g#Kw*m*>oDDkJL=6DF>PEEGtYi%i?n8tjZCQhBS0E z;A~|c;(RAF`$bi4b=X~S7?*40qt~Rv(7!u-HE{39=&&OenF|5lXP{25ftI9V=GIGPs!RvfuaJn~vB z7or;N5};~QOPVU^+qks&w~n$jcC)9S;KlC1%Rw|~ip1r(IV_PqxQK%{j-a^l7J^*@ zu&3|`MaJ$1WI(71OAgP3EXMGm9?a!q=YgI1yioXk7(!Pptkk$ow6OTVuaidk=z%yr z@yKiI#bwkM-H>WnMB*S;6@rnDp4gGQAGezLeY6VEN#27gac|7i3&T6S!0fH;pjQa}TyMBV-^R)v zA{}n;saPM3W2U8VWdpxt{i#Gl9Lp4!qt{_%Vt$t0mY_kxI-%VCwYnRB=o-b<+6k*7 zmchrK-`?_K&)0uIez(NFK2Kan&>tU?XgYVn;n^(AKJ*Ag^!fre{5pzs=l`#l2;sm+@xg(ta;==sU5y;3x6Z zHm*IkiI}eyf1A0XP=*zL{xBb6uE@XFPK&>F@^Jce4@W9hiZ2CKYa&zxB59eK{y4pZ$KT&dyY$Xh4yqbJ3mn|t{JO4kRqD4y!3#_9Q%-yKP@C+uL zDY3S&R_&KMBgebJFDv9}RI~^d-I;Rb!~)CaCTVS3JzT6EjWRG;(5dgjxB1`E+-&;G zw6&G*W^U%aU2l62MGdRhHPg4Bi8c8a5X4uf5d@cX>0Dqh4jg{_kgf$j1{MRN{~X zm#g#W+mDi?Ue&QQtW4pdO}N7$iE=MH>m`0FW2p$=IC)7sPM&IV`qdQE1 zWuZ&qY3C-JceS<{2dIEBp*zbzhS}oh@=F`balTUVU2{3CNQ!zz%f{h|=Sw=>x}@QT zDRnE7qF&i47whX`yhzigilnGlbX3{C@<1e)Cig5kxBj-Iln5go{SfCjosWMxS~=k9 z@lP`8axkdG-Woc3y`sqBQ!zL2A;y8=@&lZGF>_QDo_}B^lW%J&|HcS~XV*<#eTb{S zZt7|+8wfDIvv?mp&^1!@QPwL3ULIoPOX38qh z^do)35$<_EasmMlar)0zN*)>yE?GQhUq!FXB<@6^JwAUy?(V8i%n0ZT7pBI>| zg^gl6s@v-5+w8mKp?=MjRoOB;@Q{S2R!6=>M#GyaXHto~^>=z9J<%r;Q+y)$vJzrL z%rV(J9OaFrXzl9lOdH0#QrNJg_J4=~_U7-$yfF`Bn1Tr<&zRsb4k2!1kf$xgc_O&p zXOUN9+3~Z8CP2u#rj$q4eLi9cnCBs^=w)+JCE_N2HIHIA}%lK!WzMjN~YTL`hs0KU-EN}wS|pp zJGu;d!F_-6AO^C)x~de9~GfY9C3jiTBjT&vDU2Yal`+)M)> z(VHq@&L?(C(ggXUk-2dE(x`oxzRu!=Mg~JyPd7q5Z9P=mQYDO1WcMQv0+_Sk4djL8;oyt0!|sQbg_Z0mscfpijq1y2)(OKf#CdS( zWBic_zPg1!($+pFWN|im=A4klQHS!=`Oni8YA-P(c#M0ngvO29>-6mh12wXl`Bu$R zh~}Ds)G&Th^>ZJOk*rzMi5{qJu0%;qAzC{cWC@iu6f>PlTzF?&H^!SYhH~Ngg`@N{ zX9PXEI-`IIH8Dafs?JAuPY?Xv#_(kt+Z%AZckUwiOw9K^g4Zw`jlHB#Xf*2t{ZiD= zeDE-5qZ`pWb&_T^XcMmL!8(FRH9S3P9tX?6V*&eknfDu1trX}1V(6eO{L-@i9x