diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png index 694a9176..8a88ec3d 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_background_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_soil_Dither.png b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_soil_Dither.png index 96c6c07c..2391c2be 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_soil_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_soil_Dither.png differ diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 125d156d..c1dc750e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -184,7 +184,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282523122} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.17, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2138129848} @@ -200,6 +200,79 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_SizeDelta.x + value: -920 + objectReference: {fileID: 0} + - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_SizeDelta.y + value: -2108 + objectReference: {fileID: 0} + - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_AnchoredPosition.x + value: 373 + objectReference: {fileID: 0} + - target: {fileID: 130281750, guid: caaa748dbeed576499e8cae74d33f689, type: 3} + propertyPath: m_AnchoredPosition.y + value: -212 + objectReference: {fileID: 0} + - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832310506794, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3664916832564167473, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Name @@ -325,6 +398,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} --- !u!1 &536970157 @@ -575,7 +653,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 960603096} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.39, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 132784687} @@ -678,6 +756,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 149181931} m_Modifications: + - target: {fileID: 1321666741756853965, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.06 + objectReference: {fileID: 0} - target: {fileID: 2783350420155647085, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_SortingOrder @@ -691,7 +774,7 @@ PrefabInstance: - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.45 objectReference: {fileID: 0} - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -743,6 +826,11 @@ PrefabInstance: propertyPath: m_Name value: set (2) objectReference: {fileID: 0} + - target: {fileID: 8144837015556047765, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.0629997 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} --- !u!4 &1214401743 stripped @@ -839,6 +927,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 149181931} m_Modifications: + - target: {fileID: 1321666741756853965, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.06 + objectReference: {fileID: 0} - target: {fileID: 2783350418994301884, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_SortingOrder @@ -857,7 +950,7 @@ PrefabInstance: - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.45 objectReference: {fileID: 0} - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -909,6 +1002,11 @@ PrefabInstance: propertyPath: m_Name value: set (1) objectReference: {fileID: 0} + - target: {fileID: 8144837015556047765, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.0629997 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} --- !u!4 &1466604291 stripped @@ -1346,6 +1444,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 149181931} m_Modifications: + - target: {fileID: 1321666741756853965, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.06 + objectReference: {fileID: 0} - target: {fileID: 2783350418994301884, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_SortingOrder @@ -1364,7 +1467,7 @@ PrefabInstance: - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.45 objectReference: {fileID: 0} - target: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} @@ -1416,6 +1519,11 @@ PrefabInstance: propertyPath: m_Name value: set objectReference: {fileID: 0} + - target: {fileID: 8144837015556047765, guid: 90ea860c4ec589d4aab99bfc127949f4, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.0629997 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 90ea860c4ec589d4aab99bfc127949f4, type: 3} --- !u!1001 &8524901521126273002 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/set.prefab b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/set.prefab index 020a803b..7f1f74c8 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/set.prefab +++ b/popcorn/Assets/MyGame/Scenes/CornField/Prefabs/set.prefab @@ -33,7 +33,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: -5.57, y: -0.17} + m_AnchoredPosition: {x: -5.225995, y: -0.17} m_SizeDelta: {x: 0.98, y: 1.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &2783350418994301884 @@ -235,7 +235,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: -5.573, y: -0.19} + m_AnchoredPosition: {x: -5.228995, y: -0.19} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &6894893683192387336