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

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

This commit is contained in:
koya_15 2021-11-29 16:29:27 +09:00
parent 760700ddc4 f6873ccd5a
commit 296f345a8e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -2891,6 +2891,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 772e0346311a433fb714573f207813d2, type: 3} m_Script: {fileID: 11500000, guid: 772e0346311a433fb714573f207813d2, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
walkerInterval: 10
adWalkerDuration: 60
adWalkerCount: 20
tastingCustomerInterval: 5
--- !u!114 &658817262 --- !u!114 &658817262
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2960,6 +2964,7 @@ MonoBehaviour:
customerFlow: {fileID: 658817261} customerFlow: {fileID: 658817261}
orderPosisionObject: {fileID: 1717315655} orderPosisionObject: {fileID: 1717315655}
customerData: {fileID: 658817262} customerData: {fileID: 658817262}
customerSetting: {fileID: 0}
customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7, customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7,
type: 3} type: 3}
--- !u!4 &658817264 --- !u!4 &658817264
@ -7395,12 +7400,12 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 5 m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: 1c2a241c79997427ba36c3cb6e5e3eba, type: 3} m_Sprite: {fileID: 21300000, guid: eec1c209826c64ee992031fcf2063f7b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 9.18, y: 9.68} m_Size: {x: 6.96, y: 6.22}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1