From 8a9b32f050c39e0c7b57c48da40b5b197e1bff64 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Sat, 17 Oct 2020 20:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=20=E9=80=8D=E9=81=A5=E6=B8=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab | 89 +++++++++++++++++-- .../ManagedResources/~Lua/Logic/GameEvent.lua | 1 + .../Modules/XiaoYao/XiaoYaoEventPanel.lua | 3 + .../~Lua/Modules/XiaoYao/XiaoYaoManager.lua | 10 +++ .../~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua | 67 +++++++------- 5 files changed, 131 insertions(+), 39 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 2d9ae37707..8186d5b862 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -1380,12 +1380,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4574879409623873685} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -93.6, y: 1.3} - m_SizeDelta: {x: 62, y: 68} + m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &864221242355389655 CanvasRenderer: @@ -2148,7 +2148,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4574879409623873685} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2176,7 +2176,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.627451, g: 0.69803923, b: 0.69803923, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2812,7 +2812,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4574879409623873685} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2977,6 +2977,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 59:10 +--- !u!1 &7932815105881836287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8613404051729017856} + - component: {fileID: 4349528862647481202} + - component: {fileID: 2232512025210765800} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8613404051729017856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7932815105881836287} + 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: 4574879409623873685} + 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: 9.08, y: 4.07} + m_SizeDelta: {x: 182.28, y: 41.57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4349528862647481202 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7932815105881836287} + m_CullTransparentMesh: 0 +--- !u!114 &2232512025210765800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7932815105881836287} + 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: 75857acfa9133a247a614d3db9217443, 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 &8025299306218942977 GameObject: m_ObjectHideFlags: 0 @@ -3007,7 +3081,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4574879409623873685} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3196,6 +3270,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8613404051729017856} - {fileID: 2709470507710810026} - {fileID: 8703073719217821850} - {fileID: 8218294632679566696} @@ -3322,7 +3397,7 @@ RectTransform: m_Children: - {fileID: 5013011474490224316} m_Father: {fileID: 4574879409623873685} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 8ca99b5d0c..3794835477 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -407,5 +407,6 @@ GameEvent = { XiaoYao={ StartXiaoYao="XiaoYao.StartXiaoYao",--执行逍遥游跑图 RefreshEventShow="XiaoYao.RefreshEventShow",--刷新逍遥游地图界面事件按钮显示隐藏 + PlayEventEffect="XiaoYao.PlayEventEffect",--播放事件特效 } } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua index 524a86f5c8..9bb8908ac7 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoEventPanel.lua @@ -101,6 +101,9 @@ function this:OnClose() do destroy(this.grid.transform:GetChild(0).gameObject) end + if triggertype>0 then + Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.PlayEventEffect) + end end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index e33d6ee058..51551ecc61 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -69,6 +69,16 @@ function this.StartXiaoYao() end) end +function this.GetCostMaxValue() + local vleTable=ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig,39).Condition + if VipManager.GetVipLevel()+1>#vleTable then + return vleTable[#vleTable][2] + else + return vleTable[VipManager.GetVipLevel()+1][2] + end + +end + --初始化幸运转盘 function this.InitLuckyTurnTables(msg) this.luckyTurnTableRewards = {} diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index 562d718ee7..0878b539e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -14,7 +14,7 @@ local shopLeftTime=0 local rouleLeftTime=0 local bossLeftTime=0 local isPlayMove=0 - +local targetBtn --初始化组件(用于子类重写) function this:InitComponent() @@ -41,6 +41,8 @@ function this:InitComponent() -- 逍遥点刷新倒计时显示 this.bgTime = Util.GetGameObject(self.gameObject, "costProp/Bgtime") + this.costIcon=Util.GetGameObject(self.gameObject, "costProp/icon"):GetComponent("Image") + this.costInfo=Util.GetGameObject(self.gameObject, "costProp/energyInfo"):GetComponent("Text") this.addItmBtn = Util.GetGameObject(self.gameObject, "costProp/add") this.actCountTime = Util.GetGameObject(this.bgTime, "time"):GetComponent("Text") @@ -121,12 +123,14 @@ end function this:AddListener() Game.GlobalEvent:AddEvent(GameEvent.XiaoYao.StartXiaoYao, this.RunMap) Game.GlobalEvent:AddEvent(GameEvent.XiaoYao.RefreshEventShow, this.RefreshEventBtn) + Game.GlobalEvent:AddEvent(GameEvent.XiaoYao.PlayEventEffect, this.PlayEffect) end --移除事件监听(用于子类重写) function this:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.XiaoYao.StartXiaoYao, this.RunMap) Game.GlobalEvent:RemoveEvent(GameEvent.XiaoYao.RefreshEventShow, this.RefreshEventBtn) + Game.GlobalEvent:RemoveEvent(GameEvent.XiaoYao.PlayEventEffect, this.PlayEffect) end --刷新界面事件入口按钮显示隐藏 function this.RefreshEventBtn() @@ -187,7 +191,15 @@ function this.MoveTT(targetIndex,_data) this.StopAuto() end if isAuto then - XiaoYaoManager.StartXiaoYao() + if priThread then + coroutine.stop(priThread) + priThread = nil + end + priThread = coroutine.start(function() + coroutine.wait(1) + XiaoYaoManager.StartXiaoYao() + end) + end else this.MoveTT(targetIndex,_data) @@ -203,10 +215,7 @@ function this.StopAuto() end --事件触发处理 function this.EventTrigger(_data) - if priThread then - coroutine.stop(priThread) - priThread = nil - end + Util.GetGameObject(this.gridParent.transform:GetChild(curGridIndex-1).gameObject,"eventPoint"):SetActive(false) Log("触发事件类型为:".._data.pathType) Log("触发事件时间为:".._data.overTime) @@ -220,29 +229,14 @@ function this.EventTrigger(_data) PopupTipPanel.ShowTip("骰子x2") saiNum=2 elseif _data.pathType==4 then --东海寻仙节点 - priThread = coroutine.start(function() - this.PlayEffect(this.shopBtn) - coroutine.wait(2) - this.shopBtn:SetActive(true) - shopLeftTime=_data.overTime - UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType,allGridData[curGridIndex].eventData) - end) + targetBtn=this.shopBtn + this.SetEventBtn(_data) elseif _data.pathType==5 then --怪物节点 - priThread = coroutine.start(function() - this.PlayEffect(this.bossBtn) - coroutine.wait(2) - this.bossBtn:SetActive(true) - bossLeftTime=_data.overTime - UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType,allGridData[curGridIndex].eventData) - end) + targetBtn=this.bossBtn + this.SetEventBtn(_data) elseif _data.pathType==6 then --转盘 - priThread = coroutine.start(function() - this.PlayEffect(this.rouleBtn) - coroutine.wait(2) - this.rouleBtn:SetActive(true) - rouleLeftTime=_data.overTime - UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType,allGridData[curGridIndex].eventData) - end) + targetBtn=this.rouleBtn + this.SetEventBtn(_data) elseif _data.pathType==7 then --终极大奖 UIManager.OpenPanel(UIName.XiaoYaoEventPanel,0,_data.drop) end @@ -260,13 +254,21 @@ function this.EventTrigger(_data) end end -function this.PlayEffect(_btnObj) - -- local v2 = RectTransformUtility.WorldToScreenPoint(TileMapView.GetCamera(), TileMapView.GetLiveTilePos(u, v)) - -- this.TT.transform.position +function this.SetEventBtn(_data) + targetBtn:SetActive(true) + shopLeftTime=_data.overTime + if isAuto then + this.PlayEffect() + PopupTipPanel.ShowTip(string.format("触发仙缘★%s★",allGridData[curGridIndex].eventData.Desc)) + else + UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType,allGridData[curGridIndex].eventData) + end +end +function this.PlayEffect() this.moneyEffect.transform.position =this.TT.transform.position Util.ClearTrailRender(this.moneyEffect) this.moneyEffect:SetActive(true) - this.moneyEffect:GetComponent("RectTransform"):DOMove(_btnObj.transform.position, 0.6, false):OnComplete(function () + this.moneyEffect:GetComponent("RectTransform"):DOMove(targetBtn.transform.position, 0.6, false):OnComplete(function () -- 这些该死的延迟动画 if isPlayMove==1 then return end if this.moneyEffect then @@ -341,6 +343,8 @@ function this:OnOpen(_mapData) Log(mapBg[i]) this.mapParent.transform:GetChild(i-1):GetComponent("Image").sprite=Util.LoadSprite(mapBg[i]) end + local costItemId=mapConfig.Consume[1] + this.costIcon.sprite=Util.LoadSprite(GetResourcePath(itemConfig[costItemId].ResourceID)) end local npc local scale @@ -516,7 +520,6 @@ function this:OnDestroy() eventTimer:Stop() eventTimer = nil end - this.liveNode=nil if this.liveNode then poolManager:UnLoadLive(npc, this.liveNode) this.liveNode = nil