【ID1009609】

【优化】无尽副本优化
dev_chengFeng
jiaoyangna 2021-07-06 14:43:45 +08:00
parent d55789480a
commit 3219a1a2b8
3 changed files with 275 additions and 41 deletions

View File

@ -477,6 +477,7 @@ RectTransform:
- {fileID: 1542938821}
- {fileID: 1685526102}
- {fileID: 8872915033464070422}
- {fileID: 7525528120510708557}
- {fileID: 4643422383628229334}
- {fileID: 6435868022123484491}
m_Father: {fileID: 224787418950452670}
@ -6140,7 +6141,7 @@ ParticleSystem:
--- !u!199 &199678057150230830
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10790,7 +10791,7 @@ ParticleSystem:
--- !u!199 &199183534652431558
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -11340,6 +11341,144 @@ MonoBehaviour:
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 1, y: 1}
m_UseGraphicAlpha: 1
--- !u!1 &249460181007310129
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7525528120510708557}
- component: {fileID: 1374282065204091655}
- component: {fileID: 2695834204437384094}
- component: {fileID: 15355381001603201}
- component: {fileID: 6109835748225352769}
m_Layer: 5
m_Name: btnJiuYuanLu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7525528120510708557
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249460181007310129}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 55611027241814842}
m_Father: {fileID: 1530677021}
m_RootOrder: 6
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: 127, y: 128}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1374282065204091655
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249460181007310129}
m_CullTransparentMesh: 0
--- !u!114 &2695834204437384094
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249460181007310129}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
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!114 &15355381001603201
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249460181007310129}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 2695834204437384094}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &6109835748225352769
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 249460181007310129}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &301557843766724639
GameObject:
m_ObjectHideFlags: 0
@ -16637,7 +16776,7 @@ ParticleSystem:
--- !u!199 &6121824411910985413
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21891,7 +22030,7 @@ ParticleSystem:
--- !u!199 &1859792028664134497
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -26663,7 +26802,7 @@ ParticleSystem:
--- !u!199 &5653487957444314079
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -31471,7 +31610,7 @@ ParticleSystem:
--- !u!199 &5322675852388844486
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -36339,7 +36478,7 @@ ParticleSystem:
--- !u!199 &1989098124910706582
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -42294,7 +42433,7 @@ ParticleSystem:
--- !u!199 &8746374249705677081
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -47184,7 +47323,7 @@ ParticleSystem:
--- !u!199 &8823971680245043867
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -52000,7 +52139,7 @@ ParticleSystem:
--- !u!199 &8430471708784069297
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -57315,7 +57454,7 @@ ParticleSystem:
--- !u!199 &7962120996366852011
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -62325,7 +62464,7 @@ ParticleSystem:
--- !u!199 &2541572793355743759
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -64223,7 +64362,7 @@ RectTransform:
m_Children:
- {fileID: 2149297425152283749}
m_Father: {fileID: 1530677021}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -69466,7 +69605,7 @@ ParticleSystem:
--- !u!199 &1560116421555167131
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -74691,7 +74830,7 @@ ParticleSystem:
--- !u!199 &6019895091589445860
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -79447,7 +79586,7 @@ ParticleSystem:
--- !u!199 &6020120546775422180
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -84145,7 +84284,7 @@ ParticleSystem:
--- !u!199 &6020477104265238278
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -88879,7 +89018,7 @@ ParticleSystem:
--- !u!199 &6019664593993108532
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -93527,7 +93666,7 @@ ParticleSystem:
--- !u!199 &6019812380086944594
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -98334,7 +98473,7 @@ ParticleSystem:
--- !u!199 &6019339336154760656
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -99019,6 +99158,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6096561529680901563
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 55611027241814842}
- component: {fileID: 5364338869521305055}
- component: {fileID: 7549711161234685556}
m_Layer: 5
m_Name: redpot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &55611027241814842
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6096561529680901563}
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: 7525528120510708557}
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: 33.5, y: 34}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0, y: 0}
--- !u!222 &5364338869521305055
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6096561529680901563}
m_CullTransparentMesh: 0
--- !u!114 &7549711161234685556
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6096561529680901563}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &6229925113273649498
GameObject:
m_ObjectHideFlags: 0
@ -104494,7 +104707,7 @@ ParticleSystem:
--- !u!199 &4720626719302079074
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -109550,7 +109763,7 @@ ParticleSystem:
--- !u!199 &5535316913343579795
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -111600,7 +111813,7 @@ RectTransform:
- {fileID: 3210488883455399000}
- {fileID: 8149096206500743259}
m_Father: {fileID: 1530677021}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -116436,7 +116649,7 @@ ParticleSystem:
--- !u!199 &629998129000523010
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -20,6 +20,7 @@ local _PointerDownList = {}
local _PointerUpList = {}
--初始化组件(用于子类重写)
function this:InitComponent()
this.spLoader = SpriteLoader.New()
this.effect = Util.GetGameObject(self.gameObject, "effect")
this.effect.gameObject:SetActive(false)
@ -49,7 +50,8 @@ function this:InitComponent()
this.btnReset=Util.GetGameObject(this.rightDown,"btnReset")
this.btnFormat=Util.GetGameObject(this.rightDown,"btnFormat")
this.btnNode=Util.GetGameObject(this.rightDown,"btnNote")
this.btnJiuYuanLu=Util.GetGameObject(this.rightDown,"btnJiuYuanLu")
this.btnJiuYuanLu:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_Map_JiuYuanLu")
this.centerDown = Util.GetGameObject(self.gameObject, "centerDown")
this.BtnBack = Util.GetGameObject(this.centerDown,"bg/btnBack")
this.selectHero = Util.GetGameObject(this.centerDown,"selectHero")
@ -90,7 +92,7 @@ function this:InitComponent()
ctrlView.InitComponent(self.gameObject, this, playerView)
trialPanel:InitComponent(self.gameObject, this)
endLessMapView:InitComponent(self.gameObject, this)
this.spLoader = SpriteLoader.New()
end
function this:OnSortingOrderChange()
@ -265,7 +267,6 @@ end
function this:SetActiveGameObj()
local isShow = MapManager.curCarbonType == CarBonTypeId.TRIAL
LogGreen("MapManager.curCarbonType:"..MapManager.curCarbonType)
this.helpBtn.gameObject:SetActive(true)
this.leftUp.gameObject:SetActive(isShow)
this.btnRightUpShop.gameObject:SetActive(not isShow)
@ -284,7 +285,7 @@ function this:SetActiveGameObj()
this.btnReset .gameObject:SetActive(false)
this.btnFormat.gameObject:SetActive(not isShow)
this.btnNode.gameObject:SetActive(not isShow)
this.btnJiuYuanLu.gameObject:SetActive(not isShow)
this.BtnBack.gameObject:SetActive(true)
this.selectHero.gameObject:SetActive(true)
this.selectHeroTip.gameObject:SetActive(isShow)

View File

@ -43,9 +43,10 @@ function EndLessMapView:InitComponent(gameObject, mapPanel)
this.btnFormatRed = Util.GetGameObject(this.btnFormat, "redpot")
this.btnNote = Util.GetGameObject(gameObject, "rightDown/btnNote")
this.btnNoteRed = Util.GetGameObject(this.btnNote, "redPoint")
this.btnJiuYuanLu=Util.GetGameObject(gameObject,"rightDown/btnJiuYuanLu")
-- 谢置按钮
this.btnSet = Util.GetGameObject(gameObject, "rightUp/btnSetting")
-- 行动力显示
this.energyInfo = Util.GetGameObject(gameObject, "stepROot/bg/energyInfo"):GetComponent("Text")
this.totalEnergy = Util.GetGameObject(gameObject, "stepROot/bg/total"):GetComponent("Text")
@ -108,18 +109,37 @@ function EndLessMapView:BindEvent()
-- end
-- UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Sunro,this.helpPos.x,this.helpPos.y)
-- end)
-- -- 重置
-- Util.AddClick(this.btnReset, function ()
-- if ctrlView.GetCallListCount() > 1 then
-- PopupTipPanel.ShowTip(Language[11259])
-- return
-- end
-- if not this:CanClick() then return end
-- -- 复位角色的状态
-- MsgPanel.ShowTwo(Language[11277], nil, function()
-- this.ResetRoleState()
-- end)
-- end)
-- 重置
Util.AddClick(this.btnJiuYuanLu, function ()
if ctrlView.GetCallListCount() > 1 then
PopupTipPanel.ShowTip(Language[11259])
return
end
if not this:CanClick() then return end
if BagManager.GetItemCountById() < 1 then
PopupTipPanel.ShowTip("九元露数量不足!")
return
end
local isFullHp = true
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ENDLESS_MAP)
for k,v in pairs(curFormation.teamHeroInfos) do
local heroData1 = EndLessMapManager.allHeroBlood[v.heroId]
if heroData1.percentHp < 1 then
isFullHp = false
break
end
end
if isFullHp then
PopupTipPanel.ShowTip("所有神将状态完好,无法使用!")
return
end
MsgPanel.ShowTwo("是否消耗一枚九元露复活所有神将并将血量恢复为100%", function()end, function()
NetManager.RequestAllHeroHp(function ()
PopupTipPanel.ShowTip("已将所有神将复活并恢复至满血!")
this:OnShow()
end)
end, "取消", "确认", "提示",false)
end)
Util.AddClick(this.shiQi, function ()
if ctrlView.GetCallListCount() > 1 then