From f35bad0ee2303a8897fbbd929ec8292b09be6f77 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 21:36:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A5=9E=E5=B7=9E=E4=BB=A4=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 2c90edc6bf..954acba484 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -309,8 +309,8 @@ local jumpDic = { if LimitExchange then if LimitExchange.endTime - GetTimeStamp() > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitExchange) - local data = ConfigManager.GetConfigData(ConfigName.GlobalActivity,id) - if data.ShowArt == 1 then + local tempData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,id) + if tempData.ShowArt == 1 then UIManager.OpenPanel(UIName.ExpertPanel,data[1]) else UIManager.OpenPanel(UIName.DynamicActivityPanel,10) From 04e6526819d40a7696e2bd99dea8139b31c6c49e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 21:48:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A5=9E=E5=B7=9E=E4=BB=A4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Expert/ExpertPanel.prefab | 274 +++++++++--------- 1 file changed, 137 insertions(+), 137 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index 5e0590d125..1d5d594aee 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -5010,7 +5010,7 @@ ParticleSystem: --- !u!199 &391347278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11402,7 +11402,7 @@ ParticleSystem: --- !u!199 &85288511972748413 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16145,7 +16145,7 @@ ParticleSystem: --- !u!199 &85288512077974317 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20843,7 +20843,7 @@ ParticleSystem: --- !u!199 &85288512168349841 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25541,7 +25541,7 @@ ParticleSystem: --- !u!199 &85288512214742610 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30404,7 +30404,7 @@ ParticleSystem: --- !u!199 &85288513168343927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35102,7 +35102,7 @@ ParticleSystem: --- !u!199 &85288513351305705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35269,9 +35269,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4024.799, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4888034357591744792 @@ -40871,7 +40871,7 @@ ParticleSystem: --- !u!199 &414691610813295580 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45569,7 +45569,7 @@ ParticleSystem: --- !u!199 &414691611028988226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50267,7 +50267,7 @@ ParticleSystem: --- !u!199 &414691612045800100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55010,7 +55010,7 @@ ParticleSystem: --- !u!199 &414691612085578008 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -59708,7 +59708,7 @@ ParticleSystem: --- !u!199 &414691612257095240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64406,7 +64406,7 @@ ParticleSystem: --- !u!199 &5899601245091579705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69652,7 +69652,7 @@ ParticleSystem: --- !u!199 &5567085447044821671 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74513,7 +74513,7 @@ ParticleSystem: --- !u!199 &5045489869960765571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74606,9 +74606,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 485.28, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7336756348254092466 @@ -76067,9 +76067,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2451.68, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2610792087471102832 @@ -81453,7 +81453,7 @@ ParticleSystem: --- !u!199 &7424551215614179344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -81619,9 +81619,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} 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: 288.64, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5193350611886973339 @@ -87611,7 +87611,7 @@ ParticleSystem: --- !u!199 &6924675644743089439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88004,9 +88004,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4811.3594, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7104694803552774018 @@ -88168,9 +88168,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5204.6396, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6985404164370400117 @@ -93991,7 +93991,7 @@ ParticleSystem: --- !u!199 &7275324880265961258 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99671,7 +99671,7 @@ ParticleSystem: --- !u!199 &7918083443768115927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -104992,7 +104992,7 @@ ParticleSystem: --- !u!199 &4249202741276730180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109818,7 +109818,7 @@ ParticleSystem: --- !u!199 &7446892149717719861 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109985,9 +109985,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2058.4, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6540571589377791902 @@ -110635,9 +110635,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1075.2, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2091591214573432386 @@ -110890,9 +110890,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5007.9995, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &828438654743180374 @@ -111384,9 +111384,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4418.079, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8500829918028221798 @@ -116444,7 +116444,7 @@ ParticleSystem: --- !u!199 &7994448136678369462 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -121891,7 +121891,7 @@ ParticleSystem: --- !u!199 &6366831406703767530 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -126706,7 +126706,7 @@ ParticleSystem: --- !u!199 &7647035856671918723 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127730,9 +127730,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3631.5193, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3111423472146766828 @@ -132563,7 +132563,7 @@ ParticleSystem: --- !u!199 &3442100318452166299 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -137528,7 +137528,7 @@ ParticleSystem: --- !u!199 &6225703503371946647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -144029,7 +144029,7 @@ ParticleSystem: --- !u!199 &3736263280892008042 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -148801,7 +148801,7 @@ ParticleSystem: --- !u!199 &3736263281027369366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -153719,7 +153719,7 @@ ParticleSystem: --- !u!199 &3736263281144678159 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -158417,7 +158417,7 @@ ParticleSystem: --- !u!199 &3736263281160650038 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -163120,7 +163120,7 @@ ParticleSystem: --- !u!199 &3736263281325203082 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -168258,7 +168258,7 @@ ParticleSystem: --- !u!199 &3736263282101879313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -172956,7 +172956,7 @@ ParticleSystem: --- !u!199 &3736263282140865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -177729,7 +177729,7 @@ ParticleSystem: --- !u!199 &3736263282223057855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -182472,7 +182472,7 @@ ParticleSystem: --- !u!199 &3736263282260434226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -188067,7 +188067,7 @@ ParticleSystem: --- !u!199 &8736007889913585379 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -193068,7 +193068,7 @@ ParticleSystem: --- !u!199 &6218818886541518366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -194461,9 +194461,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1468.48, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6072761654326738142 @@ -194797,8 +194797,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4946239790684712350} - {fileID: 1482589507224464788} + - {fileID: 4946239790684712350} - {fileID: 2701240698224074563} - {fileID: 4634750099348945382} m_Father: {fileID: 3835528897224038430} @@ -199933,7 +199933,7 @@ ParticleSystem: --- !u!199 &3061375693970565652 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -200401,9 +200401,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 681.92, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2970090744457334040 @@ -205362,7 +205362,7 @@ ParticleSystem: --- !u!199 &6371239923318808130 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -205711,9 +205711,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3238.2395, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5909342356548639163 @@ -206569,7 +206569,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -0.00024414062, y: 0.00005340576} - m_SizeDelta: {x: 5296.6396, y: 171.29999} + m_SizeDelta: {x: 0, y: 171.29999} m_Pivot: {x: 0, y: 1} --- !u!114 &4634750099138607164 MonoBehaviour: @@ -213838,7 +213838,7 @@ ParticleSystem: --- !u!199 &1315029844154324974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -218637,7 +218637,7 @@ ParticleSystem: --- !u!199 &8071948387418332622 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -225578,7 +225578,7 @@ ParticleSystem: --- !u!199 &3296716962752466389 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -230978,7 +230978,7 @@ ParticleSystem: --- !u!199 &5208671054231575281 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -235814,7 +235814,7 @@ ParticleSystem: --- !u!199 &6800295426981046828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -236170,7 +236170,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4044160959286852916} - 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} @@ -238936,9 +238936,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2844.9597, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3299863823933065823 @@ -241385,9 +241385,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1665.12, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4812141543563723770 @@ -246840,7 +246840,7 @@ ParticleSystem: --- !u!199 &7443524496537394543 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -247099,7 +247099,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4044160959286852916} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -247637,9 +247637,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2255.04, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3414683730775937444 @@ -253314,7 +253314,7 @@ ParticleSystem: --- !u!199 &3952339559707849751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -254506,9 +254506,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2648.3198, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5308849043795797957 @@ -259703,7 +259703,7 @@ ParticleSystem: --- !u!199 &2759699216698959261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -260588,9 +260588,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3041.5996, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1441453387074889361 @@ -261367,9 +261367,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1861.76, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7352179770144791198 @@ -261485,9 +261485,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1271.84, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3992017690814049748 @@ -266791,7 +266791,7 @@ ParticleSystem: --- !u!199 &4947693289891535506 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -268235,9 +268235,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} 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: 92, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5145611629843184524 @@ -269250,9 +269250,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4221.439, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1384792474935162 @@ -275608,7 +275608,7 @@ ParticleSystem: --- !u!199 &2910122108993515360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -280872,7 +280872,7 @@ ParticleSystem: --- !u!199 &2442695948598551547 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -281079,9 +281079,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3828.1592, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5647456175691312490 @@ -281963,9 +281963,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4614.719, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1015927947184771426 @@ -282480,9 +282480,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 878.56, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8349045289866771031 @@ -283301,9 +283301,9 @@ RectTransform: m_Father: {fileID: 4634750099138607162} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 3434.8794, y: -82} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4550513817588488666 @@ -288146,7 +288146,7 @@ ParticleSystem: --- !u!199 &2047885427326027412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -292844,7 +292844,7 @@ ParticleSystem: --- !u!199 &7335579053258334880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} From 8e3e25a450546685cc81baff99566be87db8320f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 13 Oct 2020 22:30:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E5=B0=BD?= =?UTF-8?q?=E5=89=AF=E6=9C=AC=E8=BF=87=E6=B8=A1=E6=9C=9F=E9=97=B4=E4=BE=9D?= =?UTF-8?q?=E7=84=B6=E5=8F=AF=E4=BB=A5=E8=BF=9B=E5=85=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index c6d419bd87..bba089203e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -419,7 +419,7 @@ function this.BtnClick(id) PopupTipPanel.ShowTip(string.format(Language[12297],config.OpenRules[2])) end elseif id == FUNCTION_OPEN_TYPE.ENDLESS then - if ActTimeCtrlManager.IsQualifiled(id) then + if ActTimeCtrlManager.SingleFuncState(id) then MapManager.curCarbonType = CarBonTypeId.ENDLESS MapManager.SetViewSize(3)--设置视野范围(明雷形式) UIManager.OpenPanel(UIName.EndLessCarbonPanel)