diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 0689c98a73..a4fd43173f 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -483,6 +483,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6861030463589856289} + - {fileID: 1050734882455237459} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -769,6 +770,71 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6642745862761146423} m_CullTransparentMesh: 0 +--- !u!1 &6769170240909951383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1050734882455237459} + - component: {fileID: 2815475153730856752} + - component: {fileID: 1514159423606929313} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1050734882455237459 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769170240909951383} + 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: 6860202946281388347} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2815475153730856752 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769170240909951383} + m_CullTransparentMesh: 0 +--- !u!114 &1514159423606929313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769170240909951383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &6963380778722333028 GameObject: m_ObjectHideFlags: 0 @@ -1357,6 +1423,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1060118990402615570} m_PrefabAsset: {fileID: 0} +--- !u!114 &6343269374145959964 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6246947303874257166, guid: deaae470cdb57aa4ea286389884e0365, + type: 3} + m_PrefabInstance: {fileID: 1060118990402615570} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &6198169270664002646 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6391204382624220484, guid: deaae470cdb57aa4ea286389884e0365, @@ -1381,18 +1459,6 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6343269374145959964 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6246947303874257166, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - m_PrefabInstance: {fileID: 1060118990402615570} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2119202078241853539 PrefabInstance: m_ObjectHideFlags: 0 @@ -1577,9 +1643,9 @@ PrefabInstance: objectReference: {fileID: 4888400141887973814} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d8b4b675ad4261a4c9b8acadba28e99a, type: 3} ---- !u!114 &7645526256901416095 stripped +--- !u!114 &5655410548063161014 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8607142570124375292, guid: d8b4b675ad4261a4c9b8acadba28e99a, + m_CorrespondingSourceObject: {fileID: 5986663662493719253, guid: d8b4b675ad4261a4c9b8acadba28e99a, type: 3} m_PrefabInstance: {fileID: 2119202078241853539} m_PrefabAsset: {fileID: 0} @@ -1595,9 +1661,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2119202078241853539} m_PrefabAsset: {fileID: 0} ---- !u!114 &5655410548063161014 stripped +--- !u!114 &7645526256901416095 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5986663662493719253, guid: d8b4b675ad4261a4c9b8acadba28e99a, + m_CorrespondingSourceObject: {fileID: 8607142570124375292, guid: d8b4b675ad4261a4c9b8acadba28e99a, type: 3} m_PrefabInstance: {fileID: 2119202078241853539} m_PrefabAsset: {fileID: 0} @@ -2002,12 +2068,6 @@ PrefabInstance: objectReference: {fileID: 6234235302447412838} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a4c684ca95a4d74e87043c69b271d6a, type: 3} ---- !u!224 &7821764368879087837 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6412861933773537955, guid: 0a4c684ca95a4d74e87043c69b271d6a, - type: 3} - m_PrefabInstance: {fileID: 3779490626356785790} - m_PrefabAsset: {fileID: 0} --- !u!114 &3104636549177963182 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2262655073909227728, guid: 0a4c684ca95a4d74e87043c69b271d6a, @@ -2068,12 +2128,18 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &6879092932047045747 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7711288600083215885, guid: 0a4c684ca95a4d74e87043c69b271d6a, +--- !u!114 &7154048560512337529 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6285683607521571847, guid: 0a4c684ca95a4d74e87043c69b271d6a, type: 3} m_PrefabInstance: {fileID: 3779490626356785790} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &912117619273950647 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4096882130143467465, guid: 0a4c684ca95a4d74e87043c69b271d6a, @@ -2134,18 +2200,18 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &7154048560512337529 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6285683607521571847, guid: 0a4c684ca95a4d74e87043c69b271d6a, +--- !u!224 &6879092932047045747 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7711288600083215885, guid: 0a4c684ca95a4d74e87043c69b271d6a, + type: 3} + m_PrefabInstance: {fileID: 3779490626356785790} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7821764368879087837 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6412861933773537955, guid: 0a4c684ca95a4d74e87043c69b271d6a, type: 3} m_PrefabInstance: {fileID: 3779490626356785790} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &3842015809728918996 PrefabInstance: m_ObjectHideFlags: 0 @@ -2275,6 +2341,12 @@ PrefabInstance: objectReference: {fileID: 2172484659895526197} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b03925b92b5e2674da7deb5669b5d757, type: 3} +--- !u!224 &5235041654633964864 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9076740770643775636, guid: b03925b92b5e2674da7deb5669b5d757, + type: 3} + m_PrefabInstance: {fileID: 3842015809728918996} + m_PrefabAsset: {fileID: 0} --- !u!114 &2646150542252778896 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1290447182553190468, guid: b03925b92b5e2674da7deb5669b5d757, @@ -2287,12 +2359,6 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &5235041654633964864 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 9076740770643775636, guid: b03925b92b5e2674da7deb5669b5d757, - type: 3} - m_PrefabInstance: {fileID: 3842015809728918996} - m_PrefabAsset: {fileID: 0} --- !u!224 &2172484659895526197 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3132150514659972833, guid: b03925b92b5e2674da7deb5669b5d757, @@ -2311,6 +2377,11 @@ PrefabInstance: propertyPath: m_Name value: page14 objectReference: {fileID: 0} + - target: {fileID: 1080696917594670099, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2132785343472515193, guid: de4a16270d9a08845b2659cf9df3c6ba, type: 3} propertyPath: m_LocalPosition.x @@ -2453,6 +2524,11 @@ PrefabInstance: propertyPath: m_Name value: page15 objectReference: {fileID: 0} + - target: {fileID: 5582749210557865206, guid: 1910443ab55b6a34399d9a379a138f77, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 115914922508147437, guid: 1910443ab55b6a34399d9a379a138f77, type: 3} propertyPath: m_LocalPosition.x @@ -4131,12 +4207,6 @@ PrefabInstance: objectReference: {fileID: 5626730128303579677} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f62796312f388f442931c5eaa802e268, type: 3} ---- !u!224 &7970744253837682630 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4107486288919078871, guid: f62796312f388f442931c5eaa802e268, - type: 3} - m_PrefabInstance: {fileID: 6313339345712709649} - m_PrefabAsset: {fileID: 0} --- !u!114 &6615791768895081999 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 886504479816797726, guid: f62796312f388f442931c5eaa802e268, @@ -4149,6 +4219,18 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &9146028726455511430 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2985961337828551063, guid: f62796312f388f442931c5eaa802e268, + type: 3} + m_PrefabInstance: {fileID: 6313339345712709649} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &2703494022881377554 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8221815702454566147, guid: f62796312f388f442931c5eaa802e268, @@ -4161,9 +4243,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6313339345712709649} m_PrefabAsset: {fileID: 0} ---- !u!114 &5048797215612638812 stripped +--- !u!114 &520987351168892142 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1264828690318399053, guid: f62796312f388f442931c5eaa802e268, + m_CorrespondingSourceObject: {fileID: 5811780502722493695, guid: f62796312f388f442931c5eaa802e268, type: 3} m_PrefabInstance: {fileID: 6313339345712709649} m_PrefabAsset: {fileID: 0} @@ -4173,9 +4255,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6301677124920381331 stripped +--- !u!114 &5048797215612638812 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 65708302807437186, guid: f62796312f388f442931c5eaa802e268, + m_CorrespondingSourceObject: {fileID: 1264828690318399053, guid: f62796312f388f442931c5eaa802e268, type: 3} m_PrefabInstance: {fileID: 6313339345712709649} m_PrefabAsset: {fileID: 0} @@ -4197,9 +4279,27 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &520987351168892142 stripped +--- !u!224 &4315865304793551275 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7816124763777208762, guid: f62796312f388f442931c5eaa802e268, + type: 3} + m_PrefabInstance: {fileID: 6313339345712709649} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5626730128303579677 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5811780502722493695, guid: f62796312f388f442931c5eaa802e268, + m_CorrespondingSourceObject: {fileID: 1840658958385275404, guid: f62796312f388f442931c5eaa802e268, + type: 3} + m_PrefabInstance: {fileID: 6313339345712709649} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6301677124920381331 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 65708302807437186, guid: f62796312f388f442931c5eaa802e268, type: 3} m_PrefabInstance: {fileID: 6313339345712709649} m_PrefabAsset: {fileID: 0} @@ -4221,36 +4321,12 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &4315865304793551275 stripped +--- !u!224 &7970744253837682630 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 7816124763777208762, guid: f62796312f388f442931c5eaa802e268, + m_CorrespondingSourceObject: {fileID: 4107486288919078871, guid: f62796312f388f442931c5eaa802e268, type: 3} m_PrefabInstance: {fileID: 6313339345712709649} m_PrefabAsset: {fileID: 0} ---- !u!114 &9146028726455511430 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2985961337828551063, guid: f62796312f388f442931c5eaa802e268, - type: 3} - m_PrefabInstance: {fileID: 6313339345712709649} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5626730128303579677 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1840658958385275404, guid: f62796312f388f442931c5eaa802e268, - type: 3} - m_PrefabInstance: {fileID: 6313339345712709649} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &6376255663540187661 PrefabInstance: m_ObjectHideFlags: 0 @@ -4450,12 +4526,6 @@ PrefabInstance: objectReference: {fileID: 6227180720393762595} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89a5d87f170edf349b83b674fa863394, type: 3} ---- !u!224 &3116092294729522290 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8305649059906842239, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - m_PrefabInstance: {fileID: 6376255663540187661} - m_PrefabAsset: {fileID: 0} --- !u!114 &1825922775255076021 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4696121541652217528, guid: 89a5d87f170edf349b83b674fa863394, @@ -4468,6 +4538,30 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &9006077471151050263 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2630384758382263322, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + m_PrefabInstance: {fileID: 6376255663540187661} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &3116092294729522290 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8305649059906842239, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + m_PrefabInstance: {fileID: 6376255663540187661} + m_PrefabAsset: {fileID: 0} +--- !u!224 &3104875318434792652 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8316944653447182017, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + m_PrefabInstance: {fileID: 6376255663540187661} + m_PrefabAsset: {fileID: 0} --- !u!224 &2761425220567103007 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9092643564979373074, guid: 89a5d87f170edf349b83b674fa863394, @@ -4486,30 +4580,6 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8265024645578019278 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3084480440118305731, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - m_PrefabInstance: {fileID: 6376255663540187661} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8690910985215967337 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2369266965726638692, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - m_PrefabInstance: {fileID: 6376255663540187661} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &4775956017113673258 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1889990186923826215, guid: 89a5d87f170edf349b83b674fa863394, @@ -4522,27 +4592,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3092885584669339262 stripped +--- !u!114 &8265024645578019278 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8255416646026845299, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - m_PrefabInstance: {fileID: 6376255663540187661} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &3104875318434792652 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8316944653447182017, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - m_PrefabInstance: {fileID: 6376255663540187661} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1971976558805531090 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4837108464849423327, guid: 89a5d87f170edf349b83b674fa863394, + m_CorrespondingSourceObject: {fileID: 3084480440118305731, guid: 89a5d87f170edf349b83b674fa863394, type: 3} m_PrefabInstance: {fileID: 6376255663540187661} m_PrefabAsset: {fileID: 0} @@ -4558,6 +4610,42 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 6376255663540187661} m_PrefabAsset: {fileID: 0} +--- !u!114 &3092885584669339262 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8255416646026845299, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + m_PrefabInstance: {fileID: 6376255663540187661} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1971976558805531090 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4837108464849423327, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + m_PrefabInstance: {fileID: 6376255663540187661} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8690910985215967337 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2369266965726638692, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + m_PrefabInstance: {fileID: 6376255663540187661} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &6227180720393762595 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1015105837294257454, guid: 89a5d87f170edf349b83b674fa863394, @@ -4570,18 +4658,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &9006077471151050263 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2630384758382263322, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - m_PrefabInstance: {fileID: 6376255663540187661} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &7286108774967034151 PrefabInstance: m_ObjectHideFlags: 0 @@ -4711,9 +4787,9 @@ PrefabInstance: objectReference: {fileID: 7859975813896031597} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} ---- !u!224 &3420004544605557510 stripped +--- !u!224 &2501822414544174525 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5362442799854375457, guid: 21a0388ffc0aa1f49b934cc2e19fd213, + m_CorrespondingSourceObject: {fileID: 5162593471303236762, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} m_PrefabInstance: {fileID: 7286108774967034151} m_PrefabAsset: {fileID: 0} @@ -4729,9 +4805,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2501822414544174525 stripped +--- !u!224 &3420004544605557510 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5162593471303236762, guid: 21a0388ffc0aa1f49b934cc2e19fd213, + m_CorrespondingSourceObject: {fileID: 5362442799854375457, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} m_PrefabInstance: {fileID: 7286108774967034151} m_PrefabAsset: {fileID: 0} @@ -5054,30 +5130,24 @@ PrefabInstance: objectReference: {fileID: 1824437790592874152} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d24762ab721f88e45867492426bb9b60, type: 3} ---- !u!114 &8694611805940246952 stripped +--- !u!114 &4204696531184250858 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 671075235705107340, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 5450271681491908046, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1834025416659279226 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7532992095368005470, guid: d24762ab721f88e45867492426bb9b60, +--- !u!224 &9030193364607778381 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 912230736054379625, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &6907440336417090192 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3325200666915745972, guid: d24762ab721f88e45867492426bb9b60, @@ -5126,6 +5196,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8509160507258711144 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 571896017353438796, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4772442103649970274 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3729625693295964742, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &2406725831522499579 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5809428446582432223, guid: d24762ab721f88e45867492426bb9b60, @@ -5138,6 +5232,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8336659688940764895 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 164548311470974203, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &8485777126462822162 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 304799287459204406, guid: d24762ab721f88e45867492426bb9b60, @@ -5174,18 +5280,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5749188565746595049 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4481200970422808269, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &5196412258072856466 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4171469508773731766, guid: d24762ab721f88e45867492426bb9b60, @@ -5234,9 +5328,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &9130994384632033688 stripped +--- !u!114 &8694611805940246952 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1102989399415319484, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 671075235705107340, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} @@ -5246,108 +5340,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5842379324634663774 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2372580111964721530, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &620792743811278623 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8747164437334277435, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4099090385632858331 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5267998789425318655, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1824437790592874152 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7541524421193362572, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4046406892700477551 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5322953086839648843, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &9030193364607778381 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 912230736054379625, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1637787080087793375 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7441005053594612987, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4772442103649970274 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3729625693295964742, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4204696531184250858 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5450271681491908046, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2313077945122374539 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5899961951742630319, guid: d24762ab721f88e45867492426bb9b60, @@ -5360,45 +5352,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &7131190453037157839 stripped +--- !u!114 &2516455131533751826 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1373114029220829163, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4431546127863328003 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5510532072691922727, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1873517181481440471 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7780326742512963315, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8361638921861515157 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 428922012050464177, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 5986808498065304630, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} @@ -5420,6 +5376,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4431546127863328003 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5510532072691922727, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4046406892700477551 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5322953086839648843, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4099090385632858331 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5267998789425318655, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &620792743811278623 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8747164437334277435, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5842379324634663774 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2372580111964721530, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1824437790592874152 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7541524421193362572, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &9130994384632033688 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1102989399415319484, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1873517181481440471 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7780326742512963315, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &4374592468057059694 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5570100256879422282, guid: d24762ab721f88e45867492426bb9b60, @@ -5432,66 +5484,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8336659688940764895 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 164548311470974203, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8509160507258711144 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 571896017353438796, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2516455131533751826 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5986808498065304630, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5031802353697765801 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3759900496976864141, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6952764642028945546 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1262268600873900718, guid: d24762ab721f88e45867492426bb9b60, - type: 3} - m_PrefabInstance: {fileID: 8212687754618722852} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &244486253005428038 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8258971643551223650, guid: d24762ab721f88e45867492426bb9b60, @@ -5504,6 +5496,90 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6556984899007747114 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3100239088684027406, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6952764642028945546 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1262268600873900718, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5031802353697765801 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3759900496976864141, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &8361638921861515157 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 428922012050464177, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1637787080087793375 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7441005053594612987, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7131190453037157839 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1373114029220829163, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1834025416659279226 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7532992095368005470, guid: d24762ab721f88e45867492426bb9b60, + type: 3} + m_PrefabInstance: {fileID: 8212687754618722852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &8341143379706673176 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 160130356102275644, guid: d24762ab721f88e45867492426bb9b60, @@ -5516,9 +5592,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6556984899007747114 stripped +--- !u!114 &5749188565746595049 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3100239088684027406, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 4481200970422808269, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 63bc074929..5cfebb884e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -201,6 +201,8 @@ local curActivityCount = { --初始化组件(用于子类重写) function DynamicActivityPanel:InitComponent() orginLayer = 0 + this.mask = Util.GetGameObject(self.gameObject,"mask") + this.mask:SetActive(false) this.tabbox = Util.GetGameObject(self.gameObject, "bg/tabbox") this.btnBack = Util.GetGameObject(self.gameObject, "bg/btnBack") this.content = Util.GetGameObject(self.gameObject, "bg/pageContent") @@ -274,6 +276,7 @@ function DynamicActivityPanel:OnShow() this.btnBack:SetActive(true) this.tabList:SetActive(true) this.bottomBar:SetActive(true) + this.mask:SetActive(false) if _CurPageIndex then this.PageTabCtrl:ChangeTab(_CurPageIndex) end @@ -334,6 +337,7 @@ end -- tab改变事件 function this.OnPageTabChange(index) _CurPageIndex = index + this.mask:SetActive(false) for i = 1, #this.PageList do if this.PageList[i] then this.PageList[i]:OnHide() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index 218a74ff47..3af9934ac7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -211,8 +211,10 @@ function XiangYaoDuoBao:refreshBtnShow() end local recruitOne = function() RoleLiveGOGraphic.AnimationState:SetAnimation(0, "hit1", true) + this.mainPanel.mask:SetActive(true) Timer.New(function () RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true) + this.mainPanel.mask:SetActive(false) RecruitManager.RecruitRequest(singleRecruit.Id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 if not isFree and d[1] == 16 then @@ -240,8 +242,10 @@ function XiangYaoDuoBao:refreshBtnShow() end local recruitTen = function() RoleLiveGOGraphic.AnimationState:SetAnimation(0, "hit3", true) + this.mainPanel.mask:SetActive(true) Timer.New(function () RoleLiveGOGraphic.AnimationState:SetAnimation(0, "idle", true) + this.mainPanel.mask:SetActive(false) RecruitManager.RecruitRequest(tenRecruit.Id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 if d[1] == 16 then