From 571b8e082a3f37fd8142a25b158ecb6b2532e87a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 2 Sep 2020 17:38:56 +0800 Subject: [PATCH] shipei --- .../Prefabs/UI/Battle/BattlePanel.prefab | 238 +++++++-- .../Prefabs/UI/Carbon/DailyCarbonPanel.prefab | 464 +++++++++--------- .../Prefabs/UI/Power/GiveMePowerPanel.prefab | 4 +- .../Prefabs/UI/Recruit/RecruitPanel.prefab | 6 +- .../~Lua/Modules/Carbon/DailyCarbonPanel.lua | 4 +- 5 files changed, 443 insertions(+), 273 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 3cf056f106..5d1004662a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -4816,7 +4816,7 @@ ParticleSystem: --- !u!199 &87992400547130891 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9589,7 +9589,7 @@ ParticleSystem: --- !u!199 &-3856357103111044387 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14701,7 +14701,7 @@ ParticleSystem: --- !u!199 &4899634819696531688 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19457,7 +19457,7 @@ ParticleSystem: --- !u!199 &4644274050042266027 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24570,7 +24570,7 @@ ParticleSystem: --- !u!199 &-6568434204472551825 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30402,7 +30402,7 @@ ParticleSystem: --- !u!199 &4504004418399676027 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37189,7 +37189,7 @@ ParticleSystem: --- !u!199 &-43774083811853307 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41860,7 +41860,7 @@ ParticleSystem: --- !u!199 &-6320650307698832674 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -49934,7 +49934,7 @@ ParticleSystem: --- !u!199 &1498398485 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55204,7 +55204,7 @@ ParticleSystem: --- !u!199 &1734195439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56356,7 +56356,7 @@ RectTransform: m_GameObject: {fileID: 144333933674822358} 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_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: -4381370023651553062} m_RootOrder: 0 @@ -61752,7 +61752,7 @@ ParticleSystem: --- !u!199 &5218046717783627369 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -67845,7 +67845,7 @@ ParticleSystem: --- !u!199 &4884976521430742359 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72833,7 +72833,7 @@ ParticleSystem: --- !u!199 &1307058920178531024 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72984,7 +72984,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3.26} + m_AnchoredPosition: {x: 0, y: 3.2600002} m_SizeDelta: {x: 19, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3370389922692384002 @@ -78124,7 +78124,7 @@ ParticleSystem: --- !u!199 &5110211401290693250 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79165,7 +79165,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -17} + m_AnchoredPosition: {x: 0, y: -16.999998} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3386731143864556671 @@ -84110,7 +84110,7 @@ ParticleSystem: --- !u!199 &-4646563412136487132 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -88907,7 +88907,7 @@ ParticleSystem: --- !u!199 &-1472657892369082979 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -93830,7 +93830,7 @@ ParticleSystem: --- !u!199 &275132061229638260 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100489,7 +100489,7 @@ ParticleSystem: --- !u!199 &-6682608583335386412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -105314,7 +105314,7 @@ ParticleSystem: --- !u!199 &-6104293520298689822 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -110287,7 +110287,7 @@ ParticleSystem: --- !u!199 &2271698655933514730 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -115198,7 +115198,7 @@ ParticleSystem: --- !u!199 &5819538576274366693 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -115291,7 +115291,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -17} + m_AnchoredPosition: {x: 0, y: -16.999998} m_SizeDelta: {x: 25, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4400384650346200876 @@ -120544,7 +120544,7 @@ ParticleSystem: --- !u!199 &1181760000614059150 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -121013,7 +121013,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3.26} + m_AnchoredPosition: {x: 0, y: 3.2600002} m_SizeDelta: {x: 17, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5139239468545797121 @@ -121235,7 +121235,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3.26} + m_AnchoredPosition: {x: 0, y: 3.2600002} m_SizeDelta: {x: 17, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5491822514647551468 @@ -127046,7 +127046,7 @@ ParticleSystem: --- !u!199 &7344298940656860261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -132819,7 +132819,7 @@ ParticleSystem: --- !u!199 &6245463154932388831 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -132989,7 +132989,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3.26} + m_AnchoredPosition: {x: 0, y: 3.2600002} m_SizeDelta: {x: 15, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5230090314484731207 @@ -133137,7 +133137,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 3.26} + m_AnchoredPosition: {x: 0, y: 3.2600002} m_SizeDelta: {x: 17, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1223665195377622099 @@ -138041,7 +138041,7 @@ ParticleSystem: --- !u!199 &8536783281818651702 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -142744,7 +142744,7 @@ ParticleSystem: --- !u!199 &5634098105395963442 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -143627,16 +143627,41 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &3299304833170184155 stripped @@ -143767,16 +143792,41 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &3568172007904461191 stripped @@ -143902,6 +143952,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6210025963494768122, guid: a6d8e39b4fb07024f9346b5be60e8591, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 6210025963494768122, guid: a6d8e39b4fb07024f9346b5be60e8591, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a6d8e39b4fb07024f9346b5be60e8591, type: 3} --- !u!224 &5043862931366824727 stripped @@ -144032,16 +144092,41 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &4455376260965493203 stripped @@ -144172,16 +144257,41 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &2253336046086876964 stripped @@ -144312,16 +144422,41 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &2111174513181719573 stripped @@ -144452,16 +144587,41 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &6954216252396688781 stripped @@ -144587,6 +144747,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 6969572681753893770, guid: 9eb941cb04fe8c944a138963e55bbdc6, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 6969572681753893770, guid: 9eb941cb04fe8c944a138963e55bbdc6, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9eb941cb04fe8c944a138963e55bbdc6, type: 3} --- !u!224 &9135249695910312339 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index 25fbb4911b..b1f3d01e54 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -25,16 +25,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 39637761430653143} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 3753356304809304800} - m_RootOrder: 1 + m_Father: {fileID: 6616730211952462317} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 257.08, y: 651.43} + m_AnchoredPosition: {x: 257.08, y: -76} m_SizeDelta: {x: 514.16, y: 47.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2736126529659177549 @@ -154,80 +154,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &575870043181212595 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 575870043181212594} - - component: {fileID: 575870043181212604} - - component: {fileID: 575870043181212605} - m_Layer: 5 - m_Name: Bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &575870043181212594 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 575870043181212595} - 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: 3408442198697653928} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.00012207031, y: 0.000030517578} - m_SizeDelta: {x: 910, y: 224} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &575870043181212604 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 575870043181212595} - m_CullTransparentMesh: 0 ---- !u!114 &575870043181212605 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 575870043181212595} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 25025916eee472c4eafe9a90826e2999, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &966718488859144542 GameObject: m_ObjectHideFlags: 0 @@ -258,8 +184,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5437999204480426468} - - {fileID: 4106872190400612488} + - {fileID: 8019762794237534277} + - {fileID: 2072437361715169577} - {fileID: 5182115510220598978} - {fileID: 437974856277732987} m_Father: {fileID: 426311262980600154} @@ -449,7 +375,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 89.599976} + m_AnchoredPosition: {x: 70, y: 89.6001} m_SizeDelta: {x: 140, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1442028839347931044 @@ -630,7 +556,7 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4ECA\u65E5\u5269\u4F59\u6B21\u6570\uFF1A1" LanguageIndex: 10242 ---- !u!1 &2058479599735553241 +--- !u!1 &2576527874645254674 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -638,94 +564,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4106872190400612488} - - component: {fileID: 7729360562506996543} - - component: {fileID: 2811052203154229161} - - component: {fileID: 2137273208193805780} - m_Layer: 0 - m_Name: Text + - component: {fileID: 2576527874645254675} + - component: {fileID: 2576527874645254685} + - component: {fileID: 2576527874645254684} + m_Layer: 5 + m_Name: Bg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4106872190400612488 + m_IsActive: 1 +--- !u!224 &2576527874645254675 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058479599735553241} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 2576527874645254674} + 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: 1492499629588067375} - m_RootOrder: 1 + m_Father: {fileID: 3408442198697653928} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000022888184, y: 0} - m_SizeDelta: {x: 66.8, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.00012207031, y: 0.000030517578} + m_SizeDelta: {x: 910, y: 224} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7729360562506996543 +--- !u!222 &2576527874645254685 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058479599735553241} + m_GameObject: {fileID: 2576527874645254674} m_CullTransparentMesh: 0 ---- !u!114 &2811052203154229161 +--- !u!114 &2576527874645254684 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058479599735553241} + m_GameObject: {fileID: 2576527874645254674} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1.5, y: -1.5} - m_UseGraphicAlpha: 1 ---- !u!114 &2137273208193805780 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058479599735553241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.033018887, g: 1, b: 0.118071094, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 52 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u91D1\u5E01\u526F\u672C" - LanguageIndex: 10245 + m_Sprite: {fileID: 21300000, guid: 25025916eee472c4eafe9a90826e2999, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3186609871897553618 GameObject: m_ObjectHideFlags: 0 @@ -966,9 +870,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6616730211952462317} - - {fileID: 1365847374173356250} - - {fileID: 6948521794554378020} - {fileID: 6551732854407264896} + - {fileID: 9137841998675770145} m_Father: {fileID: 3233073780574710381} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1118,6 +1021,102 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &4084057848217451896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2072437361715169577} + - component: {fileID: 5726459732758174366} + - component: {fileID: 233784374642066952} + - component: {fileID: 4149312908026473589} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2072437361715169577 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4084057848217451896} + 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: 1492499629588067375} + 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.000022888184, y: 0} + m_SizeDelta: {x: 66.8, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5726459732758174366 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4084057848217451896} + m_CullTransparentMesh: 0 +--- !u!114 &233784374642066952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4084057848217451896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1.5, y: -1.5} + m_UseGraphicAlpha: 1 +--- !u!114 &4149312908026473589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4084057848217451896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.033018887, g: 1, b: 0.118071094, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 52 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u91D1\u5E01\u526F\u672C" + LanguageIndex: 10245 --- !u!1 &4380733769752825422 GameObject: m_ObjectHideFlags: 0 @@ -1145,7 +1144,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 575870043181212594} + - {fileID: 2576527874645254675} - {fileID: 1421105423562867200} - {fileID: 6403195048930280866} - {fileID: 6530197106428225390} @@ -1254,7 +1253,7 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &4752447894656669812 +--- !u!1 &4816692481799106793 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1262,72 +1261,78 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5437999204480426468} - - component: {fileID: 1643141311473263876} - - component: {fileID: 6636189436457785287} - m_Layer: 0 - m_Name: Image + - component: {fileID: 8752085671115477289} + - component: {fileID: 4249339089310537242} + - component: {fileID: 2513862751333730604} + m_Layer: 5 + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5437999204480426468 +--- !u!224 &8752085671115477289 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4752447894656669812} + m_GameObject: {fileID: 4816692481799106793} 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: 1492499629588067375} - m_RootOrder: 0 + m_Father: {fileID: 6706942462312295341} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.18, y: 0.61} - m_SizeDelta: {x: 184, y: 180} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1643141311473263876 +--- !u!222 &4249339089310537242 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4752447894656669812} + m_GameObject: {fileID: 4816692481799106793} m_CullTransparentMesh: 0 ---- !u!114 &6636189436457785287 +--- !u!114 &2513862751333730604 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4752447894656669812} + m_GameObject: {fileID: 4816692481799106793} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 0.5137255, g: 0.32156864, b: 0.22352941, a: 1} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1cf2bc1e652260e4cafd35066a69b1e4, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 49 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6311\u6218" + LanguageIndex: 10244 --- !u!1 &5579909330295013454 GameObject: m_ObjectHideFlags: 0 @@ -1408,7 +1413,7 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5DF2\u901A\u8FC7" LanguageIndex: 10243 ---- !u!1 &5907381574272293623 +--- !u!1 &5711977327890519794 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1416,9 +1421,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6948521794554378020} - - component: {fileID: 3951504111878136269} - - component: {fileID: 3810098698818737012} + - component: {fileID: 9137841998675770145} + - component: {fileID: 2911763174970764744} + - component: {fileID: 3052888281546694513} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -1426,13 +1431,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6948521794554378020 +--- !u!224 &9137841998675770145 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5907381574272293623} + m_GameObject: {fileID: 5711977327890519794} 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} @@ -1440,26 +1445,26 @@ RectTransform: m_Father: {fileID: 3753356304809304800} m_RootOrder: 2 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: -192} - m_SizeDelta: {x: 0, y: -383.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2, y: -188.8} + m_SizeDelta: {x: 1012, y: 1368.2} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3951504111878136269 +--- !u!222 &2911763174970764744 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5907381574272293623} + m_GameObject: {fileID: 5711977327890519794} m_CullTransparentMesh: 0 ---- !u!114 &3810098698818737012 +--- !u!114 &3052888281546694513 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5907381574272293623} + m_GameObject: {fileID: 5711977327890519794} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1473,8 +1478,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5d9f6e48de1533d4db7d330bdb11e861, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1410c5d21cdab554c82c0fc2eec0f542, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1819,7 +1824,7 @@ RectTransform: m_Children: - {fileID: 1579016604247848929} - {fileID: 8797316285502679983} - - {fileID: 6722162577798484104} + - {fileID: 8752085671115477289} m_Father: {fileID: 3408442198697653928} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2011,13 +2016,14 @@ RectTransform: 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_Children: + - {fileID: 1365847374173356250} m_Father: {fileID: 3753356304809304800} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -232.69995} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 781} m_SizeDelta: {x: 1080, y: 464} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6616730211952462319 @@ -2284,7 +2290,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7414078346221039944 +--- !u!1 &7334211626147895765 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2292,78 +2298,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6722162577798484104} - - component: {fileID: 2217147402925430715} - - component: {fileID: 495189705316419725} - m_Layer: 5 - m_Name: Text + - component: {fileID: 8019762794237534277} + - component: {fileID: 3670944842657539237} + - component: {fileID: 8657105485071226470} + m_Layer: 0 + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6722162577798484104 +--- !u!224 &8019762794237534277 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414078346221039944} + m_GameObject: {fileID: 7334211626147895765} 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: 6706942462312295341} - m_RootOrder: 2 + m_Father: {fileID: 1492499629588067375} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.18, y: 0.61} + m_SizeDelta: {x: 184, y: 180} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2217147402925430715 +--- !u!222 &3670944842657539237 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414078346221039944} + m_GameObject: {fileID: 7334211626147895765} m_CullTransparentMesh: 0 ---- !u!114 &495189705316419725 +--- !u!114 &8657105485071226470 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7414078346221039944} + m_GameObject: {fileID: 7334211626147895765} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5137255, g: 0.32156864, b: 0.22352941, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 38 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 49 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6311\u6218" - LanguageIndex: 10244 + m_Sprite: {fileID: 21300000, guid: 1cf2bc1e652260e4cafd35066a69b1e4, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7744302047716595539 GameObject: m_ObjectHideFlags: 0 @@ -2394,12 +2394,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3753356304809304800} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2, y: -188.8} - m_SizeDelta: {x: 1012, y: 1368.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -162} + m_SizeDelta: {x: 0, y: -323.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &888587491399412841 CanvasRenderer: @@ -2429,8 +2429,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1410c5d21cdab554c82c0fc2eec0f542, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 5d9f6e48de1533d4db7d330bdb11e861, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab index 44fb333dea..c6423be20d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab @@ -7541,7 +7541,7 @@ RectTransform: m_GameObject: {fileID: 3112343471482368905} 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_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 3993378406723060650} m_RootOrder: 0 @@ -10939,7 +10939,7 @@ RectTransform: m_GameObject: {fileID: 4554888815100873129} 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_LocalScale: {x: 0.95, y: 0.95, z: 1} m_Children: - {fileID: 3221207368412664991} - {fileID: 593533450149258851} diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab index 6d769a7583..9c7b381c79 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab @@ -40805,9 +40805,9 @@ RectTransform: m_Father: {fileID: 224104263369352388} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 441, y: 493} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -99, y: 493} m_SizeDelta: {x: 130, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8545088816228627475 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 23607b788f..7f8b55ecdb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -59,7 +59,7 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), function DailyCarbonPanel:InitComponent() this.panel=Util.GetGameObject(this.gameObject,"Panel") this.titleBg=Util.GetGameObject(this.panel,"Bg/TitleBg"):GetComponent("Image") - this.titleTip=Util.GetGameObject(this.panel,"Bg/Text"):GetComponent("Text") + this.titleTip=Util.GetGameObject(this.panel,"Bg/TitleBg/Text"):GetComponent("Text") this.timeTip=Util.GetGameObject(this.panel,"TimeTip"):GetComponent("Text") this.backBtn=Util.GetGameObject(this.panel,"BackBtn") this.helpBtn= Util.GetGameObject(this.panel, "HelpBtn") @@ -162,7 +162,7 @@ function this.RefreshShow(i) this.titleBg.sprite=Util.LoadSprite(titleBg[i].bg) this.titleTip.text=titleBg[i].titleTip - this.titleTip.gameObject:GetComponent("RectTransform").localPosition =titleBg[i].pos + -- this.titleTip.gameObject:GetComponent("RectTransform").localPosition = titleBg[i].pos this.SetTimeTip() this.SetScroll(i) DailyCarbonPanel:RefreshRedPotShow()