diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png index 2bfc1965..380f482e 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_off.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_off.png index 68f14527..350901e8 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_off.png and b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_off.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_on.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_on.png index 4286c07d..02dc5a52 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_on.png and b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_button_on.png differ diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index 6a0b8ba3..ce40c7ab 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -580,7 +580,7 @@ PrefabInstance: - target: {fileID: 655651630893765691, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1174152333972670061, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -832,6 +832,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 260.69922 objectReference: {fileID: 0} + - target: {fileID: 8136363072906095234, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!224 &1098091308 stripped @@ -867,6 +872,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2912042418098885678, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2912042418112398164, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.x @@ -1037,6 +1047,85 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2912042419203209778, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2912042419340105156, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8ef7cbdaee9f8a04ab649c2c4f873893, + type: 3} + - target: {fileID: 2912042419340105159, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2912042419340105159, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_SizeDelta.y + value: 102 + objectReference: {fileID: 0} + - target: {fileID: 2912042419340105159, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 2912042419614313712, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: ad9ae5d09441c554180805fcf11377eb, + type: 3} + - target: {fileID: 2912042419614313715, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_SizeDelta.x + value: 249 + objectReference: {fileID: 0} + - target: {fileID: 2912042419614313715, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_SizeDelta.y + value: 125 + objectReference: {fileID: 0} + - target: {fileID: 2912042419614313715, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2912042419696265076, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_SizeDelta.y + value: 124 + objectReference: {fileID: 0} + - target: {fileID: 2912042419696265076, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 2912042419696265077, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: fc80702fa5c486e439772818d5df56b8, + type: 3} + - target: {fileID: 2912042419872848609, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2912042419872848609, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2912042419872848622, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9f684ecfa18fc134ab2c3955d200a8d7, + type: 3} - target: {fileID: 6778406391604408560, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y