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

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

* 'develop' of https://bitbucket.org/usaya/popcorn:
  デザインブラッシュアップ
  スプレッドシート更新
  店舗レベルアップの文字調整
  文字再度調整
  店舗レベルアップ文字調整
  se変更、黒背景見切れているところ修正
  デイリーミッション枠整
This commit is contained in:
kimura 2021-11-05 13:27:50 +09:00
parent 2a1938bc5f 6039a661cc
commit f0b5450fc5
17 changed files with 72 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resource/Animation/title_logo.anim
View File

@ -277,7 +277,7 @@ AnimationClip:
m_Events: m_Events:
- time: 0.15 - time: 0.15
functionName: OnPlaySE functionName: OnPlaySE
data: se_cooking_corn_Pop data: se_title_logo
objectReferenceParameter: {fileID: 0} objectReferenceParameter: {fileID: 0}
floatParameter: 0 floatParameter: 0
intParameter: 0 intParameter: 0

BIN
popcorn/Assets/MyGame/Resource/Material/Brother/CornField_salesclerk_Blue_body.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_detail_pop_Dither.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_Dither.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_tutorial_FryingPanExplanation_Dither.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 330 KiB

After

Width:  |  Height:  |  Size: 330 KiB

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
wK0MjHy8RgCMpTRnyp4WCrYVNwfTKRCKd/5w6sNi95pu8f5eznyhR+Hywv7YM2Gv Sz4TS46GBew/hdCfZlfAW/7gCKTt2f4mat4oryLL87ADWBikFK/6EY/8F9Z4Udq4

2
popcorn/Assets/MyGame/Resources/Data/FieldUpgradeData.txt
View File

@ -1 +1 @@
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

2
popcorn/Assets/MyGame/Resources/Data/PanData.txt
View File

@ -1 +1 @@
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

2
popcorn/Assets/MyGame/Resources/Data/ProductData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Resources/Data/ScriptData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Resources/Data/ShopData.txt
View File

File diff suppressed because one or more lines are too long

2
popcorn/Assets/MyGame/Resources/Data/TutorialData.txt
View File

File diff suppressed because one or more lines are too long

BIN
popcorn/Assets/MyGame/Resources/Sounds/SE/se_title_logo.wav Normal file
View File

Binary file not shown.

22
popcorn/Assets/MyGame/Resources/Sounds/SE/se_title_logo.wav.meta Normal file
View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 104ce683af7224e43a2e4c949fb198f1
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

34
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
View File

@ -1558,7 +1558,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: 475.7} m_AnchoredPosition: {x: 0, y: 504}
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!114 &2660639677099381262 --- !u!114 &2660639677099381262
@ -1726,7 +1726,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: 104} m_AnchoredPosition: {x: 0, y: 98}
m_SizeDelta: {x: 300, y: 138} m_SizeDelta: {x: 300, y: 138}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2660639677226913018 --- !u!222 &2660639677226913018
@ -1859,7 +1859,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: 412} m_AnchoredPosition: {x: 0, y: 443}
m_SizeDelta: {x: 800, y: 70} m_SizeDelta: {x: 800, y: 70}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2660639677480706702 --- !u!222 &2660639677480706702
@ -2371,7 +2371,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 10}
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!225 &2660639677971123132 --- !u!225 &2660639677971123132
@ -2726,7 +2726,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: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 990, y: 1466} m_SizeDelta: {x: 990, y: 1600}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3595932897297885638 --- !u!114 &3595932897297885638
MonoBehaviour: MonoBehaviour:
@ -2853,7 +2853,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: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 990, y: 1466} m_SizeDelta: {x: 990, y: 1600}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2660639678600407769 --- !u!222 &2660639678600407769
CanvasRenderer: CanvasRenderer:
@ -3075,8 +3075,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: -69} m_AnchoredPosition: {x: 0, y: -85.70002}
m_SizeDelta: {x: 900, y: 880} m_SizeDelta: {x: 900, y: 980}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5142847172670219607 --- !u!114 &5142847172670219607
MonoBehaviour: MonoBehaviour:
@ -4658,7 +4658,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: 648} m_AnchoredPosition: {x: 0, y: 692.3}
m_SizeDelta: {x: 750, y: 114} m_SizeDelta: {x: 750, y: 114}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2369406120133834676 --- !u!222 &2369406120133834676
@ -5647,8 +5647,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: 41} m_AnchoredPosition: {x: 0, y: 37.299976}
m_SizeDelta: {x: 935, y: 1180} m_SizeDelta: {x: 935, y: 1270}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6047797878840319401 --- !u!222 &6047797878840319401
CanvasRenderer: CanvasRenderer:
@ -6609,18 +6609,18 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3}
--- !u!1 &6410983111595538124 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
type: 3}
m_PrefabInstance: {fileID: 2686639074240930400}
m_PrefabAsset: {fileID: 0}
--- !u!224 &6170226839459316569 stripped --- !u!224 &6170226839459316569 stripped
RectTransform: RectTransform:
m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e, m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
type: 3} type: 3}
m_PrefabInstance: {fileID: 2686639074240930400} m_PrefabInstance: {fileID: 2686639074240930400}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &6410983111595538124 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
type: 3}
m_PrefabInstance: {fileID: 2686639074240930400}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6641948177867439223 --- !u!1001 &6641948177867439223
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

34
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab
View File

@ -34,7 +34,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: 65, y: -45} m_AnchoredPosition: {x: 65, y: -26}
m_SizeDelta: {x: 600, y: 80} m_SizeDelta: {x: 600, y: 80}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8660695103810319527 --- !u!1 &8660695103810319527
@ -484,7 +484,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: 65, y: -45} m_AnchoredPosition: {x: 65, y: -21}
m_SizeDelta: {x: 600, y: 80} m_SizeDelta: {x: 600, y: 80}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8660695104385436384 --- !u!1 &8660695104385436384
@ -524,7 +524,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: -153} m_AnchoredPosition: {x: 0, y: -137}
m_SizeDelta: {x: 270, y: 130} m_SizeDelta: {x: 270, y: 130}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8660695104385436396 --- !u!222 &8660695104385436396
@ -781,7 +781,7 @@ RectTransform:
m_GameObject: {fileID: 8660695104521205920} m_GameObject: {fileID: 8660695104521205920}
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: 0.9, y: 0.9, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8660695104834774514} m_Father: {fileID: 8660695104834774514}
m_RootOrder: 1 m_RootOrder: 1
@ -862,7 +862,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: 27.001953} m_AnchoredPosition: {x: 11, y: 12}
m_SizeDelta: {x: 570, y: 80} m_SizeDelta: {x: 570, y: 80}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8660695104801603080 --- !u!222 &8660695104801603080
@ -897,9 +897,9 @@ MonoBehaviour:
m_FontSize: 35 m_FontSize: 35
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 1 m_BestFit: 1
m_MinSize: 30 m_MinSize: 35
m_MaxSize: 35 m_MaxSize: 40
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@ -977,7 +977,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: 6, y: 187} m_AnchoredPosition: {x: 6, y: 176}
m_SizeDelta: {x: 666, y: 60} m_SizeDelta: {x: 666, y: 60}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8660695104846840909 --- !u!222 &8660695104846840909
@ -11064,7 +11064,7 @@ RectTransform:
m_GameObject: {fileID: 8660695105580868203} m_GameObject: {fileID: 8660695105580868203}
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: 0.9, y: 0.9, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8660695104214859342} m_Father: {fileID: 8660695104214859342}
m_RootOrder: 0 m_RootOrder: 0
@ -11145,7 +11145,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: 27} m_AnchoredPosition: {x: 11, y: 12}
m_SizeDelta: {x: 570, y: 80} m_SizeDelta: {x: 570, y: 80}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8660695105669835444 --- !u!222 &8660695105669835444
@ -11180,9 +11180,9 @@ MonoBehaviour:
m_FontSize: 35 m_FontSize: 35
m_FontStyle: 1 m_FontStyle: 1
m_BestFit: 1 m_BestFit: 1
m_MinSize: 30 m_MinSize: 35
m_MaxSize: 35 m_MaxSize: 40
m_Alignment: 4 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
@ -11296,10 +11296,10 @@ RectTransform:
m_Father: {fileID: 8660695105553703406} m_Father: {fileID: 8660695105553703406}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1027.7856, y: 528} m_SizeDelta: {x: 2200, y: 3000}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8660695105907544111 --- !u!222 &8660695105907544111
CanvasRenderer: CanvasRenderer:

16
popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity
View File

@ -1194,7 +1194,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: -527} m_AnchoredPosition: {x: 0, y: -550}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &843133638 --- !u!1 &843133638
@ -1234,7 +1234,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: -174, y: 138.99997} m_AnchoredPosition: {x: -174, y: 154}
m_SizeDelta: {x: 230, y: 112} m_SizeDelta: {x: 230, y: 112}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &843133640 --- !u!114 &843133640
@ -1777,7 +1777,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: 20, y: 50} m_AnchoredPosition: {x: 20, y: 50}
m_SizeDelta: {x: 920, y: 1250} m_SizeDelta: {x: 920, y: 1300}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1037294270 --- !u!1 &1037294270
GameObject: GameObject:
@ -1815,7 +1815,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: 157, y: 139} m_AnchoredPosition: {x: 157, y: 154}
m_SizeDelta: {x: 230, y: 112} m_SizeDelta: {x: 230, y: 112}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1037294272 --- !u!114 &1037294272
@ -2163,7 +2163,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: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 920, y: 1250} m_SizeDelta: {x: 920, y: 1300}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1157984680 --- !u!114 &1157984680
MonoBehaviour: MonoBehaviour:
@ -2240,7 +2240,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: -10, y: 520} m_AnchoredPosition: {x: -10, y: 539}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1160535648 --- !u!114 &1160535648
@ -3025,7 +3025,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: -7, y: -232} m_AnchoredPosition: {x: -7, y: -255}
m_SizeDelta: {x: 700, y: 220} m_SizeDelta: {x: 700, y: 220}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1649038406 --- !u!1 &1649038406
@ -3248,7 +3248,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: 157, y: 139} m_AnchoredPosition: {x: 157, y: 154}
m_SizeDelta: {x: 230, y: 112} m_SizeDelta: {x: 230, y: 112}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1853630204 --- !u!114 &1853630204