From bbef7796cac1d1cb37d01afe2150a0a87dff0dd2 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 2 Dec 2021 17:42:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E7=AC=AC=E5=9B=9B=E6=9C=9F=E7=A5=9E=E9=AD=82?= 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 | 56 +++ .../Modules/Battle/Logic/Base/Passivity.lua | 446 +++++++++++++++++- .../~Lua/Modules/Battle/Logic/Buff/Immune.lua | 39 +- .../~Lua/Modules/Battle/Logic/Buff/NoDead.lua | 18 +- .../Modules/Battle/Logic/Buff/SigilSign.lua | 33 ++ .../Battle/Logic/Buff/SigilSign.lua.meta | 7 + .../Battle/Logic/Misc/BattleDefine.lua | 2 + .../Modules/Battle/Logic/Misc/BattleUtil.lua | 2 +- .../Modules/Battle/Logic/Role/RoleLogic.lua | 8 +- .../Modules/Battle/Logic/Role/RoleManager.lua | 7 + .../Modules/Battle/View/Unit/BuffCtrl.lua | 3 + 12 files changed, 579 insertions(+), 43 deletions(-) create mode 100644 Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.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 fe176fb727..591f9e3652 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua @@ -17,6 +17,7 @@ local BuffRegister = { [BuffName.Brand] = "Brand", [BuffName.Blood] = "Blood", [BuffName.BanBlood] = "BanBlood", + [BuffName.SigilSign] = "SigilSign", } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 6d40295a12..9366b07c0a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2731,6 +2731,62 @@ local effectList = { end) end) end, + -- [a]%概率造成[b],每回合造成[c]%自身[d]的伤害,持续[e]回合;[f]%概率使目标灼烧2层,[g]%概率3层 + -- a[float]b[持续伤害状态].c[float],d[属性]e[int],f[float],g[float] + [141] = function(caster, target, args, interval, skill) + local f1 = args[1] + local dot = args[2] + local f2 = args[3] + local pro = args[4] + local i1 = args[5] + local p1 = args[6] + local p2 = args[7] + caster.Event:DispatchEvent(BattleEventName.RoleViewBullet, skill, target) + BattleLogic.WaitForTrigger(interval, function () + local floor=0 + local rand=Random.Range01() + if rand<=p2 then + floor=3 + end + if floor==0 and rand<=p1 then + floor=2 + end + if floor==0 and rand<=f2 then + floor=1 + end + + local damage = BattleUtil.ErrorCorrection(f2 * caster:GetRoleData(BattlePropList[pro])) + if floor~=0 then + for i = 1, floor do + -- local buff = Buff.Create(caster, BuffName.DOT, i1, 1, dot, floor(damage)) + -- buff.skill=skill + -- buff.isRealDamage = true + -- target:AddBuff(buff) + BattleUtil.RandomDot(1, dot, caster, target, i1, 1, damage,skill) + end + end + + end) + end, + --概率[a]添加[b]类型[c]效果,持续[d]回合,参数1[e],参数2[f] + --a[float],b[int],c[int],d[int],e[int/float],f[int/float] + [142] = function(caster, target, args, interval, skill) + local pro=args[1] + local t1=args[2] + local t2=args[3] + local r1=args[4] + local v1=args[5] + local v2=args[6] + BattleLogic.WaitForTrigger(interval, function () + if t1==BuffName.SigilSign then + BattleUtil.RandomAction(pro,function() + local buff=Buff.Create(target, t1, r1) + target:AddBuff(buff) + 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 debf41a8f1..82dc90b6ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2444,13 +2444,16 @@ local passivityList = { -- [129] = {}, - -- 死亡后持续战斗两回合期间受伤不致死,[a]回合后自动死亡。期间技能伤害降低[b]%无法触发追击效果且死后无法被复活。受到伤害[c]改变 - -- a[int]b[float]c[改变类型] + -- 死亡后持续战斗两回合期间受伤不致死,[a]回合后自动死亡。期间技能伤害降低[b]%无法触发追击效果且死后无法被复活。受到伤害[c]改变,[d]%概率不会直接死亡,回复[e]%生命 + -- a[int],b[float],c[改变类型],d[float],e[float] [130] = function(role, args) local i1 = args[1] local f1 = args[2] local ct = args[3] + local p1 = args[4] + local p2 = args[5] role.isHaveNoDead = true + local isTrigger=false -- 角色死亡时 local onRoleDead = function(atkRole) -- -- 暂时不能死 @@ -2480,9 +2483,12 @@ local passivityList = { -- end -- end -- role.Event:AddEvent(BattleEventName.RoleTurnEnd, onRoleTurnEnd) - - local buff = Buff.Create(role, BuffName.NoDead, i1, f1, ct, false) + if isTrigger then + return + end + local buff = Buff.Create(role, BuffName.NoDead, i1, f1, ct, false,p1,p2) BattleLogic.BuffMgr:AddBuff(role, buff) + isTrigger=true end role.Event:AddEvent(BattleEventName.RoleDead, onRoleDead,nil,nil,role) end, @@ -4150,7 +4156,7 @@ local passivityList = { table.insert(ctrls,ctr3) end local immune = function(buff) - return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)) + return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)),role end local curBuff=nil BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, function(curRound) @@ -5085,14 +5091,21 @@ local passivityList = { BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, _OnRoundChange,nil,nil,role) end, - -- 我方每有一个[a]武将,自身[d]改变[b]的[c],可叠加(第一回合开始时生效) - -- a[元素],b[float],c[属性],d[改变类型] + -- 我方每有一个[a]武将,自身[b]%的[c]属性[d]改变,[e]%的[f]属性[g]改变 范围类型[h] 可叠加(第一回合开始时生效) + -- a[元素],b[float],c[属性],d[改变类型],e[float],f[int],g[int 改变类型],h[int 0/不填 自身 1:全体] [235] = function(role, args) local ele = args[1] local f1 = args[2] local pro = args[3] local ct = args[4] + local f2 = args[5] + local pro2 = args[6] + local ct2 = args[7] + local type = args[8] + if not args[8] then + type=0 + end local function _OnRoundChange(curRound) if curRound == 1 then local list = RoleManager.Query(function(r) @@ -5100,7 +5113,27 @@ local passivityList = { end) -- local num = #list - BattleUtil.AddProp(role, pro, f1*num, ct) + if type==0 then + --BattleUtil.AddProp(role, pro, f1*num, ct) + local buff = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro], f1*num, ct) + role:AddBuff(buff) + if f2 and pro2 and ct2 then + local buff2 = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro2], f2*num, ct2) + role:AddBuff(buff2) + end + else + local list2 = RoleManager.Query(function(r) + return r.camp == role.camp + end) + for i = 1, #list2 do + local buff = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro], f1*num, ct) + list2[i]:AddBuff(buff) + if f2 and pro2 and ct2 then + local buff2 = Buff.Create(role, BuffName.PropertyChange, 0, BattlePropList[pro2], f2*num, ct2) + list2[i]:AddBuff(buff2) + end + end + end end end BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange, _OnRoundChange,nil,nil,role) @@ -5626,11 +5659,14 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role) end, - --技能击杀目标溢出伤害的[a]%将对生命百分比最高的攻击目标造成伤害 - -- a[float] + --技能击杀目标溢出伤害的[a]%将对生命百分比最高的攻击目标造成伤害,并降低其[b]点怒气 + -- a[float],b[int] [257]=function(role,args,id,judge) local f1 = args[1] - local dt = args[2] + local num = args[2] + if not args[2] then + num=0 + end local point=nil -- 直接伤害后 local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill) @@ -5643,10 +5679,14 @@ local passivityList = { list = BattleUtil.SortByHpFactor(list,0) -- if not list[1]:IsDead() then if list then - if not point then - point=list[1] - end - BattleUtil.FinalDamage(nil,role,point,dmg) + if not point then + point=list[1] + end + BattleUtil.FinalDamage(nil,role,point,dmg) + if num>0 then + BattleUtil.CalRage(role,point,num,CountTypeName.Sub) + end + end -- end @@ -5996,7 +6036,7 @@ local passivityList = { local sta3=args[3] local skiller=nil local immune = function(buff) - return buff.type == BuffName.DOT and (buff.damageType==sta2 or buff.damageType==sta3) + return buff.type == BuffName.DOT and (buff.damageType==sta2 or buff.damageType==sta3),role end local curBuff=nil @@ -6142,7 +6182,7 @@ local passivityList = { local sta3=args[3] local skiller=nil local immune = function(buff) - return buff.type == BuffName.Control + return buff.type == BuffName.Control,role end local curBuff=nil local immuneState=false @@ -7138,7 +7178,7 @@ local passivityList = { table.insert(ctrls,ctr3) end local immune = function(buff) - return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)) + return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)),role end -- 释放技能后 local onSkillEnd = function(skill) @@ -9450,15 +9490,28 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.PassiveDamaging, passiveDmg,nil,nil,role) end, - -- 技能治疗的目标[a]属性[b]改变[c]%,持续[d]回合 - -- a[int],b[改变类型],c[float],d[int] + -- 技能治疗的目标[a]属性[b]改变[c]%,持续[d]回合 buff类型[e] + -- a[int],b[改变类型],c[float],d[int],e[int 0/不填:可叠加;1:不叠加 ] [384] = function(role, args,id,judge) local f1 = args[1] local ct = args[2] local v1 = args[3] local round = args[4] + local type = args[5] + if args[5]==nil then + type=0 + end + local addBuff=nil local onPassiveTreatingFactor = function(func, target) - target:AddBuff(Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[f1], v1,ct)) + + if type==1 and BattleLogic.BuffMgr:HasBuff(target,BuffName.PropertyChange,function(buff) return addBuff~=nil and buff==addBuff end) then + addBuff.roundDuration=round + addBuff.roundPass=0 + else + addBuff=Buff.Create(role, BuffName.PropertyChange, round, BattlePropList[f1], v1,ct) + target:AddBuff(addBuff) + end + end local function onSkillCast(skill) @@ -9739,6 +9792,357 @@ local passivityList = { --role.Event:AddEvent(BattleEventName.SkillCast, OnSkillCast,nil,nil,role) role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd,nil,nil,role) end, + -- 受到[a]类型[b]状态敌人攻击时受到伤害[c]改变 状态层数*[d]%, 伤害类型为[e] + -- a[int],b[int],c[int 改变类型],d[float],e[int](e 不填/0不区别是否为直接伤害) + [392] = function(role, args) + local t1 = args[1] + local t2 = args[2] + local ct = args[3] + local f1 = args[4] + local type = args[5] + if not type then + type=0 + end + local onPassiveBeDamaging = function(func, caster, damage,skill) + if type==1 and not skill then + return + end + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==caster and buff.type==t1 and buff.damageType==t2 end) + local len=BattleUtil.LengthOfTable(list) + if len>0 then + + local dmgDeduction = floor(BattleUtil.ErrorCorrection(BattleUtil.CountValue(damage, f1*len, ct)-damage)) + if func then func(dmgDeduction) end + end + end + role.Event:AddEvent(BattleEventName.PassiveBeDamaging, onPassiveBeDamaging,nil,nil,role) + end, + --改变[a]目标身上[b]类型[c]状态buff层数*[d]%的暴击伤害 + --a[int],b[int],c[ind],d[float] + [393]=function(role,args,id,judge) + local ct=args[1] + local t1=args[2] + local t2 = args[3] + local v1 = args[4] + local addCritDamageFa=function(func,atkRole,defRole) + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==defRole and buff.type==t1 and buff.damageType==t2 end) + local len=BattleUtil.LengthOfTable(list) + if len>0 then + if func then + func(v1*len,ct) + end + end + end + role.Event:AddEvent(BattleEventName.PassiveAddCritDamageFactor,addCritDamageFa,nil,nil,role) + end, + --技能追加的普攻额外造成目标[a]属性*[b]类型[c]状态的层数*[d]的伤害 + --a[int 属性id] b[int],c[int],d[float] + [394]=function(role,args,id,judge) + local f1 = args[1] + local t1 = args[2] + local t2 = args[3] + local v1 = args[4] + -- 直接伤害后 + 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 + local list=BattleLogic.BuffMgr:GetAllBuffByFunc(function(buff) return buff.target==defRole and buff.type==t1 and buff.damageType==t2 end) + local len=BattleUtil.LengthOfTable(list) + if len==0 then + return + end + if (f1==12 or f1==13) then + local val = floor(BattleUtil.FP_Mul(len*v1, defRole:GetRoleData(BattlePropList[f1]))) + BattleUtil.FinalDamageCountShield(nil,role,defRole,val) + end + end + end + role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role) + end, + --自身添加的免疫buff,免疫一次[a]类型buff,自身回复[b]点怒气,每回合最多触发[c]次 + --a[int buff类型],b[int],c[int] + [395]=function(role,args,id,judge) + local type=args[1] + local num=args[2] + local time=args[3] + local triggerNum=0 + local onBuffImmune=function(buff,target,immCaster) + if immCaster~=role then + return + end + if buff.type~=type then + return + end + if triggerNum==time then + return + end + BattleUtil.CalRage(role,role,num,CountTypeName.Add) + triggerNum=triggerNum+1 + end + BattleLogic.Event:AddEvent(BattleEventName.ImmuneDebuffSuccess,onBuffImmune,nil,nil,role) + + local onRoundChange=function() + triggerNum=0 + end + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role) + end, + --直接伤害击杀目标自身增加[a]点怒气,并偷取目标[b]%的[c]属性在下次攻击种释放 + -- a[int],b[float],c[int] + [396] = function(role, args,id,judge) + local i1 = args[1] + local p1 = args[2] + local pro= args[3] + local isKill=false + local addAttack=0 + local OnRoleHit = function(defRole, damage, bCrit, finalDmg, damageType, skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + + if skill and defRole:IsDead() and not BattleUtil.CheckIsNoDead(defRole) then + isKill=true + addAttack=addAttack+floor(defRole:GetRoleData(BattlePropList[pro])*p1) + end + end + + local onSkillCast=function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + addAttack=0 + role.Event:AddEvent(BattleEventName.RoleHit, OnRoleHit,nil,nil,role) + end + role.Event:AddEvent(BattleEventName.SkillCast,onSkillCast,nil,nil,role) + + local onSkillCastEnd=function(skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + if isKill then + BattleUtil.CalRage(role, role, i1, CountTypeName.Add) + role.addAttack=addAttack + isKill=false + else + addAttack=0 + role.addAttack=0 + end + + role.Event:RemoveEvent(BattleEventName.RoleHit, OnRoleHit,nil,nil,role) + end + role.Event:AddEvent(BattleEventName.SkillCastEnd,onSkillCastEnd,nil,nil,role) + end, + --[a]类型[b]效果命中后,[c]改变目标[d]属性[e]%,持续[f]回合,如果目标为[g]阵营,[h]改变目标[i]属性[j]% 持续[k]回合(不可叠加) + --a[int],b[int],c[int 改变类型],d[int],e[float],f[int],g[int],h[int 改变类型],i[int],j[float],k[int] + [397] = function(role, args) + local t1 = args[1] + local t2 = args[2] + local ct = args[3] + local f1 = args[4] + local v1 = args[5] + local r1 = args[6] + local ele = args[7] + local ct2 = args[8] + local f2 = args[9] + local v2 = args[10] + local r2 = args[11] + local buff1 = nil + local buff2 = nil + local OnBuffCaster = function(buff) + + if buff.type==t1 and buff.shieldType==t2 then + if buff.shieldValue==0 then + local isHave1=BattleLogic.BuffMgr:HasBuff(buff.target,BuffName.PropertyChange,function(buff) return buff1~=nil and buff==buff1 end) + if isHave1 then + buff1.roundDuration=r1 + buff1.roundPass=0 + else + buff1=Buff.Create(role, BuffName.PropertyChange, r1, BattlePropList[f1], v1, ct) + buff.target:AddBuff(buff1) + end + + + --未完待续 + if buff.target.element==ele then + local isHave2=BattleLogic.BuffMgr:HasBuff(buff.target,BuffName.PropertyChange,function(buff) return buff2~=nil and buff==buff2 end) + if isHave2 then + buff2.roundDuration=r1 + buff2.roundPass=0 + else + buff2=Buff.Create(role, BuffName.PropertyChange, r2, BattlePropList[f2], v2, ct2) + buff.target:AddBuff(buff2) + end + end + end + end + + end + role.Event:AddEvent(BattleEventName.BuffCaster, OnBuffCaster,nil,nil,role) + end, + --回合结束时,敌方处于[a]类型[b]状态的目标会扣除[c]属性[d]%的生命 + --a[int],b[int],c[int],d[float] + [398]=function(role,args,id,judge) + local t1=args[1] + local t2=args[2] + local pro=args[3] + local v1 =args[4] + local onRoundChange=function(round) + if round==0 then + return + end + local list = RoleManager.Query(function(v) return role.camp ~= v.camp end) + for _, r in pairs(list) do + if BattleLogic.BuffMgr:HasBuff(r, t1,nil) then + if pro==12 and not BattleUtil.CheckIsBoss(r) then + local damage= floor(r:GetRoleData(BattlePropList[pro])*v1) + BattleUtil.FinalDamageCountShield(false,role,r,damage) + end + end + end + end + BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEnd, onRoundChange,nil,nil,role) + end, + -- 概率[a]给技能目标添加[b]类型[c]效果的buff,持续[d]回合 + -- a[float],b[int],c[int],d[int] + [399] = function(role, args,id,judge) + local pro = args[1] + local t1 = args[2] + local t2 = args[3] + local round=args[4] + -- 释放技能后 + local onRoleHit = function(defRole,damge,bcrit,finalDamage,damagetype,skill) + if skill and not skill.isTriggerJudge and judge==1 then + return + end + + if skill and skill.type==BattleSkillType.Special then + BattleUtil.RandomAction(pro,function() + local buff = Buff.Create(role,t1,round) + defRole:AddBuff(buff) + end) + end + end + role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role) + end, + --处于[a]类型[b]状态的目标,怒气大于等于[c]点每次受到[d]阵营技能攻击,额外降低[e]点怒气,怒气小于[f]点,受到[g]阵营攻击暴击率改变[h][i]% + --a[int],b[int],c[int],d[int],e[int],f[int],g[int],h[int],i[float] + [400]=function(role, args,id,judge) + local t1=args[1] + local t2=args[2] + local n1=args[3] + local ele1=args[4] + local n2=args[5] + local n3=args[6] + local ele2=args[7] + local ct=args[8] + local v1=args[9] + + + local onRoleHit = function(atkRole, defRole, damage, bCrit, finalDmg, damageType, dotType, skill) + if not skill then + return + end + if atkRole.camp~=role.camp or defRole.camp==role.camp then + return + end + if atkRole.element~=ele1 then + return + end + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then + return + end + local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff) + if t1==BuffName.SigilSign then + return true + end + end) + if ishave then + if defRole.Rage>=n1 then + BattleUtil.CalRage(role,defRole,n2,CountTypeName.Sub) + end + end + + end + BattleLogic.Event:AddEvent(BattleEventName.RoleDamage, onRoleHit,nil,nil,role) + + local addCrit=function(critFunc,atkRole,defRole,skill) + if not skill then + return + end + if atkRole.camp~=role.camp or defRole.camp==role.camp then + return + end + if atkRole.element~=ele2 then + return + end + local ishave=BattleLogic.BuffMgr:HasBuff(defRole,t1,function(buff) + if t1==BuffName.SigilSign then + return true + end + end) + if ishave then + if defRole.Rage0 then + -- local buff = Buff.Create(caster, BuffName.DOT, i1, 1, dot, floor(damage)) + -- buff.skill=skill + -- buff.isRealDamage = true + local newBuff={} + newBuff=buff + newBuff.skill=nil + newBuff.caster=role + for i = 1, add do + + buffTarget:AddBuff(newBuff) + end + end + --end) + + end + + role.Event:AddEvent(BattleEventName.BuffCaster, OnBuffStart,nil,nil,role) + end } return passivityList \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua index dc3e282da6..dd6e0e4de6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Immune.lua @@ -1,23 +1,7 @@ -- 免疫效果 Immune = Buff:New() -local immune0 = function(buff) - return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT -end -local immune1 = function(buff) - return buff.type == BuffName.Control -end -local immune2 = function(buff) - return buff.type == BuffName.DOT -end -local immune3 = function(buff) - return buff.type == BuffName.Shield and buff.shieldType == ShieldTypeName.AllReduce -end ---免疫控制不免疫禁疗 -local immune5 = function(buff) - return buff.type == BuffName.Control and buff.ctrlType and buff.ctrlType~=4 -end @@ -30,10 +14,31 @@ function Immune:SetData(type,func) -- 刷新排序等级 self.sort = 4 end +local immune0 = nil +local immune1 = nil + +local immune2 = nil +local immune3 = nil +--免疫控制不免疫禁疗 +local immune5 = nil --初始化后调用一次 function Immune:OnStart() - + immune0=function(buff) + return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT,self.caster + end + immune1=function(buff) + return buff.type == BuffName.Control,self.caster + end + immune2 = function(buff) + return buff.type == BuffName.DOT,self.caster + end + immune3 = function(buff) + return buff.type == BuffName.Shield and buff.shieldType == ShieldTypeName.AllReduce,self.caster + end + immune5 =function(buff) + return buff.type == BuffName.Control and buff.ctrlType and buff.ctrlType~=4,self.caster + end if self.immuneType == 0 then --免疫负面状态(控制状态、减益状态和持续伤害状态) self.target.buffFilter:Add(immune0) elseif self.immuneType == 1 then --免疫控制状态 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua index d30137f614..e316b8ea97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/NoDead.lua @@ -4,7 +4,9 @@ NoDead = Buff:New() function NoDead:SetData(...) self.damageFactor, self.factorCT, - self.isCanRelive = ... -- buff期间的增伤系数 + self.isCanRelive, + self.pro, + self.v1 = ... -- buff期间的增伤系数 self.cover = true --控制效果可被覆盖 -- 刷新排序等级 self.sort = 4 @@ -62,7 +64,19 @@ function NoDead:OnEnd() self.target.Event:RemoveEvent(BattleEventName.RoleBeHit,self.OnRoleBeHit,self) end --self.target.Event - self.target:SetDeadFilter(true) + local isRand=BattleUtil.RandomAction(self.pro,function() + RoleManager.RemoveDeadRole(self.target) + self.target.isDead=false + self.target.isRealDamage=false + local addHp= math.floor(self.target:GetRoleData(RoleDataName.MaxHp)*self.v1) + self.target.data:AddValue(RoleDataName.Hp,addHp) + self.target:SetIsCanAddSkill(true) + self.target:SetDeadFilter(true) + end) + if not isRand then + self.target:SetDeadFilter(true) + end + -- self.target:SetIsCanAddSkill(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.lua new file mode 100644 index 0000000000..c105777bd2 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.lua @@ -0,0 +1,33 @@ +SigilSign = Buff:New() + +--初始化Buff,通过传入一些自定义参数控制成长相关的数值 +function SigilSign:SetData(...) + + -- 刷新排序等级 + self.sort = 4 +end + + +--初始化后调用一次 +function SigilSign:OnStart() + + +end + +--间隔N帧触发,返回true时表示继续触发,返回false立刻触发OnEnd +function SigilSign:OnTrigger() + return true +end + +--效果结束时调用一次 +function SigilSign:OnEnd() + + +end + +--只有当cover字段为true时触发,返回true则被新效果覆盖 +function SigilSign:OnCover(newBuff) + return true +end + +return SigilSign \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.lua.meta b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.lua.meta new file mode 100644 index 0000000000..59c0e202ce --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/SigilSign.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 846cb2db9b2ee114ca0a56adccb06c18 +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 13efedf760..548177fd97 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -189,6 +189,7 @@ BattleEventName = { CastRageBrfore = indexAdd(),--扣除怒气之前 PassiveAddCritDamageFactor = indexAdd(), --被动增加爆伤系数 PassiveChangeIgnoreImmuneValue = indexAdd(),--被动修改无视 + ImmuneDebuffSuccess = indexAdd(),--免疫debuff成功 } BattleMaxFrame = 1000000 @@ -269,6 +270,7 @@ BuffName = { Brand = 12, Blood = 13, BanBlood = 14, + SigilSign = 15, } DotType = { diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 911fb7de0d..abdb54f628 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -963,7 +963,7 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i defence = defRole:GetRoleData(RoleDataName.MagicDefence) end -- 攻击力 - local attack = atkRole:GetRoleData(RoleDataName.Attack) + local attack = atkRole:GetRoleData(RoleDataName.Attack)+atkRole.addAttack -- 无视防御系数 ignoreDef = 1 - (ignoreDef or 0) -- 基础伤害 = 攻击力 - 防御力 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 18c62a9b1f..69eb3c241b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -89,6 +89,7 @@ function RoleLogic:Init(uid, data, position) self.isImmuneAllReduceShield = false --免疫敌方无敌盾(敌方无敌盾对自己无效) self.ignoreShara = false --忽略敌方分摊 self.type = BattleUnitType.Role + self.addAttack=0 --添加的攻击 self.isNormalAttackAddRage=true --普攻是否回复怒气 self.curMainTarget=nil --当前主目标 self.passiveList = {} @@ -358,7 +359,8 @@ function RoleLogic:AddBuff(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 + local isImm,immCaster=self.buffFilter.buffer[i](buff,self) + if isImm then BattleLogManager.Log( "Buff Filter", "camp", buff.caster.camp, @@ -366,6 +368,7 @@ function RoleLogic:AddBuff(buff) "id", buff.id, "type", buff.type) BattleLogic.BuffMgr:PutBuff(buff) + BattleLogic.Event:DispatchEvent(BattleEventName.ImmuneDebuffSuccess,buff,self,immCaster) BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddBuffFail,buff,self) return end @@ -633,7 +636,7 @@ function RoleLogic:SetDeadFilter(filter) self.deadFilter = filter end -- 要死了 -function RoleLogic:SetDead(damage) +function RoleLogic:SetDead(damage) self.isDead = true self.killDamage=damage RoleManager.AddDeadRole(self) @@ -686,6 +689,7 @@ function RoleLogic:SetRelive(hpf, caster) if self:IsCanRelive() then self.reliveHPF = hpf or 1 self.reliveCaster = caster + self.addAttack = 0 RoleManager.AddReliveRole(self) -- local maxHp = self.data:GetData(RoleDataName.MaxHp) -- local reHp = floor(self.reliveHPF * maxHp) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua index 22c19b6194..0e6442b73a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua @@ -83,6 +83,13 @@ end function this.AddDeadRole(role) _DeadRoleList[role.position + role.camp * 6] = role end + +function this.RemoveDeadRole(role) + if _DeadRoleList[role.position + role.camp * 6] then + _DeadRoleList[role.position + role.camp * 6]=nil + end +end + -- 检测是有人将死 function this.CheckDead() local isDeadFrame = false diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index b25e49cf69..ab4e0f2e9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -12,6 +12,7 @@ local BuffTypeToConfigType = { [BuffName.Exile] = 9, [BuffName.Blood] = 10, [BuffName.BanBlood] = 11, + [BuffName.SigilSign] = 13, } local function _GetPropChangeBuffCType(pName) for cType, pn in ipairs(BattlePropList) do @@ -52,6 +53,8 @@ local function _GetBuffEffectConfig(buff) cType = 1 elseif bType==BuffName.BanBlood then cType = 1 + elseif bType==BuffName.SigilSign then + cType = 1 end local type = BuffTypeToConfigType[bType] From 4c7b379ce78a7db68eb8cccf9d249ffffb20c151 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 2 Dec 2021 19:49:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E8=84=89=E7=A7=98?= =?UTF-8?q?=E5=A2=83=E3=80=911=E5=8F=B7=E7=81=B5=E8=84=89=E7=9A=84?= =?UTF-8?q?=E7=81=B5=E6=B0=94=E6=95=B0=E5=80=BC=E8=B6=85=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/LingMaiMiJin/LingMaiMiJingPanel.prefab | 2310 ++++++++++------- .../LingMaiMiJing/LingMaiMiJingPanel.lua | 6 +- 2 files changed, 1429 insertions(+), 887 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index 16e5ab3191..796c63f27d 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -728,6 +728,82 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: LanguageIndex: 11026 +--- !u!1 &611673274416950951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4217459692297476353} + - component: {fileID: 6717742195014678073} + - component: {fileID: 3165961038158604263} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4217459692297476353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611673274416950951} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4217724669996679700} + - {fileID: 6257750677036565733} + m_Father: {fileID: 1668420487530797515} + 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: 0} + m_SizeDelta: {x: 159, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6717742195014678073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611673274416950951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &3165961038158604263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611673274416950951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &947549550918275638 GameObject: m_ObjectHideFlags: 0 @@ -835,8 +911,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1311662457910766663} - - {fileID: 1457523271505392013} + - {fileID: 8274435643841408698} m_Father: {fileID: 8503916144832348492} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -852,7 +927,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 962644386338986399} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -945,6 +1020,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1162909582601518522 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1449332798667857367} + - component: {fileID: 7648236263988883215} + - component: {fileID: 6139782562434570721} + - component: {fileID: 2136970814659175951} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1449332798667857367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162909582601518522} + 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: [] + m_Father: {fileID: 7920893093303328848} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 99.5, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7648236263988883215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162909582601518522} + m_CullTransparentMesh: 0 +--- !u!114 &6139782562434570721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162909582601518522} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "10000/\u5206" +--- !u!114 &2136970814659175951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1162909582601518522} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1307623196153577684 GameObject: m_ObjectHideFlags: 0 @@ -1033,8 +1202,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7007822716159185834} - - {fileID: 6915301288775234114} + - {fileID: 4254844824055916361} m_Father: {fileID: 3233985254756653367} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1050,7 +1218,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1328775631347922877} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1142,6 +1310,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1503082878658476327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1831705033180179907} + - component: {fileID: 3456600689734858010} + - component: {fileID: 4006742355451296820} + - component: {fileID: 9131785029712992306} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1831705033180179907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503082878658476327} + 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: [] + m_Father: {fileID: 8274435643841408698} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 99.5, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3456600689734858010 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503082878658476327} + m_CullTransparentMesh: 0 +--- !u!114 &4006742355451296820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503082878658476327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "10000/\u5206" +--- !u!114 &9131785029712992306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503082878658476327} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1558309260135434847 GameObject: m_ObjectHideFlags: 0 @@ -1285,6 +1547,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1677569039810670468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1193269093884310905} + - component: {fileID: 460425199461411456} + - component: {fileID: 7048982332796183467} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1193269093884310905 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677569039810670468} + 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: [] + m_Father: {fileID: 4685274451577456665} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -20} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &460425199461411456 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677569039810670468} + m_CullTransparentMesh: 0 +--- !u!114 &7048982332796183467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677569039810670468} + 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: 0 + 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: 5b66d1c9ba827e84594d3e818587992c, 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 &1692656030820355805 GameObject: m_ObjectHideFlags: 0 @@ -1927,6 +2263,82 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "9\u5206" +--- !u!1 &1951314428363486453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8274435643841408698} + - component: {fileID: 7773977674178638484} + - component: {fileID: 8513169305222181024} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8274435643841408698 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951314428363486453} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3488343506265825458} + - {fileID: 1831705033180179907} + m_Father: {fileID: 7778025523987626717} + 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: 0} + m_SizeDelta: {x: 159, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7773977674178638484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951314428363486453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &8513169305222181024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951314428363486453} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &2004447905712542223 GameObject: m_ObjectHideFlags: 0 @@ -2522,6 +2934,174 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2352579189234607196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3488343506265825458} + - component: {fileID: 5325354512559035410} + - component: {fileID: 2352115489643464261} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3488343506265825458 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352579189234607196} + 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: [] + m_Father: {fileID: 8274435643841408698} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5325354512559035410 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352579189234607196} + m_CullTransparentMesh: 0 +--- !u!114 &2352115489643464261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2352579189234607196} + 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: 0 + 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: 5b66d1c9ba827e84594d3e818587992c, 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 &2353842597204984779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6257750677036565733} + - component: {fileID: 98372737437974208} + - component: {fileID: 3446624052548205027} + - component: {fileID: 8984673507134160152} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6257750677036565733 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2353842597204984779} + 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: [] + m_Father: {fileID: 4217459692297476353} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 99.5, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &98372737437974208 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2353842597204984779} + m_CullTransparentMesh: 0 +--- !u!114 &3446624052548205027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2353842597204984779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "10000/\u5206" +--- !u!114 &8984673507134160152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2353842597204984779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &2453315434284007008 GameObject: m_ObjectHideFlags: 0 @@ -2678,6 +3258,82 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 +--- !u!1 &2622929829018760263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5717210909120286809} + - component: {fileID: 8127528752101087300} + - component: {fileID: 6453191791421447246} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5717210909120286809 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2622929829018760263} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6785334979106024337} + - {fileID: 2046060012671651112} + m_Father: {fileID: 5076232051669457574} + 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: 0} + m_SizeDelta: {x: 159, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8127528752101087300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2622929829018760263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &6453191791421447246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2622929829018760263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &2691903159453405335 GameObject: m_ObjectHideFlags: 0 @@ -2719,6 +3375,100 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2901469310318736604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2046060012671651112} + - component: {fileID: 4330077987310931382} + - component: {fileID: 8015297511766592476} + - component: {fileID: 4416864633937552729} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2046060012671651112 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2901469310318736604} + 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: [] + m_Father: {fileID: 5717210909120286809} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 99.5, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4330077987310931382 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2901469310318736604} + m_CullTransparentMesh: 0 +--- !u!114 &8015297511766592476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2901469310318736604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "10000/\u5206" +--- !u!114 &4416864633937552729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2901469310318736604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &2994326202307240311 GameObject: m_ObjectHideFlags: 0 @@ -2947,85 +3697,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3290568960576558309 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1083135684645463390} - - component: {fileID: 6961368438652776444} - - component: {fileID: 564495336946255221} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1083135684645463390 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3290568960576558309} - 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: [] - m_Father: {fileID: 5076232051669457574} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -20} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6961368438652776444 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3290568960576558309} - m_CullTransparentMesh: 0 ---- !u!114 &564495336946255221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3290568960576558309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "3370/\u5206" --- !u!1 &3300457607113066112 GameObject: m_ObjectHideFlags: 0 @@ -3525,8 +4196,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 475282275828034370} - - {fileID: 9017275524674898414} + - {fileID: 4685274451577456665} m_Father: {fileID: 7377805442636303903} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3542,7 +4212,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3382585936881540875} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4184,8 +4854,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1969401070609231810} - - {fileID: 9019706094673321214} + - {fileID: 7920893093303328848} m_Father: {fileID: 1649326373041402644} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4201,7 +4870,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3941663955012519914} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4538,7 +5207,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4671731577389104320 +--- !u!1 &4484385509139045553 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4546,9 +5215,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9017275524674898414} - - component: {fileID: 15105164322189419} - - component: {fileID: 4760508495939618260} + - component: {fileID: 409278412425148649} + - component: {fileID: 5866148740682195067} + - component: {fileID: 8811300805515307445} + - component: {fileID: 7881229642174648626} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -4556,40 +5226,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9017275524674898414 +--- !u!224 &409278412425148649 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4671731577389104320} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 4484385509139045553} + 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: [] - m_Father: {fileID: 3299041168423983460} + m_Father: {fileID: 4685274451577456665} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -20} - m_SizeDelta: {x: 100, y: 40} + m_AnchoredPosition: {x: 99.5, y: -20} + m_SizeDelta: {x: 119, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &15105164322189419 +--- !u!222 &5866148740682195067 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4671731577389104320} + m_GameObject: {fileID: 4484385509139045553} m_CullTransparentMesh: 0 ---- !u!114 &4760508495939618260 +--- !u!114 &8811300805515307445 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4671731577389104320} + m_GameObject: {fileID: 4484385509139045553} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -4613,10 +5283,98 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "3370/\u5206" + m_Text: "10000/\u5206" +--- !u!114 &7881229642174648626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4484385509139045553} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &4659657450628328081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4217724669996679700} + - component: {fileID: 4060671072439383019} + - component: {fileID: 1078034516232969222} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4217724669996679700 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659657450628328081} + 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: [] + m_Father: {fileID: 4217459692297476353} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4060671072439383019 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659657450628328081} + m_CullTransparentMesh: 0 +--- !u!114 &1078034516232969222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4659657450628328081} + 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: 0 + 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: 5b66d1c9ba827e84594d3e818587992c, 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 &4731093966159325766 GameObject: m_ObjectHideFlags: 0 @@ -4793,8 +5551,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7422754373099998869} - - {fileID: 5147924195624044359} + - {fileID: 4217459692297476353} m_Father: {fileID: 7716419764020108430} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4810,7 +5567,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4820495336149855881} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -5327,7 +6084,7 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: ---- !u!1 &5294068394628429193 +--- !u!1 &5253323267258346348 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5335,9 +6092,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7007822716159185834} - - component: {fileID: 1593911739857376895} - - component: {fileID: 3957767073066540251} + - component: {fileID: 8336872290487048008} + - component: {fileID: 16174404189293800} + - component: {fileID: 1681078706894130392} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -5345,40 +6102,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7007822716159185834 +--- !u!224 &8336872290487048008 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5294068394628429193} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 5253323267258346348} + 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: [] - m_Father: {fileID: 3672735406516313966} + m_Father: {fileID: 7920893093303328848} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1593911739857376895 +--- !u!222 &16174404189293800 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5294068394628429193} + m_GameObject: {fileID: 5253323267258346348} m_CullTransparentMesh: 0 ---- !u!114 &3957767073066540251 +--- !u!114 &1681078706894130392 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5294068394628429193} + m_GameObject: {fileID: 5253323267258346348} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -5392,7 +6149,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fe36762df3bdd83448a342d51008b637, type: 3} + m_Sprite: {fileID: 21300000, guid: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5496,80 +6253,6 @@ MonoBehaviour: m_EffectColor: {r: 1, g: 0.72182995, b: 0, a: 0.5} m_EffectDistance: {x: 2, y: -2} m_UseGraphicAlpha: 1 ---- !u!1 &5513505438013745805 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1311662457910766663} - - component: {fileID: 545820784701054305} - - component: {fileID: 1346447702153532299} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1311662457910766663 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5513505438013745805} - 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: [] - m_Father: {fileID: 7778025523987626717} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -20} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &545820784701054305 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5513505438013745805} - m_CullTransparentMesh: 0 ---- !u!114 &1346447702153532299 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5513505438013745805} - 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: 0 - 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: fe36762df3bdd83448a342d51008b637, 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 &5577892831059959637 GameObject: m_ObjectHideFlags: 0 @@ -5647,6 +6330,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5587455330372210825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6785334979106024337} + - component: {fileID: 1098802309311923478} + - component: {fileID: 6961871609411821558} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6785334979106024337 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5587455330372210825} + 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: [] + m_Father: {fileID: 5717210909120286809} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1098802309311923478 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5587455330372210825} + m_CullTransparentMesh: 0 +--- !u!114 &6961871609411821558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5587455330372210825} + 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: 0 + 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: 5b66d1c9ba827e84594d3e818587992c, 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 &5659747304262614953 GameObject: m_ObjectHideFlags: 0 @@ -6116,85 +6873,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &5928756538799457442 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1457523271505392013} - - component: {fileID: 1925554337071606038} - - component: {fileID: 8498126595304641524} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1457523271505392013 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5928756538799457442} - 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: [] - m_Father: {fileID: 7778025523987626717} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -20} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1925554337071606038 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5928756538799457442} - m_CullTransparentMesh: 0 ---- !u!114 &8498126595304641524 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5928756538799457442} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "3370/\u5206" --- !u!1 &5992755381579292390 GameObject: m_ObjectHideFlags: 0 @@ -6290,85 +6968,6 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 ---- !u!1 &5994108122977048621 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5147924195624044359} - - component: {fileID: 6558722593943403982} - - component: {fileID: 6279038374973944062} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5147924195624044359 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5994108122977048621} - 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: [] - m_Father: {fileID: 1668420487530797515} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -20} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6558722593943403982 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5994108122977048621} - m_CullTransparentMesh: 0 ---- !u!114 &6279038374973944062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5994108122977048621} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "3370/\u5206" --- !u!1 &6112044121129211156 GameObject: m_ObjectHideFlags: 0 @@ -6512,6 +7111,82 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6190848916407137637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7920893093303328848} + - component: {fileID: 4422490062214326676} + - component: {fileID: 3768530491846788733} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7920893093303328848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6190848916407137637} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8336872290487048008} + - {fileID: 1449332798667857367} + m_Father: {fileID: 285159375942880937} + 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: 0} + m_SizeDelta: {x: 159, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4422490062214326676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6190848916407137637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &3768530491846788733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6190848916407137637} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &6241650327089226086 GameObject: m_ObjectHideFlags: 0 @@ -6652,80 +7327,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5C1A\u672A\u5360\u9886\u7075\u8109" ---- !u!1 &6386689716909049133 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7159556511311036335} - - component: {fileID: 490570917948530239} - - component: {fileID: 2938150488401084669} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7159556511311036335 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6386689716909049133} - 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: [] - m_Father: {fileID: 5076232051669457574} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -20} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &490570917948530239 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6386689716909049133} - m_CullTransparentMesh: 0 ---- !u!114 &2938150488401084669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6386689716909049133} - 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: 0 - 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: fe36762df3bdd83448a342d51008b637, 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 &6435517707477433140 GameObject: m_ObjectHideFlags: 0 @@ -6787,6 +7388,100 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 +--- !u!1 &6480250350432694205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5300337312848224014} + - component: {fileID: 585369584061004272} + - component: {fileID: 3877642676045330339} + - component: {fileID: 7659903021525851190} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5300337312848224014 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6480250350432694205} + 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: [] + m_Father: {fileID: 4254844824055916361} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 99.5, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &585369584061004272 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6480250350432694205} + m_CullTransparentMesh: 0 +--- !u!114 &3877642676045330339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6480250350432694205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "10000/\u5206" +--- !u!114 &7659903021525851190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6480250350432694205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &6502527546232368819 GameObject: m_ObjectHideFlags: 0 @@ -7410,6 +8105,82 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 +--- !u!1 &6866408268976459373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4254844824055916361} + - component: {fileID: 327217204978983498} + - component: {fileID: 2993609910121620301} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4254844824055916361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6866408268976459373} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3513680187178483165} + - {fileID: 5300337312848224014} + m_Father: {fileID: 3672735406516313966} + 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: 0} + m_SizeDelta: {x: 159, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &327217204978983498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6866408268976459373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &2993609910121620301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6866408268976459373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &6881822387114695049 GameObject: m_ObjectHideFlags: 0 @@ -7487,80 +8258,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6953540137983091337 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1969401070609231810} - - component: {fileID: 9110875168448037532} - - component: {fileID: 473221305267537578} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1969401070609231810 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6953540137983091337} - 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: [] - m_Father: {fileID: 285159375942880937} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -20} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9110875168448037532 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6953540137983091337} - m_CullTransparentMesh: 0 ---- !u!114 &473221305267537578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6953540137983091337} - 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: 0 - 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: fe36762df3bdd83448a342d51008b637, 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 &7061877796938287686 GameObject: m_ObjectHideFlags: 0 @@ -7756,85 +8453,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &7257353799867573244 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9019706094673321214} - - component: {fileID: 5324085076495844904} - - component: {fileID: 2610764894710591107} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9019706094673321214 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7257353799867573244} - 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: [] - m_Father: {fileID: 285159375942880937} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -20} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5324085076495844904 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7257353799867573244} - m_CullTransparentMesh: 0 ---- !u!114 &2610764894710591107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7257353799867573244} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "3370/\u5206" --- !u!1 &7529564376126916080 GameObject: m_ObjectHideFlags: 0 @@ -7930,6 +8548,80 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &7542401293067266094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3513680187178483165} + - component: {fileID: 2663125306042971955} + - component: {fileID: 841185566325706349} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3513680187178483165 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7542401293067266094} + 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: [] + m_Father: {fileID: 4254844824055916361} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2663125306042971955 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7542401293067266094} + m_CullTransparentMesh: 0 +--- !u!114 &841185566325706349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7542401293067266094} + 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: 0 + 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: 5b66d1c9ba827e84594d3e818587992c, 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 &7657080747961714526 GameObject: m_ObjectHideFlags: 0 @@ -8468,7 +9160,7 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: ---- !u!1 &7967157868271354269 +--- !u!1 &7988862173214649748 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8476,77 +9168,74 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6915301288775234114} - - component: {fileID: 5113536578435548678} - - component: {fileID: 8707226172345702632} + - component: {fileID: 4685274451577456665} + - component: {fileID: 6783453807084556817} + - component: {fileID: 8315463825759224895} m_Layer: 5 - m_Name: Text + m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6915301288775234114 +--- !u!224 &4685274451577456665 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7967157868271354269} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 7988862173214649748} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3672735406516313966} - m_RootOrder: 1 + m_Children: + - {fileID: 1193269093884310905} + - {fileID: 409278412425148649} + m_Father: {fileID: 3299041168423983460} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -20} - m_SizeDelta: {x: 100, y: 40} + 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: 159, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5113536578435548678 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7967157868271354269} - m_CullTransparentMesh: 0 ---- !u!114 &8707226172345702632 +--- !u!114 &6783453807084556817 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7967157868271354269} + m_GameObject: {fileID: 7988862173214649748} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.87058824, b: 0.5882353, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "3370/\u5206" + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &8315463825759224895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7988862173214649748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &8011061188795497071 GameObject: m_ObjectHideFlags: 0 @@ -8575,8 +9264,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7159556511311036335} - - {fileID: 1083135684645463390} + - {fileID: 5717210909120286809} m_Father: {fileID: 1662561173017663080} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -8592,7 +9280,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8011061188795497071} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -9035,80 +9723,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 ---- !u!1 &8568077403331910785 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 475282275828034370} - - component: {fileID: 8863805311811819074} - - component: {fileID: 4200872012966988838} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &475282275828034370 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8568077403331910785} - 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: [] - m_Father: {fileID: 3299041168423983460} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -20} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8863805311811819074 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8568077403331910785} - m_CullTransparentMesh: 0 ---- !u!114 &4200872012966988838 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8568077403331910785} - 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: 0 - 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: fe36762df3bdd83448a342d51008b637, 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 &8580756960167026428 GameObject: m_ObjectHideFlags: 0 @@ -9579,80 +10193,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8843516277466360366 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7422754373099998869} - - component: {fileID: 8561560278690251864} - - component: {fileID: 3333165688408950067} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7422754373099998869 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8843516277466360366} - 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: [] - m_Father: {fileID: 1668420487530797515} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -20} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8561560278690251864 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8843516277466360366} - m_CullTransparentMesh: 0 ---- !u!114 &3333165688408950067 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8843516277466360366} - 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: 0 - 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: fe36762df3bdd83448a342d51008b637, 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 &8934004158165950739 GameObject: m_ObjectHideFlags: 0 @@ -9924,11 +10464,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 244206589150588327} m_Modifications: - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: m_LocalPosition.x @@ -10034,6 +10569,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &304627812812909889 stripped @@ -10049,11 +10589,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 700173074565294965} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, - type: 3} - propertyPath: m_Name - value: ui-tianmen-huang - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} propertyPath: m_LocalPosition.x @@ -10159,6 +10694,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, + type: 3} + propertyPath: m_Name + value: ui-tianmen-huang + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} --- !u!224 &234066804788468945 stripped @@ -10174,11 +10714,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7234225016545137519} m_Modifications: - - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, - type: 3} - propertyPath: m_Name - value: ui-tianmen-lan - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_LocalPosition.x @@ -10284,6 +10819,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, + type: 3} + propertyPath: m_Name + value: ui-tianmen-lan + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} --- !u!224 &1972959484734254725 stripped @@ -10424,11 +10964,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7306400500366346521} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, - type: 3} - propertyPath: m_Name - value: ui-tianmen-zi - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} propertyPath: m_LocalPosition.x @@ -10534,6 +11069,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, + type: 3} + propertyPath: m_Name + value: ui-tianmen-zi + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} --- !u!224 &1712908599432746563 stripped @@ -10549,11 +11089,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7234225016545137519} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, - type: 3} - propertyPath: m_Name - value: ui-tianmen-zi - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} propertyPath: m_LocalPosition.x @@ -10659,6 +11194,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, + type: 3} + propertyPath: m_Name + value: ui-tianmen-zi + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} --- !u!224 &1455950645390051810 stripped @@ -10674,11 +11214,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7306400500366346521} m_Modifications: - - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, - type: 3} - propertyPath: m_Name - value: ui-tianmen-lan - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_LocalPosition.x @@ -10784,6 +11319,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, + type: 3} + propertyPath: m_Name + value: ui-tianmen-lan + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} --- !u!224 &1356994937208134561 stripped @@ -10799,11 +11339,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4932177533375895365} m_Modifications: - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: m_LocalPosition.x @@ -10909,6 +11444,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &1598171261750241261 stripped @@ -11049,11 +11589,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 700173074565294965} m_Modifications: - - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, - type: 3} - propertyPath: m_Name - value: ui-tianmen-lan - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_LocalPosition.x @@ -11159,6 +11694,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, + type: 3} + propertyPath: m_Name + value: ui-tianmen-lan + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} --- !u!224 &3180477938823186567 stripped @@ -11174,11 +11714,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3875862869781190770} m_Modifications: - - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, - type: 3} - propertyPath: m_Name - value: ui-tianmen-lan - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_LocalPosition.x @@ -11284,6 +11819,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, + type: 3} + propertyPath: m_Name + value: ui-tianmen-lan + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} --- !u!224 &3005917890185233696 stripped @@ -11299,11 +11839,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8792009063685705141} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, - type: 3} - propertyPath: m_Name - value: ui-tianmen-huang - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} propertyPath: m_LocalPosition.x @@ -11409,6 +11944,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, + type: 3} + propertyPath: m_Name + value: ui-tianmen-huang + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} --- !u!224 &2876328157392863115 stripped @@ -11424,11 +11964,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3335950387263910954} m_Modifications: - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: m_LocalPosition.x @@ -11534,6 +12069,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &4086917376022267521 stripped @@ -11674,11 +12214,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 700173074565294965} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, - type: 3} - propertyPath: m_Name - value: ui-tianmen-zi - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} propertyPath: m_LocalPosition.x @@ -11784,6 +12319,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, + type: 3} + propertyPath: m_Name + value: ui-tianmen-zi + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} --- !u!224 &5053420927314057790 stripped @@ -11799,11 +12339,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5278936056957735961} m_Modifications: - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: m_LocalPosition.x @@ -11909,6 +12444,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &4911996841393389956 stripped @@ -11924,11 +12464,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3875862869781190770} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, - type: 3} - propertyPath: m_Name - value: ui-tianmen-huang - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} propertyPath: m_LocalPosition.x @@ -12034,6 +12569,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, + type: 3} + propertyPath: m_Name + value: ui-tianmen-huang + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} --- !u!224 &6823032568207958107 stripped @@ -12049,11 +12589,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8792009063685705141} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, - type: 3} - propertyPath: m_Name - value: ui-tianmen-zi - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} propertyPath: m_LocalPosition.x @@ -12159,6 +12694,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, + type: 3} + propertyPath: m_Name + value: ui-tianmen-zi + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} --- !u!224 &6152451778378219186 stripped @@ -12174,11 +12714,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7306400500366346521} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, - type: 3} - propertyPath: m_Name - value: ui-tianmen-huang - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} propertyPath: m_LocalPosition.x @@ -12284,6 +12819,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, + type: 3} + propertyPath: m_Name + value: ui-tianmen-huang + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} --- !u!224 &6108601459624173648 stripped @@ -12424,11 +12964,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7956670939729184609} m_Modifications: - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: m_LocalPosition.x @@ -12534,6 +13069,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &7538858967603096275 stripped @@ -12549,11 +13089,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8792009063685705141} m_Modifications: - - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, - type: 3} - propertyPath: m_Name - value: ui-tianmen-lan - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} propertyPath: m_LocalPosition.x @@ -12659,6 +13194,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: aab31648dd1d85c4391bd8220e3bb242, + type: 3} + propertyPath: m_Name + value: ui-tianmen-lan + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aab31648dd1d85c4391bd8220e3bb242, type: 3} --- !u!224 &7023390841172906733 stripped @@ -12674,11 +13214,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7234225016545137519} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, - type: 3} - propertyPath: m_Name - value: ui-tianmen-huang - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} propertyPath: m_LocalPosition.x @@ -12784,6 +13319,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 60d9930f7168aa844b98df506ce1707b, + type: 3} + propertyPath: m_Name + value: ui-tianmen-huang + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60d9930f7168aa844b98df506ce1707b, type: 3} --- !u!224 &8363769760732197860 stripped @@ -12799,11 +13339,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3875862869781190770} m_Modifications: - - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, - type: 3} - propertyPath: m_Name - value: ui-tianmen-zi - objectReference: {fileID: 0} - target: {fileID: 1083836935691712645, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} propertyPath: m_LocalPosition.x @@ -12909,6 +13444,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 1083836935691712642, guid: 7733885d3e1a93b47a74dba9ec64227c, + type: 3} + propertyPath: m_Name + value: ui-tianmen-zi + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7733885d3e1a93b47a74dba9ec64227c, type: 3} --- !u!224 &8235811258509859674 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index 25ff3367f0..49146397b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -211,8 +211,10 @@ function LingMaiMiJingPanel:SetVeins() self.itemList[i][j] = item end item:SetActive(true) - Util.GetGameObject(item,"icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data.RewardList[j][1])) - Util.GetGameObject(item,"Text"):GetComponent("Text").text = string.format( "%s/分",data.RewardList[j][2]) + local Obj = Util.GetGameObject(item,"GameObject") + Util.GetGameObject(Obj,"icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data.RewardList[j][1])) + Util.GetGameObject(Obj,"Text"):GetComponent("Text").text = string.format( "%s/分",data.RewardList[j][2]) + ForceRebuildLayout(Obj.transform) end Util.AddOnceClick(go,function () if LingMaiMiJingManager.state == 1 then