Commit 9ccad6d1 authored by bennet's avatar bennet
Browse files

merge

parents 64e2905d 7ea10b7e
fileFormatVersion: 2
guid: 74fd32b8a82a08841abd27b278fdf4b0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -87,6 +87,11 @@ PrefabInstance:
propertyPath: m_Name
value: Alec01 - Normal
objectReference: {fileID: 0}
- target: {fileID: 410240016723380963, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 410240016723380974, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -142,5 +147,170 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3496541608951688702, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 7967589254629320896, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5858599330244663355, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1869432239716898143, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3724322219112680698, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8970305637335682363, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 159896255438553840, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8643758281225437137, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6574650936156730286, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1590305809032373699, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1834883323824247066, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5799803282033599842, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4840293020783204013, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 7089274888687980036, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 266155634845225806, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 9180661267893388161, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4067169356635135679, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5030930216056252273, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 9074059926186805916, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2305501277637724239, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4611672960152322264, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 528110195495816114, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2330504413008659477, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1600690903946524806, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6254890177604738387, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 566407515017121974, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5476880793443822010, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2485912290098950040, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3107031151174153118, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 9134270292712675517, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 7650488674843075877, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8196263356558682885, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4769290014967679785, guid: 9e8beda23f6d6cf419b678f09d5fbfcd,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9e8beda23f6d6cf419b678f09d5fbfcd, type: 3}
......@@ -12,6 +12,11 @@ PrefabInstance:
propertyPath: m_Name
value: Alec02 - Blau
objectReference: {fileID: 0}
- target: {fileID: 5493651793314431713, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5493651793314431724, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -67,6 +72,171 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3985503441853714623, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1783923672165142585, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2818892841527615682, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8721816877689693692, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8800978699341858040, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5799975082100940125, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5455047584367758066, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2569258259528084775, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4501598997739943891, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3165469647358871046, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3886823492268623161, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6889890162392575425, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5835249519366134040, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3774475263320752798, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1347123971716086700, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8213814578037135037, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5349637609455377228, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4049530139841159943, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5681309899012244400, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6898076233270898820, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6229288754705399885, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1869313215125695840, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 765617398405832367, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5643116497773942964, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2252359835015615825, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 890969783993675635, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 400224691163472312, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3955403900268989315, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8535407832737253594, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 7627889709047335959, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 7102823618828942236, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 7778723858292631450, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 838729270346122027, guid: 669b92586d18c0f48a1ae596e08c0f1c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 669b92586d18c0f48a1ae596e08c0f1c, type: 3}
--- !u!1001 &6392274978887222944
......
......@@ -87,6 +87,11 @@ PrefabInstance:
propertyPath: m_Name
value: Alec03 - Gelb
objectReference: {fileID: 0}
- target: {fileID: 8951984370474805475, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8951984370474805486, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -142,5 +147,170 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 525183010485025469, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2938401158988724795, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5263748453912891390, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1664134433779419840, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5342907527606775546, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6952203168125056863, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2011007551282703364, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1044392121584655825, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 1414516966410340133, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8913381817774104816, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 429614611447066427, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6988585982368445210, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 317266455235504284, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8042100659175032771, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4754637643862129855, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8807688910263447886, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 591197906295736581, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2501603858627875246, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 8051427472033651334, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 9141911597303146930, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4226221011438711981, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 7382640552619223631, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3024073824054052706, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3858295520936954810, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4349304223004001649, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 9103720877726921398, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3406819460696817491, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 496209107896000897, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5950597727791583646, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6475398013221201429, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5077058001906049752, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6626234635840736664, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4297923582748141865, guid: f5e0b591147e8c54b98e995df763ee6c,
type: 3}
propertyPath: m_Layer
value: 12
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f5e0b591147e8c54b98e995df763ee6c, type: 3}
......@@ -87,6 +87,11 @@ PrefabInstance:
propertyPath: m_Name
value: "Alec04 - Gr\xFCn"
objectReference: {fileID: 0}
- target: {fileID: 5881741803348790103, guid: bc03cf71281430741b3cf1fb088807bc,