yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/addMiniGame' of https://bitbucket.org/usaya/popcorn into feature/addMiniGame

This commit is contained in:
水谷圭吾 2022-07-05 10:05:26 +09:00
parent 14916013e8 70d39fe218
commit 90a7472e48
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
popcorn/Assets/MyGame/Scenes/shopping/ExchangeAchievement.unity
View File

@ -157,7 +157,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -124} m_AnchoredPosition: {x: 0, y: -106}
m_SizeDelta: {x: 548, y: 172} m_SizeDelta: {x: 548, y: 172}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &107504457 --- !u!114 &107504457
@ -272,7 +272,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 56bacab3ee5cde548bead9091b70bf3f, type: 3} m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -449,7 +449,7 @@ RectTransform:
m_GameObject: {fileID: 497670573} m_GameObject: {fileID: 497670573}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children: m_Children:
- {fileID: 1803163401} - {fileID: 1803163401}
m_Father: {fileID: 771396106} m_Father: {fileID: 771396106}
@ -457,7 +457,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1, y: -22} m_AnchoredPosition: {x: -1, y: -31}
m_SizeDelta: {x: 150, y: 150} m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &594261736 --- !u!1 &594261736
@ -493,7 +493,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 112} m_AnchoredPosition: {x: 0, y: 103}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &771396105 --- !u!1 &771396105
@ -533,8 +533,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -22} m_AnchoredPosition: {x: 0, y: -19}
m_SizeDelta: {x: 650, y: 300} m_SizeDelta: {x: 650, y: 320}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &771396107 --- !u!114 &771396107
MonoBehaviour: MonoBehaviour:
@ -895,7 +895,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 26} m_AnchoredPosition: {x: 0, y: 23}
m_SizeDelta: {x: 450, y: 86} m_SizeDelta: {x: 450, y: 86}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1193390270 --- !u!114 &1193390270
@ -917,7 +917,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: b033049ececb6bf43b4a962fad11fdab, type: 3} m_Sprite: {fileID: 21300000, guid: 05c5b7e900206b442b94d0e96066685d, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 1 m_PreserveAspect: 1
m_FillCenter: 1 m_FillCenter: 1
@ -1034,7 +1034,7 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: 2a538aefbbc86f343a252fcb7cc6fb7f, type: 3} m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 40 m_FontSize: 40
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 1 m_BestFit: 1
@ -1282,7 +1282,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -192} m_AnchoredPosition: {x: 0, y: -192}
m_SizeDelta: {x: 705, y: 570} m_SizeDelta: {x: 705, y: 590}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1499797196 --- !u!114 &1499797196
MonoBehaviour: MonoBehaviour:
@ -1456,17 +1456,17 @@ PrefabInstance:
- target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316, - target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316,
type: 3} type: 3}
propertyPath: m_LocalScale.x propertyPath: m_LocalScale.x
value: 1.2 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316, - target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316,
type: 3} type: 3}
propertyPath: m_LocalScale.y propertyPath: m_LocalScale.y
value: 1.2 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316, - target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316,
type: 3} type: 3}
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
value: 1.2 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316, - target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316,
type: 3} type: 3}
@ -1511,7 +1511,7 @@ PrefabInstance:
- target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316, - target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: -2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316, - target: {fileID: 3719207458405043424, guid: 9a2aaf7985e538d42b6167af79daf316,
type: 3} type: 3}