From 57cdcc08095f5de0dc143f02ec3ccf585dca341a Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 13 Aug 2021 15:34:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7=E8=B8=AA?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=B0=E8=BE=BE=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefab/fx_xunbaomizong_daoda.prefab | 57 ++++---- .../XunBaoMiZong/XunBaoMiZongMapPanel.prefab | 126 ++++++++++++++++++ .../XunBaoMiZong/XunBaoMiZongMapPanel.lua | 2 + .../~Lua/View/PlayerLiveView.lua | 16 +++ 4 files changed, 175 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/XunBaoMiZong/Prefab/fx_xunbaomizong_daoda.prefab b/Assets/ManagedResources/EffectResUI/XunBaoMiZong/Prefab/fx_xunbaomizong_daoda.prefab index baaea0223e..b4218d5c7c 100644 --- a/Assets/ManagedResources/EffectResUI/XunBaoMiZong/Prefab/fx_xunbaomizong_daoda.prefab +++ b/Assets/ManagedResources/EffectResUI/XunBaoMiZong/Prefab/fx_xunbaomizong_daoda.prefab @@ -26,10 +26,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1017084854235112262} m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: -0.8433915} - m_LocalPosition: {x: 0, y: -509.00006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5332606514656888134} + m_Father: {fileID: 8970258559909962647} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &2813700483202503962 @@ -46,7 +46,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -4782,10 +4782,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1274470459874459367} m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: -0.8433915} - m_LocalPosition: {x: 0, y: -509.00006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5332606514656888134} + m_Father: {fileID: 8970258559909962647} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &7006411092006482818 @@ -4802,7 +4802,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -9538,10 +9538,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1610002093815699819} m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: -0.8433915} - m_LocalPosition: {x: 0, y: -509.00006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5332606514656888134} + m_Father: {fileID: 8970258559909962647} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &5924179405920926884 @@ -9558,7 +9558,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -14294,7 +14294,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5332606514656888134} + - component: {fileID: 8970258559909962647} - component: {fileID: 8232287458016581322} - component: {fileID: 6085294020186637718} m_Layer: 5 @@ -14304,15 +14304,15 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5332606514656888134 -Transform: +--- !u!224 &8970258559909962647 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4259295748279899603} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 960739622801779601} @@ -14324,7 +14324,12 @@ Transform: - {fileID: 1908926787249985274} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!198 &8232287458016581322 ParticleSystem: m_ObjectHideFlags: 0 @@ -19017,10 +19022,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6861626690435015270} m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: -0.8433915} - m_LocalPosition: {x: 0, y: -509.00006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5332606514656888134} + m_Father: {fileID: 8970258559909962647} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &8465305514093946520 @@ -19037,7 +19042,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -23773,10 +23778,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7638567950840039468} m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: -0.8433915} - m_LocalPosition: {x: 0, y: -509.00006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5332606514656888134} + m_Father: {fileID: 8970258559909962647} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &562950422001531091 @@ -23793,7 +23798,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -28645,10 +28650,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8664434754571327323} m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: -0.8433915} - m_LocalPosition: {x: 0, y: -509.00006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5332606514656888134} + m_Father: {fileID: 8970258559909962647} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &1908179561349600296 @@ -28665,7 +28670,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 @@ -33401,10 +33406,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8853388223131306580} m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: -0.8433915} - m_LocalPosition: {x: 0, y: -509.00006, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5332606514656888134} + m_Father: {fileID: 8970258559909962647} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!198 &5858729071150800795 @@ -33421,7 +33426,7 @@ ParticleSystem: cullingMode: 0 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} - looping: 0 + looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab index 9c25f667bc..26efe74852 100644 --- a/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongMapPanel.prefab @@ -48119,6 +48119,7 @@ RectTransform: - {fileID: 6697787164710513212} - {fileID: 4074586898896125412} - {fileID: 3237188602323065516} + - {fileID: 8830901838699524529} m_Father: {fileID: 6697065354150255466} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -48866,3 +48867,128 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 408555848786791694} m_PrefabAsset: {fileID: 0} +--- !u!1001 &500296263708725798 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6696865751648667954} + m_Modifications: + - target: {fileID: 4259295748279899603, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_Name + value: fx_xunbaomizong_daoda + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b242715da959c6c40b5e867175fa25df, type: 3} +--- !u!224 &8830901838699524529 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8970258559909962647, guid: b242715da959c6c40b5e867175fa25df, + type: 3} + m_PrefabInstance: {fileID: 500296263708725798} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua index c976d1741b..0270993b73 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongMapPanel.lua @@ -22,6 +22,8 @@ function XunBaoMiZongMap:InitComponent() self.effect:SetActive(false) self.effectLuoDi = Util.GetGameObject(self.gameObject, "mapParent/fx_xunbaomizong_renwuluodi") self.effectLuoDi:SetActive(false) + self.effectDaoda = Util.GetGameObject(self.gameObject, "mapParent/fx_xunbaomizong_daoda") + self.effectDaoda:SetActive(false) end --绑定事件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index aa9fafc7e5..af9254758c 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -451,6 +451,22 @@ function PlayerLiveView:SetSelfDirectingTag(_isShow,_curPos,_targetPos) local angle = math.atan2((_targetPos.y - _curPos.y),(_targetPos.x - _curPos.x))/math.pi*180 self.directImg:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0,0,angle)) end + + if self.SelfTagGo then + destroy(self.SelfTagGo) + self.SelfTagGo = nil + end + self.SelfTagGo = poolManager:LoadAsset("fx_xunbaomizong_daoda", PoolManager.AssetType.GameObject) + self.SelfTagGo.transform:SetParent(self.selfTagParent.transform) + if self.PlayerLiveViewData.ride and self.PlayerLiveViewData.ride > 0 then + self.SelfTagGo.transform.localPosition = Vector3.New(0,-0.95,0) + else + self.SelfTagGo.transform.localPosition = Vector3.New(0,0,10) + end + if self.SelfTagGo then + Util.SetParticleSortLayer(self.SelfTagGo, self:GetSelfTagLayer()) + end + self.SelfTagGo:SetActive(not _isShow) end function PlayerLiveView:SetEffectScale(effectScale)