From fc5276b49661867aac16ca048a975889c8df83d8 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 19 Nov 2021 18:05:03 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=82=AF=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E8=BF=BD=E5=8A=A0=E8=AA=BF=E6=95=B4?= =?UTF-8?q?=E3=80=81=E8=B3=BC=E5=85=A5=E3=83=9D=E3=83=83=E3=83=97=E3=82=B5?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Prefabs/icon_Rare.prefab | 119 +++++++++++++++++- ...in_BulkOrder_detail_Cooked_rare_purple.png | Bin 0 -> 1312 bytes ...lkOrder_detail_Cooked_rare_purple.png.meta | 92 ++++++++++++++ ..._cooking_result_detail_rare_purple_big.png | Bin 0 -> 2246 bytes ...ing_result_detail_rare_purple_big.png.meta | 92 ++++++++++++++ ...pping_detail_MediumFrame_button_detail.png | Bin 2608 -> 3365 bytes .../Scenes/Cooking/CookingResults.unity | 24 ++++ .../marketing/Prefabs/Description.prefab | 83 ++++++------ .../marketing/Prefabs/RareDetails.prefab | 16 +-- .../Scenes/marketing/Prefabs/detail.prefab | 112 ++++++++++++++--- .../Scenes/shopping/Prefabs/Frame.prefab | 18 +-- .../shopping/Prefabs/PurchaseView.prefab | 6 +- 12 files changed, 476 insertions(+), 86 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png.meta create mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png.meta diff --git a/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab index ee14732f..3e9d258a 100644 --- a/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab +++ b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab @@ -212,7 +212,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -332,7 +332,8 @@ Transform: 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: 9138555990566045856} m_Father: {fileID: 5841351845785292974} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -375,7 +376,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} + m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -457,7 +458,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -798,6 +799,116 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4036395783033744965} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5342064014764649663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5163271794299328350} + m_Modifications: + - target: {fileID: 2766725442730909358, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_SortingOrder + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586964025877252094, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_Name + value: effect_Glitter (4) + objectReference: {fileID: 0} + - target: {fileID: 6397847358890529686, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: moveWithTransform + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6397847358890529686, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: ShapeModule.radius.value + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 6397847358890529686, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.08 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} +--- !u!4 &9138555990566045856 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + m_PrefabInstance: {fileID: 5342064014764649663} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5390659369552193181 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..f7207d27f44cb476887f9ecaded41b3057fbef33 GIT binary patch literal 1312 zcmV+*1>gFKP)M3oA`1wv}?s@?#30n$D}=@TG$fks>)A#R9-5JEz=xF`ZCYKf={ zrBRarPHURjj=T1**SqGN3xFJQBT zHD$jlVEy=$uWo1lHy{Y&1~%_U3@;;?#a?Yn`vCDFHdoqwGJE#KxbWlsN16YO5d=ZU z@X$F9K~SJSc9O>`#xGE>>)<)2No1zbt!=SKLaumx0#f}KA*r0_N_|gBbzp7(Kx{Ua zoaeZ76k=G<%+0{tZ=K^lz4MeMd(OYkh>wi{WgdnG2N=k)^z-h!{jwr=U?GhS)!8sM zPMw_Q=gqAwI-B6KQZ@hZvO<1x2kQp<%tlv0Y;AbYUU)WY675`x$6Cv+CX6%mnJ}o9f!fbH{r#}G`x1Ef%Wd{1JKGksMQM8@!70fpvcFmhp=R@K<9oZ z%@J(R&U+UnZJ?cr*pGR3N6tBY;uxHonPN6JA7tUTwTC?Rq+9^KR^?i=OgJ)e7>emE zD`)3khKcb*o*8fOe**T!%4e{ve(Lq3Spu@)^ImZj&ws9EVW;G>yO7)7VIY3rkwL39 zb}0!W+`G39h5Q~IJUGnn#>Pgt9eFOrYXr&y0U^)5=Dev{IruK~10O+BPC$9D(vWaf zgGyQNT6DIywz)c`j(?g_1q<1tH3B6g+u`JvJcr&T_-R#TnvV`2MqlamCh(Uaho=z5FSURavk;L8xCIz9|V(b zI&SY^O4Tx$mf0%^%3ZGd@(~2H(hf`wjV0rWP!LwV4h5~$%2Lf>U1;wrQhXDj5|H zKYNvyRP^1;7vR-%Gc6zPR*DR!Z5k*jp|-mL@`BTeq4Z%)-d2~1z?C0A+5M!Pj4e_$bXx4q2JPHD%q zNDx4D#0)bS0!YkxL7 WDpj58j*`Rx0000$y0000PbVXQnQ*UN; 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 Hu0mjfBbEGU diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index d358901f..e564821a 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -19004,6 +19004,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8869708493324659635, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7654e044ece88164dbee09bf458961d6, + type: 3} - target: {fileID: 8869708493587088493, guid: 4d49c71079a444963857b600f7b6384c, type: 3} propertyPath: m_Text @@ -19149,5 +19155,23 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8869708493948071811, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a168a9e02e4621345a96d19959a7e04b, + type: 3} + - target: {fileID: 8869708494877278141, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 159022d28443b654a81362c923c14664, + type: 3} + - target: {fileID: 8869708495356234989, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0f8b056c4d31eb840a4f89267e8122b3, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d49c71079a444963857b600f7b6384c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 600a7712..30896d70 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -2495,36 +2495,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1885844597663085898, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 25.800293 - objectReference: {fileID: 0} - - target: {fileID: 2059738712371773594, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2613923737832606406, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: rarity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} --- !u!224 &3084478268397759140 stripped @@ -2580,7 +2555,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2590,17 +2565,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 198 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2640,12 +2615,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 305 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: -128 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2697,6 +2672,11 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 8966107942931458497, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} --- !u!224 &3613327424185171990 stripped @@ -2834,6 +2814,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1830622607173961941, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1885844597663085898, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x @@ -2857,7 +2842,7 @@ PrefabInstance: - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2924,7 +2909,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2934,17 +2919,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 198 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2984,12 +2969,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 99 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: -128 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3026,6 +3011,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5378502411292485285, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive @@ -3178,6 +3168,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1242589404625503983, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1830622607173961941, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive @@ -3283,7 +3278,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3293,17 +3288,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 198 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3343,12 +3338,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 511 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: -128 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab index cf8ca6b7..db0270d2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab @@ -184,7 +184,7 @@ GameObject: - component: {fileID: 6486029259687730670} - component: {fileID: 7496425599929197993} m_Layer: 5 - m_Name: silver + m_Name: gold m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -236,7 +236,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -258,7 +258,7 @@ GameObject: - component: {fileID: 7244427594386943271} - component: {fileID: 5438419457479045714} m_Layer: 5 - m_Name: copper + m_Name: silver m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -310,7 +310,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -332,7 +332,7 @@ GameObject: - component: {fileID: 7559748154084302323} - component: {fileID: 6279451777898973806} m_Layer: 5 - m_Name: yellow + m_Name: copper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -384,7 +384,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} + m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -558,7 +558,7 @@ GameObject: - component: {fileID: 8714369511752251344} - component: {fileID: 3359193964770176237} m_Layer: 5 - m_Name: gold + m_Name: purple m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -610,7 +610,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} + m_Sprite: {fileID: 21300000, guid: 9e83c76181e7dca4b92cbbb0ec3751ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab index d51a2242..e9bc9549 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab @@ -15,7 +15,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2887575335600208513 RectTransform: m_ObjectHideFlags: 0 @@ -32,9 +32,9 @@ RectTransform: m_Father: {fileID: 135021159977205431} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 339, y: -2} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &83536216591997874 @@ -121,7 +121,7 @@ GameObject: m_Component: - component: {fileID: 295254682879803719} m_Layer: 5 - m_Name: silver + m_Name: gold m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -176,7 +176,8 @@ 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: 6153581475224441021} m_Father: {fileID: 7340080036641221667} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -212,7 +213,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} + m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -287,7 +288,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} + m_Sprite: {fileID: 21300000, guid: 9e83c76181e7dca4b92cbbb0ec3751ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -307,12 +308,12 @@ GameObject: m_Component: - component: {fileID: 6403505569804138876} m_Layer: 5 - m_Name: gold + m_Name: purple m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6403505569804138876 RectTransform: m_ObjectHideFlags: 0 @@ -329,9 +330,9 @@ RectTransform: m_Father: {fileID: 135021159977205431} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 305, y: -2} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2308454864973730191 @@ -566,7 +567,7 @@ GameObject: m_Component: - component: {fileID: 7340080036641221667} m_Layer: 5 - m_Name: yellow + m_Name: copper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -658,7 +659,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1045,7 +1046,7 @@ GameObject: m_Component: - component: {fileID: 7428997426145977575} m_Layer: 5 - m_Name: copper + m_Name: silver m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1802,7 +1803,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0939e7a58e752244aefcae5de48a36f, type: 3} + m_Sprite: {fileID: 21300000, guid: fe59704549e1e8c4fafe379d5a121714, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2647,7 +2648,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2936,6 +2937,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2578452183215564572} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6583438282654538371 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2520922652578556911} + m_Modifications: + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.000079870224 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4716757900467751090, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_Name + value: pt_Glitter (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c57f625e1d4a17f4dbc55e25fbb71794, type: 3} +--- !u!4 &6153581475224441021 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + m_PrefabInstance: {fileID: 6583438282654538371} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7859714066852031417 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 4890a88f..9b520571 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -27,7 +27,7 @@ RectTransform: m_GameObject: {fileID: 1735230268650569057} 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.1} m_Children: [] m_Father: {fileID: 8536603424566114135} m_RootOrder: 1 @@ -149,7 +149,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 186, y: 98} + m_SizeDelta: {x: 186, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603422629144345 CanvasRenderer: @@ -776,8 +776,8 @@ 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: -260, y: 57} - m_SizeDelta: {x: 46, y: 52} + m_AnchoredPosition: {x: -261, y: 54} + m_SizeDelta: {x: 54, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424057203240 CanvasRenderer: @@ -902,7 +902,7 @@ RectTransform: m_GameObject: {fileID: 8536603424202476249} 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.1} m_Children: [] m_Father: {fileID: 8536603422629144348} m_RootOrder: 0 @@ -1063,7 +1063,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 186, y: 98} + m_SizeDelta: {x: 186, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424418812067 CanvasRenderer: @@ -1207,7 +1207,7 @@ RectTransform: m_GameObject: {fileID: 8536603424476639146} 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.1} m_Children: [] m_Father: {fileID: 8536603424566114135} m_RootOrder: 0 @@ -1291,7 +1291,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 198, y: 100} + m_SizeDelta: {x: 198, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424566114133 CanvasRenderer: @@ -1431,7 +1431,7 @@ RectTransform: m_GameObject: {fileID: 8536603424714656551} 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.1} m_Children: [] m_Father: {fileID: 8536603424418812069} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index f6d9941b..b896653e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -641,7 +641,7 @@ RectTransform: m_GameObject: {fileID: 9133304335344414330} 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.1} m_Children: [] m_Father: {fileID: 9133304335268316947} m_RootOrder: 0 @@ -1880,7 +1880,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 88, y: 36} + m_SizeDelta: {x: 102, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304336582582508 CanvasRenderer: @@ -1909,7 +1909,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 From cfa656a7234e147d8693d57ec44b235bfa15620c Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 19 Nov 2021 18:11:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=B9=E3=81=8D=E5=87=BA=E3=81=97?= =?UTF-8?q?=E3=82=82=E3=82=84=E3=82=82=E3=82=84=E4=BD=8D=E7=BD=AE=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/Customer_complain.anim | 45 +++++++++++++++++++ .../Resources/Avatars/customer_normal.prefab | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim b/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim index c9e81951..2d97663e 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim @@ -260,6 +260,25 @@ AnimationClip: path: complain/c classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Text (TMP) + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -310,6 +329,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 271242783 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -711,6 +737,25 @@ AnimationClip: path: classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Text (TMP) + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab index 3fd3b524..038c95f6 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab @@ -5195,7 +5195,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3340056901353795718} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.344, y: 0.602, z: 0} + m_LocalPosition: {x: 0.42, y: 0.72, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6833058327206855056}