diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 05a467be..72588e3c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -6056,7 +6056,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 716cb1fb9a2a96445950199c3a6d2961, type: 3} + m_Sprite: {fileID: 21300000, guid: 715c2bd0966ed42719ef3272d260768f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7626,7 +7626,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, + objectReference: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, type: 3} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -7696,8 +7696,14 @@ PrefabInstance: - target: {fileID: 1382553612690395228, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Text - value: "\u81EA\u52D5\u8ABF\u7406" + value: "\u81EA\u52A8\u70F9\u996A" objectReference: {fileID: 0} + - target: {fileID: 1382553612690395228, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 1408184404978035950, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder @@ -7707,7 +7713,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: c0ee2846e2285fa46883acc98c475652, + objectReference: {fileID: 21300000, guid: ef9cd759497b04e9399ba3cd5617056c, type: 3} - target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -7783,13 +7789,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, + objectReference: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, type: 3} - target: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, + objectReference: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, type: 3} - target: {fileID: 3664916832512110618, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -7940,7 +7946,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, + objectReference: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, type: 3} - target: {fileID: 3664916832909534300, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -7955,8 +7961,14 @@ PrefabInstance: - target: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Text - value: "\u4F5C\u308B" + value: "\u5236\u4F5C" objectReference: {fileID: 0} + - target: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + type: 3} - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x @@ -7991,7 +8003,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, + objectReference: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, type: 3} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -8058,6 +8070,12 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4486994142522989318, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e259fa4d2057bac429e800d9dac78aae, + type: 3} - target: {fileID: 6205448659049427752, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index 399f3d88..1ef1a589 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -3423,7 +3423,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7cf3290f89d6c3b4eaa04d0e5980591b, + objectReference: {fileID: 21300000, guid: 40629b0556657ca4685f32303b71f171, type: 3} - target: {fileID: 1458058295471017775, guid: b46e011db918bbe42a91795497f90b9c, type: 3} @@ -3589,13 +3589,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: fb63ee5957e15004eb27aaf367103806, + objectReference: {fileID: 21300000, guid: f238f145958172d428942802c02fc39c, type: 3} - target: {fileID: 7328251775215910467, guid: b46e011db918bbe42a91795497f90b9c, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b840fc03d9c919544b8d4beefd48696d, + objectReference: {fileID: 21300000, guid: 6cafaf4bcaf9b324d851fd727ce1185a, type: 3} - target: {fileID: 8309997995485196036, guid: b46e011db918bbe42a91795497f90b9c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab index 7e995195..8c32918b 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Brother_pink.prefab @@ -507,7 +507,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 6 --- !u!114 &2607884839347368726 MonoBehaviour: m_ObjectHideFlags: 0 @@ -586,6 +586,9 @@ MonoBehaviour: level1: {fileID: 775281020594132328} level2: {fileID: 7545235244005095164} level3: {fileID: 3741799588110921262} + level1Value: 9 + level2Value: 18 + level3Value: 27 hitEffectPrefab: {fileID: 3274305818614039910, guid: 1bc5e14a40e0b4e94a1ba39081ac8436, type: 3} --- !u!114 &3714690223456412398 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab index 147dbe91..87f5a864 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab @@ -1063,7 +1063,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3, y: 86} - m_SizeDelta: {x: 108, y: 66} + m_SizeDelta: {x: 278, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813504388152430 CanvasRenderer: @@ -1092,7 +1092,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b0d07c69efa3df24fac0843c9a1920d2, type: 3} + m_Sprite: {fileID: 21300000, guid: 27208e7cc90230c40bf97bb787a635d9, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1709,7 +1709,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 789} - m_SizeDelta: {x: 414, y: 116} + m_SizeDelta: {x: 682, y: 116} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813505623332493 CanvasRenderer: @@ -1738,7 +1738,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9aa432443b00f546af3b0c4e5e1846b, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f008475ba648c747a53271ed92851dc, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1981,7 +1981,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3, y: 86} - m_SizeDelta: {x: 108, y: 66} + m_SizeDelta: {x: 278, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813505652122420 CanvasRenderer: @@ -2010,7 +2010,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 53455103b6864fd4093faca95dc52307, type: 3} + m_Sprite: {fileID: 21300000, guid: 2cbcf01a8ca007b40b50f05c76723fd7, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2252,7 +2252,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3, y: 86} - m_SizeDelta: {x: 108, y: 66} + m_SizeDelta: {x: 278, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4559813505704525542 CanvasRenderer: @@ -2281,7 +2281,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 030af2bbe28d3b24e94162845a2243bc, type: 3} + m_Sprite: {fileID: 21300000, guid: b3cb6e69de972544b98cbb4007ec1359, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2782,6 +2782,11 @@ PrefabInstance: propertyPath: m_Name value: detail_NotReleased objectReference: {fileID: 0} + - target: {fileID: 7863866277475261637, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d9587a5f5882ad498ba2a3ffd06dbab, type: 3} --- !u!1 &5937334820095103990 stripped @@ -2963,6 +2968,42 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4559813504355184347} m_Modifications: + - target: {fileID: 1892712672056555269, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 343e01e697ec23142a0a67e3fe7a64fb, + type: 3} + - target: {fileID: 2407377532650141408, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6e3b952e60a778c4497e7d9809d64788, + type: 3} + - target: {fileID: 3310671340499624764, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e766bd96310300745ba8882e4162303b, + type: 3} + - target: {fileID: 3310671340824885726, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8d057aeccdaf2954fa93317e0161aa35, + type: 3} + - target: {fileID: 3310671340978879439, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 55825402a9256f144ab0de2dec192dd1, + type: 3} + - target: {fileID: 3310671341497605163, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f654f9996bad76242bf6cbd9f4aeac0a, + type: 3} - target: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_Name