From 3d9d5b0ed3f5966c6aa48e73035c4941a933dd61 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 4 Mar 2021 16:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=9020201001=E4=B8=BB=E9=A2=98=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivityPanel.prefab | 1075 +++++++---------- .../~Lua/Modules/Expert/Expert.lua | 1 + .../~Lua/Modules/Popup/TrialRewardPopup.lua | 2 +- 3 files changed, 415 insertions(+), 663 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 5bde3b1896..9df59c8d84 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -959,7 +959,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.0000022485196, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8625427577928505908 @@ -1420,36 +1420,6 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 2384391498656167656} - - target: {fileID: 6777248067166264328, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6777248067166264328, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6777248067166264328, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 330.2 - objectReference: {fileID: 0} - - target: {fileID: 6777248067166264328, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 6777248067166264328, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - propertyPath: m_SizeDelta.x - value: 660.4 - objectReference: {fileID: 0} - - target: {fileID: 6777248067166264328, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - propertyPath: m_SizeDelta.y - value: 44 - objectReference: {fileID: 0} - target: {fileID: 8196360684408907674, guid: deaae470cdb57aa4ea286389884e0365, type: 3} propertyPath: m_TargetGraphic @@ -1462,12 +1432,6 @@ PrefabInstance: objectReference: {fileID: 6198169270664002646} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: deaae470cdb57aa4ea286389884e0365, type: 3} ---- !u!224 &1387638985596069517 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2159386775367720863, guid: deaae470cdb57aa4ea286389884e0365, - type: 3} - m_PrefabInstance: {fileID: 1060118990402615570} - m_PrefabAsset: {fileID: 0} --- !u!114 &6343269374145959964 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6246947303874257166, guid: deaae470cdb57aa4ea286389884e0365, @@ -1504,6 +1468,12 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1387638985596069517 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2159386775367720863, guid: deaae470cdb57aa4ea286389884e0365, + type: 3} + m_PrefabInstance: {fileID: 1060118990402615570} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2119202078241853539 PrefabInstance: m_ObjectHideFlags: 0 @@ -1651,6 +1621,161 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 7633728912197896232} + - target: {fileID: 382480632067364934, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 382480632067364934, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 382480632067364934, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 197.76785 + objectReference: {fileID: 0} + - target: {fileID: 382480632067364934, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 382480632067364934, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_SizeDelta.x + value: 104.46429 + objectReference: {fileID: 0} + - target: {fileID: 4329518168687154777, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4329518168687154777, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4329518168687154777, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 39.28572 + objectReference: {fileID: 0} + - target: {fileID: 4329518168687154777, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.50012 + objectReference: {fileID: 0} + - target: {fileID: 4329518168687154777, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_SizeDelta.x + value: 78.57143 + objectReference: {fileID: 0} + - target: {fileID: 4294791630219163533, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4294791630219163533, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4294791630219163533, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 112.05357 + objectReference: {fileID: 0} + - target: {fileID: 4294791630219163533, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 4294791630219163533, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_SizeDelta.x + value: 66.96429 + objectReference: {fileID: 0} + - target: {fileID: 6545266375360145035, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6545266375360145035, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6545266375360145035, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 200.49998 + objectReference: {fileID: 0} + - target: {fileID: 6545266375360145035, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.499996 + objectReference: {fileID: 0} + - target: {fileID: 6545266375360145035, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_SizeDelta.x + value: 99 + objectReference: {fileID: 0} + - target: {fileID: 4983096436393535421, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4983096436393535421, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4983096436393535421, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 110.5 + objectReference: {fileID: 0} + - target: {fileID: 4983096436393535421, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 4983096436393535421, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_SizeDelta.x + value: 81 + objectReference: {fileID: 0} + - target: {fileID: 5134222950441254474, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5134222950441254474, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5134222950441254474, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 5134222950441254474, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 5134222950441254474, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_SizeDelta.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 9029202024397859050, guid: d8b4b675ad4261a4c9b8acadba28e99a, + type: 3} + propertyPath: m_Content + value: + objectReference: {fileID: 0} - target: {fileID: 2208882108859303264, guid: d8b4b675ad4261a4c9b8acadba28e99a, type: 3} propertyPath: m_TargetGraphic @@ -1681,11 +1806,6 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 4888400141887973814} - - target: {fileID: 9029202024397859050, guid: d8b4b675ad4261a4c9b8acadba28e99a, - type: 3} - propertyPath: m_Content - value: - objectReference: {fileID: 1630437927910074870} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d8b4b675ad4261a4c9b8acadba28e99a, type: 3} --- !u!114 &5655410548063161014 stripped @@ -1748,12 +1868,6 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &1630437927910074870 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 849088679854438805, guid: d8b4b675ad4261a4c9b8acadba28e99a, - type: 3} - m_PrefabInstance: {fileID: 2119202078241853539} - m_PrefabAsset: {fileID: 0} --- !u!114 &2614881911730648388 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4116578344041751847, guid: d8b4b675ad4261a4c9b8acadba28e99a, @@ -1911,16 +2025,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4638242344056208905, guid: 9f18827178d1d304198ddcb31a6d58f1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -2.5999985 + objectReference: {fileID: 0} + - target: {fileID: 4638242344056208905, guid: 9f18827178d1d304198ddcb31a6d58f1, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.7999992 + objectReference: {fileID: 0} + - target: {fileID: 278764310067605940, guid: 9f18827178d1d304198ddcb31a6d58f1, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7378694222030847471, guid: 9f18827178d1d304198ddcb31a6d58f1, type: 3} propertyPath: m_TargetGraphic value: objectReference: {fileID: 9101298824903151865} - - target: {fileID: 5356825993824091972, guid: 9f18827178d1d304198ddcb31a6d58f1, - type: 3} - propertyPath: m_SizeDelta.x - value: 91 - objectReference: {fileID: 0} - target: {fileID: 4867126750866198598, guid: 9f18827178d1d304198ddcb31a6d58f1, type: 3} propertyPath: m_TargetGraphic @@ -1953,12 +2077,18 @@ PrefabInstance: objectReference: {fileID: 3630287341726360563} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f18827178d1d304198ddcb31a6d58f1, type: 3} ---- !u!224 &3607231918924749582 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2078386161070176561, guid: 9f18827178d1d304198ddcb31a6d58f1, +--- !u!114 &9101298824903151865 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5807057938867647174, guid: 9f18827178d1d304198ddcb31a6d58f1, type: 3} m_PrefabInstance: {fileID: 3375623167616295487} 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 &6778180302063688670 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8126869155293395425, guid: 9f18827178d1d304198ddcb31a6d58f1, @@ -1983,9 +2113,15 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &9101298824903151865 stripped +--- !u!224 &7246251937978359163 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5356825993824091972, guid: 9f18827178d1d304198ddcb31a6d58f1, + type: 3} + m_PrefabInstance: {fileID: 3375623167616295487} + m_PrefabAsset: {fileID: 0} +--- !u!114 &628814322475970019 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5807057938867647174, guid: 9f18827178d1d304198ddcb31a6d58f1, + m_CorrespondingSourceObject: {fileID: 2765597378236026844, guid: 9f18827178d1d304198ddcb31a6d58f1, type: 3} m_PrefabInstance: {fileID: 3375623167616295487} m_PrefabAsset: {fileID: 0} @@ -1995,9 +2131,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &7246251937978359163 stripped +--- !u!224 &3607231918924749582 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 5356825993824091972, guid: 9f18827178d1d304198ddcb31a6d58f1, + m_CorrespondingSourceObject: {fileID: 2078386161070176561, guid: 9f18827178d1d304198ddcb31a6d58f1, type: 3} m_PrefabInstance: {fileID: 3375623167616295487} m_PrefabAsset: {fileID: 0} @@ -2019,18 +2155,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3375623167616295487} m_PrefabAsset: {fileID: 0} ---- !u!114 &628814322475970019 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2765597378236026844, guid: 9f18827178d1d304198ddcb31a6d58f1, - type: 3} - m_PrefabInstance: {fileID: 3375623167616295487} - 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 &3779490626356785790 PrefabInstance: m_ObjectHideFlags: 0 @@ -2206,7 +2330,7 @@ PrefabInstance: - target: {fileID: 1550000987889676367, guid: 0a4c684ca95a4d74e87043c69b271d6a, type: 3} propertyPath: m_AnchoredPosition.x - value: 133.33333 + value: 133.33331 objectReference: {fileID: 0} - target: {fileID: 1550000987889676367, guid: 0a4c684ca95a4d74e87043c69b271d6a, type: 3} @@ -2238,6 +2362,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -100 objectReference: {fileID: 0} + - target: {fileID: 275031796987483176, guid: 0a4c684ca95a4d74e87043c69b271d6a, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1.8199997 + objectReference: {fileID: 0} - target: {fileID: 724245609048316161, guid: 0a4c684ca95a4d74e87043c69b271d6a, type: 3} propertyPath: m_AnchorMin.y @@ -2414,12 +2543,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3779490626356785790} m_PrefabAsset: {fileID: 0} ---- !u!224 &912117619273950647 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4096882130143467465, guid: 0a4c684ca95a4d74e87043c69b271d6a, +--- !u!114 &3884959147802552966 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 115219411610556664, 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: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &4882289232884755123 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8624976593156397261, guid: 0a4c684ca95a4d74e87043c69b271d6a, @@ -2462,18 +2597,12 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3884959147802552966 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 115219411610556664, guid: 0a4c684ca95a4d74e87043c69b271d6a, +--- !u!224 &912117619273950647 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4096882130143467465, 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: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &3842015809728918996 PrefabInstance: m_ObjectHideFlags: 0 @@ -2596,11 +2725,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3132150514659972833, guid: b03925b92b5e2674da7deb5669b5d757, - type: 3} - propertyPath: m_SizeDelta.x - value: 91 - objectReference: {fileID: 0} - target: {fileID: 2498204142229895651, guid: b03925b92b5e2674da7deb5669b5d757, type: 3} propertyPath: m_TargetGraphic @@ -2613,6 +2737,12 @@ PrefabInstance: objectReference: {fileID: 2172484659895526197} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b03925b92b5e2674da7deb5669b5d757, type: 3} +--- !u!224 &2172484659895526197 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3132150514659972833, guid: b03925b92b5e2674da7deb5669b5d757, + type: 3} + m_PrefabInstance: {fileID: 3842015809728918996} + m_PrefabAsset: {fileID: 0} --- !u!224 &5235041654633964864 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9076740770643775636, guid: b03925b92b5e2674da7deb5669b5d757, @@ -2631,12 +2761,6 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2172484659895526197 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3132150514659972833, guid: b03925b92b5e2674da7deb5669b5d757, - type: 3} - m_PrefabInstance: {fileID: 3842015809728918996} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4121163472903302309 PrefabInstance: m_ObjectHideFlags: 0 @@ -2779,11 +2903,91 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 4031475575583333089} + - target: {fileID: 4365897499498390789, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4365897499498390789, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4365897499498390789, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 110.5 + objectReference: {fileID: 0} + - target: {fileID: 4365897499498390789, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 4365897499498390789, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_SizeDelta.x + value: 81 + objectReference: {fileID: 0} + - target: {fileID: 4535450247809940722, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4535450247809940722, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4535450247809940722, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 4535450247809940722, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 4535450247809940722, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_SizeDelta.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 2550231996869125171, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2550231996869125171, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2550231996869125171, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 200.49998 + objectReference: {fileID: 0} + - target: {fileID: 2550231996869125171, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -37.499996 + objectReference: {fileID: 0} + - target: {fileID: 2550231996869125171, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_SizeDelta.x + value: 99 + objectReference: {fileID: 0} - target: {fileID: 5211004391847569921, guid: de4a16270d9a08845b2659cf9df3c6ba, type: 3} propertyPath: m_Content value: objectReference: {fileID: 1820968274809341903} + - target: {fileID: 5018350013322679521, guid: de4a16270d9a08845b2659cf9df3c6ba, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 55.910004 + objectReference: {fileID: 0} - target: {fileID: 2387597702530308170, guid: de4a16270d9a08845b2659cf9df3c6ba, type: 3} propertyPath: m_TargetGraphic @@ -3251,11 +3455,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 56 objectReference: {fileID: 0} - - target: {fileID: 6840287122256313197, guid: c43bb920e0a8da34da5a242db2738797, - type: 3} - propertyPath: m_SizeDelta.x - value: 78 - objectReference: {fileID: 0} - target: {fileID: 2705389858058645174, guid: c43bb920e0a8da34da5a242db2738797, type: 3} propertyPath: m_Content @@ -3397,6 +3596,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 5112065382213505902, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_SizeDelta.y + value: 143 + objectReference: {fileID: 0} + - target: {fileID: 685019387835848935, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_SizeDelta.y + value: 105 + objectReference: {fileID: 0} - target: {fileID: 5783195196384012624, guid: f62796312f388f442931c5eaa802e268, type: 3} propertyPath: m_SizeDelta.x @@ -3452,6 +3661,46 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 520987351168892142} + - target: {fileID: 9122324941638141533, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9122324941638141533, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9122324941638141533, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 9122324941638141533, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_SizeDelta.y + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 8012878090486092443, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8012878090486092443, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8012878090486092443, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -62 + objectReference: {fileID: 0} + - target: {fileID: 8012878090486092443, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_SizeDelta.y + value: 70 + objectReference: {fileID: 0} - target: {fileID: 1544386684006554195, guid: f62796312f388f442931c5eaa802e268, type: 3} propertyPath: m_AnchoredPosition.x @@ -4292,6 +4541,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 29 objectReference: {fileID: 0} + - target: {fileID: 672633008493064671, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_Padding.m_Top + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 672633008493064671, guid: f62796312f388f442931c5eaa802e268, + type: 3} + propertyPath: m_Padding.m_Bottom + value: 46 + objectReference: {fileID: 0} - target: {fileID: 3967433907055716426, guid: f62796312f388f442931c5eaa802e268, type: 3} propertyPath: m_TargetGraphic @@ -4657,9 +4916,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} @@ -4747,9 +5006,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5048797215612638812 stripped +--- !u!114 &6301677124920381331 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1264828690318399053, guid: f62796312f388f442931c5eaa802e268, + m_CorrespondingSourceObject: {fileID: 65708302807437186, guid: f62796312f388f442931c5eaa802e268, type: 3} m_PrefabInstance: {fileID: 6313339345712709649} m_PrefabAsset: {fileID: 0} @@ -4881,81 +5140,31 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 5444660753863655172, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5444660753863655172, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5444660753863655172, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 5444660753863655172, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -250.20001 - objectReference: {fileID: 0} - - target: {fileID: 1469120208848981043, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1469120208848981043, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1469120208848981043, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 1469120208848981043, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -83.9 - objectReference: {fileID: 0} - target: {fileID: 2144173563730145730, guid: 89a5d87f170edf349b83b674fa863394, type: 3} propertyPath: m_TargetGraphic value: objectReference: {fileID: 4367348294980796466} + - target: {fileID: 6727692027123842332, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -63 + objectReference: {fileID: 0} - target: {fileID: 5826742634065824446, guid: 89a5d87f170edf349b83b674fa863394, type: 3} propertyPath: m_Content value: objectReference: {fileID: 3116092294729522290} - - target: {fileID: 5716904653788717692, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5716904653788717692, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5716904653788717692, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 39.666668 - objectReference: {fileID: 0} - - target: {fileID: 5716904653788717692, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -38.17 - objectReference: {fileID: 0} - target: {fileID: 4710109163762559932, guid: 89a5d87f170edf349b83b674fa863394, type: 3} propertyPath: m_TargetGraphic value: objectReference: {fileID: 1971976558805531090} + - target: {fileID: 8858661580248806551, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7689096912241480523, guid: 89a5d87f170edf349b83b674fa863394, type: 3} propertyPath: m_TargetGraphic @@ -4966,111 +5175,11 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 3092885584669339262} - - target: {fileID: 2065611961039172379, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2065611961039172379, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2065611961039172379, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 207.33334 - objectReference: {fileID: 0} - - target: {fileID: 2065611961039172379, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -38.17 - objectReference: {fileID: 0} - - target: {fileID: 2094135602344357009, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2094135602344357009, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2094135602344357009, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 117.8 - objectReference: {fileID: 0} - - target: {fileID: 2094135602344357009, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -38.17 - objectReference: {fileID: 0} - - target: {fileID: 2209493361178305619, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2209493361178305619, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2209493361178305619, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 193.55 - objectReference: {fileID: 0} - - target: {fileID: 2209493361178305619, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -38.17 - objectReference: {fileID: 0} - target: {fileID: 1475202660468340993, guid: 89a5d87f170edf349b83b674fa863394, type: 3} propertyPath: m_TargetGraphic value: objectReference: {fileID: 1825922775255076021} - - target: {fileID: 621126248212827751, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 621126248212827751, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 621126248212827751, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 40.15 - objectReference: {fileID: 0} - - target: {fileID: 621126248212827751, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -38.17 - objectReference: {fileID: 0} - - target: {fileID: 281691815328986559, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 281691815328986559, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 281691815328986559, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 122 - objectReference: {fileID: 0} - - target: {fileID: 281691815328986559, guid: 89a5d87f170edf349b83b674fa863394, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -38.17 - objectReference: {fileID: 0} - target: {fileID: 4010778226274763493, guid: 89a5d87f170edf349b83b674fa863394, type: 3} propertyPath: m_TargetGraphic @@ -5106,6 +5215,11 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 4775956017113673258} + - target: {fileID: 9092918934522304640, guid: 89a5d87f170edf349b83b674fa863394, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 5 + objectReference: {fileID: 0} - target: {fileID: 1625592588526927619, guid: 89a5d87f170edf349b83b674fa863394, type: 3} propertyPath: m_TargetGraphic @@ -5121,35 +5235,7 @@ PrefabInstance: propertyPath: m_TargetGraphic value: objectReference: {fileID: 6227180720393762595} - m_RemovedComponents: - - {fileID: 5392791023065657316, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 5601310124678208391, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 7224651112685532021, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 7896225379386715831, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 5659189904811342034, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 1566545911516175822, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 6668550715728692798, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 6568979118527473902, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 7946715849399087690, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 1779390420411650376, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 5681690669729444574, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 9186004358938884971, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 4028296368796401851, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 1167599633226679445, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 9154976693089426078, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 37848372900763189, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 1822164624689301273, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 7782079415955216576, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 2874041788680717408, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 3665468056059929973, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 8984395397217402654, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 3495356421223589270, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 7462818797072721318, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 1168692934840051617, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 8476090192619958123, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 7084803617583253275, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 6357465483884731354, guid: 89a5d87f170edf349b83b674fa863394, type: 3} - - {fileID: 7158021628453867776, guid: 89a5d87f170edf349b83b674fa863394, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89a5d87f170edf349b83b674fa863394, type: 3} --- !u!114 &8690910985215967337 stripped MonoBehaviour: @@ -5405,371 +5491,36 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3129617478986272255, guid: 21a0388ffc0aa1f49b934cc2e19fd213, + - target: {fileID: 5162593471303236762, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} - propertyPath: m_SizeDelta.x - value: 673 - objectReference: {fileID: 0} - - target: {fileID: 7274797596699487935, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7274797596699487935, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7274797596699487935, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 7274797596699487935, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 140 + propertyPath: m_AnchoredPosition.x + value: -0.0000989223 objectReference: {fileID: 0} - target: {fileID: 2703654448420865930, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} propertyPath: m_AnchoredPosition.x - value: 150 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 2703654448420865930, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2703654448420865930, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2703654448420865930, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 2703654448420865930, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3642677507929918682, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3642677507929918682, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3642677507929918682, guid: 21a0388ffc0aa1f49b934cc2e19fd213, + - target: {fileID: 3426774782456427134, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} propertyPath: m_AnchoredPosition.x - value: 392 - objectReference: {fileID: 0} - - target: {fileID: 3642677507929918682, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 3642677507929918682, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 281 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7608533262143145714, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} propertyPath: m_Content value: objectReference: {fileID: 2501822414544174525} + - target: {fileID: 8554588556991035913, guid: 21a0388ffc0aa1f49b934cc2e19fd213, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2108871577502867999, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} propertyPath: m_TargetGraphic value: objectReference: {fileID: 7859975813896031597} - - target: {fileID: 3426774782456427134, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 182 - objectReference: {fileID: 0} - - target: {fileID: 3426774782456427134, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3426774782456427134, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3426774782456427134, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 3426774782456427134, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 200 - objectReference: {fileID: 0} - - target: {fileID: 3426774782456427134, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.y - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 8554588556991035913, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 8554588556991035913, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8554588556991035913, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8554588556991035913, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8554588556991035913, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 8247683834651013525, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8247683834651013525, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8247683834651013525, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 187 - objectReference: {fileID: 0} - - target: {fileID: 8247683834651013525, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8247683834651013525, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 9154637298164680968, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9154637298164680968, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9154637298164680968, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 166 - objectReference: {fileID: 0} - - target: {fileID: 9154637298164680968, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 9154637298164680968, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 9131693878824269360, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9131693878824269360, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9131693878824269360, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 82 - objectReference: {fileID: 0} - - target: {fileID: 9131693878824269360, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 9131693878824269360, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 8925398704357657479, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8925398704357657479, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8925398704357657479, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 145 - objectReference: {fileID: 0} - - target: {fileID: 8925398704357657479, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8925398704357657479, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4635504527074568677, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4635504527074568677, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4635504527074568677, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 19 - objectReference: {fileID: 0} - - target: {fileID: 4635504527074568677, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4635504527074568677, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4453983540638616941, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4453983540638616941, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4453983540638616941, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 103 - objectReference: {fileID: 0} - - target: {fileID: 4453983540638616941, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4453983540638616941, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 138070819416592875, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 138070819416592875, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 138070819416592875, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 138070819416592875, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 138070819416592875, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 1106010108047835104, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1106010108047835104, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1106010108047835104, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 124 - objectReference: {fileID: 0} - - target: {fileID: 1106010108047835104, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1106010108047835104, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 1133380339932058840, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1133380339932058840, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1133380339932058840, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 61 - objectReference: {fileID: 0} - - target: {fileID: 1133380339932058840, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1133380339932058840, guid: 21a0388ffc0aa1f49b934cc2e19fd213, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 21a0388ffc0aa1f49b934cc2e19fd213, type: 3} --- !u!224 &2501822414544174525 stripped @@ -6325,9 +6076,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8361638921861515157 stripped +--- !u!114 &4046406892700477551 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 428922012050464177, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 5322953086839648843, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} @@ -6337,9 +6088,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4046406892700477551 stripped +--- !u!114 &8361638921861515157 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5322953086839648843, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 428922012050464177, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} @@ -6361,9 +6112,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8336659688940764895 stripped +--- !u!114 &499521136620646860 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 164548311470974203, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 8581595705950170088, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} @@ -6373,9 +6124,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &499521136620646860 stripped +--- !u!114 &2406725831522499579 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8581595705950170088, guid: d24762ab721f88e45867492426bb9b60, + m_CorrespondingSourceObject: {fileID: 5809428446582432223, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} @@ -6481,21 +6232,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8485777126462822162 stripped +--- !u!114 &8336659688940764895 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 304799287459204406, 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, + m_CorrespondingSourceObject: {fileID: 164548311470974203, guid: d24762ab721f88e45867492426bb9b60, type: 3} m_PrefabInstance: {fileID: 8212687754618722852} m_PrefabAsset: {fileID: 0} @@ -6589,6 +6328,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8485777126462822162 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 304799287459204406, 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!1001 &8835266474022999589 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua index 6b6527417a..4d3996931b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua @@ -135,6 +135,7 @@ function Expert:OnShowData(index) this.titleTextExpert2:GetComponent("Text").fontSize = GetCurLanguage() ~= 2 and 33 or 25 elseif numExChange[activeIndext] == ActivityTypeDef.GoldExper then elseif numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper then + this.xunbaoTextImage:GetComponent("Image").sprite = Util.LoadSprite("r_daren_xubao1_zh") this.xunbaoTextImage:SetActive(true) this.titleImageExpert1:SetActive(true) this.titleTextExpert:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 7d89ab389e..82959a4c69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -82,7 +82,7 @@ function this.RefreshPanel(isTop,isAni) scrollView:SetData(rewardConfig,function(index,root) this.SetScrollPre(root,rewardConfig[index]) end,not isTop,not isAni) - scrollView:SetIndex(1) + -- scrollView:SetIndex(1) end --设置每条数据