Merge branch 'Pasha'
This commit is contained in:
@@ -542,10 +542,6 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
<CanvasRect>k__BackingField: {fileID: 1539476655}
|
||||
<GameCanvas>k__BackingField: {fileID: 1539476654}
|
||||
<ImagePrefab>k__BackingField: {fileID: 1810675969122322477, guid: 792c010445685104eac99ebe5c3831ce,
|
||||
type: 3}
|
||||
<Images>k__BackingField: {fileID: 11400000, guid: 157e9466a4474c147bbd98676e5b1d22,
|
||||
type: 2}
|
||||
--- !u!1 &1683319378
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -646,6 +642,17 @@ MonoBehaviour:
|
||||
<SampleChild>k__BackingField: {fileID: 8853825751094127020, guid: 2cad467961f3cff4984a6f50fc091377,
|
||||
type: 3}
|
||||
<GameCanvas>k__BackingField: {fileID: 1539476654}
|
||||
<WindowTypes>k__BackingField:
|
||||
- <Typename>k__BackingField: InterfaceOff.BasicWindow
|
||||
<SpawnWeight>k__BackingField: 10
|
||||
- <Typename>k__BackingField: InterfaceOff.MovingWindow
|
||||
<SpawnWeight>k__BackingField: 2
|
||||
- <Typename>k__BackingField: InterfaceOff.ImageWindow
|
||||
<SpawnWeight>k__BackingField: 1
|
||||
- <Typename>k__BackingField: InterfaceOff.TrollWindow
|
||||
<SpawnWeight>k__BackingField: 2
|
||||
- <Typename>k__BackingField: InterfaceOff.TriviaWindow
|
||||
<SpawnWeight>k__BackingField: 4
|
||||
<AutoSpawn>k__BackingField: 1
|
||||
--- !u!4 &2038986853
|
||||
Transform:
|
||||
|
||||
Reference in New Issue
Block a user