- Maps now properly reset when randomised.

- Some countries are now "hard mode" options, and are not chosen by default.
- Map dot switched to a quad to save on triangles.
- Map borders SDF updated to be more repeatable when making new maps.
- Added looping options to SFX.
- Added a "Carmen In Jail" SFX event.
- Added a curved TV monitor model for video player.
- Added a loot image URL setting for the case list entries.
This commit is contained in:
Jamie Greunbaum 2025-06-30 02:37:34 -04:00
parent 615ef7de5b
commit e557398084
36 changed files with 1117 additions and 455 deletions

Binary file not shown.

View File

@ -0,0 +1,41 @@
fileFormatVersion: 2
guid: a3782a44fca9d2d439318892b75d3b93
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.7
conversionMode: 0
preloadAudioData: 1
platformSettingOverrides:
4:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 1
7:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.25
conversionMode: 0
preloadAudioData: 1
forceToMono: 1
normalize: 1
loadInBackground: 1
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 0adb3a9b1c6f25347b09f0a1c344b07b
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 0
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 1
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 0
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 0
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -127,7 +127,7 @@ MonoBehaviour:
value: 0 value: 0
saturation: saturation:
overrideState: 1 overrideState: 1
value: 10 value: 25
brightness: brightness:
overrideState: 1 overrideState: 1
value: 0 value: 0

View File

@ -323,7 +323,7 @@ MonoBehaviour:
DisallowTheft: 1 DisallowTheft: 1
ExactGun: {fileID: 0} ExactGun: {fileID: 0}
ExactGrip: {fileID: 0} ExactGrip: {fileID: 0}
allowManipulationWhenEquipped: 0 allowManipulationWhenEquipped: 1
orientation: 0 orientation: 0
AutoHold: 2 AutoHold: 2
InteractionText: Pick Up InteractionText: Pick Up

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -132,13 +132,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9138048797662084823} m_GameObject: {fileID: 9138048797662084823}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01, y: 1, z: 0.01} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 6251298004829518537} m_Father: {fileID: 6251298004829518537}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &7779165006461036875 --- !u!33 &7779165006461036875
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -146,7 +146,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9138048797662084823} m_GameObject: {fileID: 9138048797662084823}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6420503616315817588 --- !u!23 &6420503616315817588
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -433,7 +433,7 @@ Rigidbody:
serializedVersion: 4 serializedVersion: 4
m_Mass: 1 m_Mass: 1
m_Drag: 0 m_Drag: 0
m_AngularDrag: 10000000 m_AngularDrag: 10
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@ -600,7 +600,6 @@ MonoBehaviour:
PrefabModifications: [] PrefabModifications: []
SerializationNodes: [] SerializationNodes: []
_udonSharpBackingUdonBehaviour: {fileID: 4753408817013827661} _udonSharpBackingUdonBehaviour: {fileID: 4753408817013827661}
_Enabled: 0
_LocationFindingEnabled: 0 _LocationFindingEnabled: 0
_GameManager: {fileID: 0} _GameManager: {fileID: 0}
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2} _LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}

View File

@ -21584,6 +21584,91 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabInstance: {fileID: 4362789101225005290}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &1123401065
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1991311617}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2}
- target: {fileID: 919132149155446097, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
propertyPath: m_Name
value: SM_TVScreen
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0adb3a9b1c6f25347b09f0a1c344b07b, type: 3}
--- !u!23 &1123401066 stripped
MeshRenderer:
m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
m_PrefabInstance: {fileID: 1123401065}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1123401067 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0adb3a9b1c6f25347b09f0a1c344b07b,
type: 3}
m_PrefabInstance: {fileID: 1123401065}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1134073944 stripped --- !u!1 &1134073944 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 6204471231925583325, guid: 899ce13087fd5974f88dcbccaea2df85, m_CorrespondingSourceObject: {fileID: 6204471231925583325, guid: 899ce13087fd5974f88dcbccaea2df85,
@ -28799,7 +28884,7 @@ AudioSource:
Mute: 0 Mute: 0
Spatialize: 0 Spatialize: 0
SpatializePostEffects: 0 SpatializePostEffects: 0
Priority: 10 Priority: 9
DopplerLevel: 1 DopplerLevel: 1
MinDistance: 0.22863333 MinDistance: 0.22863333
MaxDistance: 500 MaxDistance: 500
@ -35032,7 +35117,7 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 0 m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
@ -35291,7 +35376,7 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 0 m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
@ -36203,6 +36288,7 @@ Transform:
m_Children: m_Children:
- {fileID: 158746911} - {fileID: 158746911}
- {fileID: 1547939854} - {fileID: 1547939854}
- {fileID: 2018849106}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1947493794 --- !u!114 &1947493794
@ -36273,6 +36359,7 @@ MonoBehaviour:
_InJail: {fileID: 8300000, guid: bde3bed97680134498790ef9bbc8e0a8, type: 3} _InJail: {fileID: 8300000, guid: bde3bed97680134498790ef9bbc8e0a8, type: 3}
_MapCorrect: {fileID: 8300000, guid: 680142b640a682d4a92c9935828c2311, type: 3} _MapCorrect: {fileID: 8300000, guid: 680142b640a682d4a92c9935828c2311, type: 3}
_MapIncorrect: {fileID: 8300000, guid: 1494bab0c02f97843ba2bc2b6c1fa4ee, type: 3} _MapIncorrect: {fileID: 8300000, guid: 1494bab0c02f97843ba2bc2b6c1fa4ee, type: 3}
_CarmenInJail: {fileID: 8300000, guid: a3782a44fca9d2d439318892b75d3b93, type: 3}
_CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444, _CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444,
type: 3} type: 3}
_CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6, _CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6,
@ -36634,28 +36721,33 @@ PrefabInstance:
- target: {fileID: 1439010666864111812, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111812, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: UdonSyncPlayer (Unity) value: TV Screen
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1439010666864111818, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3}
propertyPath: targetMaterialRenderer
value:
objectReference: {fileID: 1123401066}
- target: {fileID: 1439010666864111818, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111818, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
propertyPath: targetAudioSources.Array.data[0] propertyPath: targetAudioSources.Array.data[0]
value: value:
objectReference: {fileID: 158746910} objectReference: {fileID: 158746910}
- target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111820, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
propertyPath: m_LocalScale.x propertyPath: serializedPublicVariablesBytesString
value: 0.1 value: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgMAAAAAAAAAAi8CAAAAAW0AAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAVgBSAEMALgBTAEQASwAzAC4AVgBpAGQAZQBvAC4AQwBvAG0AcABvAG4AZQBuAHQAcwAuAEIAYQBzAGUALgBCAGEAcwBlAFYAUgBDAFYAaQBkAGUAbwBQAGwAYQB5AGUAcgAsACAAVgBSAEMAUwBEAEsAMwBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQYAAABwAGwAYQB5AGUAcgAnAQQAAAB0AHkAcABlAAE2AAAAVgBSAEMALgBTAEQASwAzAC4AVgBpAGQAZQBvAC4AQwBvAG0AcABvAG4AZQBuAHQAcwAuAFYAUgBDAFUAbgBpAHQAeQBWAGkAZABlAG8AUABsAGEAeQBlAHIALAAgAFYAUgBDAFMARABLADMACwEFAAAAVgBhAGwAdQBlAAAAAAAHBQIvAwAAAAFKAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFMAeQBzAHQAZQBtAC4AUwBpAG4AZwBsAGUALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAMAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAQ0AAABzAHkAbgBjAEYAcgBlAHEAdQBlAG4AYwB5ACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAaQBuAGcAbABlACwAIABtAHMAYwBvAHIAbABpAGIAHwEFAAAAVgBhAGwAdQBlAAAAcEEHBQIvBAAAAAFLAAAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQBgADEAWwBbAFMAeQBzAHQAZQBtAC4AQgBvAG8AbABlAGEAbgAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ABAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABEQAAAGEAbABsAG8AdwBHAHUAZQBzAHQAQwBvAG4AdAByAG8AbAAnAQQAAAB0AHkAcABlAAEYAAAAUwB5AHMAdABlAG0ALgBCAG8AbwBsAGUAYQBuACwAIABtAHMAYwBvAHIAbABpAGIAKwEFAAAAVgBhAGwAdQBlAAEHBQcFBwU=
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111820, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
propertyPath: m_LocalScale.y propertyPath: publicVariablesUnityEngineObjects.Array.size
value: 0.1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111820, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
propertyPath: m_LocalScale.z propertyPath: publicVariablesUnityEngineObjects.Array.data[0]
value: 0.1 value:
objectReference: {fileID: 0} objectReference: {fileID: 1967830429}
- target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -36664,7 +36756,7 @@ PrefabInstance:
- target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 1.41 value: 1.232
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, - target: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3} type: 3}
@ -36749,7 +36841,13 @@ PrefabInstance:
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 7639350706768358381, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} - {fileID: 7639350706768358381, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3}
m_AddedGameObjects: [] - {fileID: 1439010667097516304, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3}
- {fileID: 2749372315644709431, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3}
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3}
insertIndex: -1
addedObject: {fileID: 1123401067}
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f2d01e7f26c5bb04f8c22c15fbf7475b, type: 3}
--- !u!114 &1967830429 stripped --- !u!114 &1967830429 stripped
@ -36941,6 +37039,12 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1967830428} m_PrefabInstance: {fileID: 1967830428}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &1991311617 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1439010666864111823, guid: f2d01e7f26c5bb04f8c22c15fbf7475b,
type: 3}
m_PrefabInstance: {fileID: 1967830428}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1991362173 stripped --- !u!1 &1991362173 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 7034199273745288373, guid: 126991d511ca61841a0ef899b6c038a6, m_CorrespondingSourceObject: {fileID: 7034199273745288373, guid: 126991d511ca61841a0ef899b6c038a6,
@ -37566,6 +37670,154 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 134225857} m_PrefabInstance: {fileID: 134225857}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &2018849105
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2018849106}
- component: {fileID: 2018849108}
- component: {fileID: 2018849107}
m_Layer: 0
m_Name: Video Source
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2018849106
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2018849105}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1947493793}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2018849107
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2018849105}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -617992517, guid: 661092b4961be7145bfbe56e1e62337b, type: 3}
m_Name:
m_EditorClassIdentifier:
Gain: 10
Far: 80
Near: 0
VolumetricRadius: 0
EnableSpatialization: 0
UseAudioSourceVolumeCurve: 0
--- !u!82 &2018849108
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2018849105}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 24300002, guid: 6a25e5828fa5ccb4495cc6300b09a686,
type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 5
DopplerLevel: 1
MinDistance: 0.22863333
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &2019857651 stripped --- !u!1 &2019857651 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 7639649077870355987, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, m_CorrespondingSourceObject: {fileID: 7639649077870355987, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f,
@ -39383,7 +39635,7 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 0 m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
@ -43699,31 +43951,31 @@ MonoBehaviour:
useAssignedLayers: 0 useAssignedLayers: 0
DynamicPrefabs: [] DynamicPrefabs: []
DynamicMaterials: DynamicMaterials:
- {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2}
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
- {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2}
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2}
- {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2}
- {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2}
- {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2}
- {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2}
- {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2}
- {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2}
- {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2}
- {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2}
- {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2}
- {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2}
- {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2}
- {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2}
- {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2}
- {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2}
- {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2}
- {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
- {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2}
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2}
- {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2}

View File

@ -60,7 +60,7 @@ Shader "Carmen/Maps/SDF Map Borders"
void surf (Input IN, inout SurfaceOutputVRC o) void surf (Input IN, inout SurfaceOutputVRC o)
{ {
half linestep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex), 0.0075); half linestep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex), 0.025);
o.Albedo = lerp(UNITY_SAMPLE_TEX2D(_ColourTex, IN.uv_MainTex), half4(0.0, 0.0, 0.0, 1.0), linestep); o.Albedo = lerp(UNITY_SAMPLE_TEX2D(_ColourTex, IN.uv_MainTex), half4(0.0, 0.0, 0.0, 1.0), linestep);
o.Alpha = 1.0f; o.Alpha = 1.0f;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 MiB

After

Width:  |  Height:  |  Size: 17 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 MiB

After

Width:  |  Height:  |  Size: 25 MiB

View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 28 Data: 29
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -1052,13 +1052,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_Contessa Data: _CarmenInJail
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_Contessa Data: _CarmenInJail
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1082,19 +1082,10 @@ MonoBehaviour:
Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 62|UnityEngine.HeaderAttribute, UnityEngine.CoreModule Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: Crook Themes
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -1115,13 +1106,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_DoubleTrouble Data: _CrookTheme_Contessa
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_DoubleTrouble Data: _CrookTheme_Contessa
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1142,10 +1133,19 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 2
- Name:
Entry: 7
Data: 65|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: Crook Themes
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -1169,13 +1169,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_EarthaBrute Data: _CrookTheme_DoubleTrouble
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_EarthaBrute Data: _CrookTheme_DoubleTrouble
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1223,13 +1223,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_Kneemoi Data: _CrookTheme_EarthaBrute
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_Kneemoi Data: _CrookTheme_EarthaBrute
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1277,13 +1277,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_PattyLarceny Data: _CrookTheme_Kneemoi
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_PattyLarceny Data: _CrookTheme_Kneemoi
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1331,13 +1331,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_Robocrook Data: _CrookTheme_PattyLarceny
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_Robocrook Data: _CrookTheme_PattyLarceny
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1385,13 +1385,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_SarahNade Data: _CrookTheme_Robocrook
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_SarahNade Data: _CrookTheme_Robocrook
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1439,13 +1439,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_TopGrunge Data: _CrookTheme_SarahNade
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_TopGrunge Data: _CrookTheme_SarahNade
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1493,13 +1493,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_VicTheSlick Data: _CrookTheme_TopGrunge
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_VicTheSlick Data: _CrookTheme_TopGrunge
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1547,13 +1547,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _CrookTheme_WonderRat Data: _CrookTheme_VicTheSlick
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _CrookTheme_WonderRat Data: _CrookTheme_VicTheSlick
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 10 Data: 10
@ -1596,6 +1596,60 @@ MonoBehaviour:
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_WonderRat
- Name: $v
Entry: 7
Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CrookTheme_WonderRat
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
- Name: <SystemType>k__BackingField
Entry: 9
Data: 10
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 13 Entry: 13
Data: Data:

View File

@ -36,7 +36,8 @@ public enum SFXEventType
InJail, InJail,
MapCorrect, MapCorrect,
MapIncorrect MapIncorrect,
CarmenInJail
} }
@ -71,6 +72,7 @@ public class AudioManager : UdonSharpBehaviour
[SerializeField] private AudioClip _MapCorrect = null; [SerializeField] private AudioClip _MapCorrect = null;
[SerializeField] private AudioClip _MapIncorrect = null; [SerializeField] private AudioClip _MapIncorrect = null;
[SerializeField] private AudioClip _CarmenInJail = null;
[Header("Crook Themes")] [Header("Crook Themes")]
[SerializeField] private AudioClip _CrookTheme_Contessa = null; [SerializeField] private AudioClip _CrookTheme_Contessa = null;
@ -139,12 +141,30 @@ public class AudioManager : UdonSharpBehaviour
} }
[NetworkCallable] [NetworkCallable]
public void PlaySFXAtPitch(SFXEventType SFXEvent, float Pitch) public void PlaySFXLoop(SFXEventType SFXEvent)
{ {
_PlaySFX_Internal(SFXEvent, Pitch); _PlaySFX_Internal(SFXEvent, true);
} }
private void _PlaySFX_Internal(SFXEventType SFXEvent, float Pitch = 1.0f) [NetworkCallable]
public void PlaySFXAtPitch(SFXEventType SFXEvent, float Pitch)
{
_PlaySFX_Internal(SFXEvent, false, Pitch);
}
[NetworkCallable]
public void PlaySFXLoopAtPitch(SFXEventType SFXEvent, float Pitch)
{
_PlaySFX_Internal(SFXEvent, true, Pitch);
}
[NetworkCallable]
public void StopSFX()
{
_PlaySFX_Internal(SFXEventType.None);
}
private void _PlaySFX_Internal(SFXEventType SFXEvent, bool Loop = false, float Pitch = 1.0f)
{ {
_SFXPlayer.Stop(); _SFXPlayer.Stop();
@ -159,10 +179,13 @@ public class AudioManager : UdonSharpBehaviour
case SFXEventType.MapCorrect: _SFXPlayer.clip = _MapCorrect; break; case SFXEventType.MapCorrect: _SFXPlayer.clip = _MapCorrect; break;
case SFXEventType.MapIncorrect: _SFXPlayer.clip = _MapIncorrect; break; case SFXEventType.MapIncorrect: _SFXPlayer.clip = _MapIncorrect; break;
case SFXEventType.CarmenInJail: _SFXPlayer.clip = _CarmenInJail; break;
default: _SFXPlayer.clip = null; break; default: _SFXPlayer.clip = null; break;
} }
_SFXPlayer.loop = Loop;
if (_SFXPlayer.clip != null) if (_SFXPlayer.clip != null)
{ {
_SFXPlayer.pitch = Pitch; _SFXPlayer.pitch = Pitch;

View File

@ -94,7 +94,7 @@ public class CaseManager : UdonSharpBehaviour
ErrorString = "Ensure the 'Round 3' dictionary entry is a dictionary with a key called 'Continent' and an integer value."; ErrorString = "Ensure the 'Round 3' dictionary entry is a dictionary with a key called 'Continent' and an integer value.";
} }
ContinueToRound1(); ContinueToRound3();
} }
else else
{ {

View File

@ -170,25 +170,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: MapFiles Data: LootImage
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: MapFiles Data: LootImage
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 9
Data: 11|System.RuntimeType, mscorlib Data: 8
- Name:
Entry: 1
Data: VRC.SDKBase.VRCUrl[], VRCSDKBase
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 11 Data: 8
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -203,7 +197,7 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0
@ -224,19 +218,25 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: VideoFiles Data: MapFiles
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: VideoFiles Data: MapFiles
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 7
Data: 11 Data: 13|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.SDKBase.VRCUrl[], VRCSDKBase
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 11 Data: 13
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -272,25 +272,19 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: _DeserialisedData Data: VideoFiles
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: _DeserialisedData Data: VideoFiles
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 9
Data: 16|System.RuntimeType, mscorlib Data: 13
- Name:
Entry: 1
Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 16 Data: 13
- Name: <SyncMode>k__BackingField - Name: <SyncMode>k__BackingField
Entry: 7 Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -302,10 +296,10 @@ MonoBehaviour:
Data: Data:
- Name: <IsSerialized>k__BackingField - Name: <IsSerialized>k__BackingField
Entry: 5 Entry: 5
Data: false Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0

View File

@ -10,11 +10,10 @@ public class CaseManagerListEntry : UdonSharpBehaviour
public VRCUrl CaseFileURL; public VRCUrl CaseFileURL;
public VRCUrl LootImage;
public VRCUrl[] MapFiles; public VRCUrl[] MapFiles;
public VRCUrl[] VideoFiles; public VRCUrl[] VideoFiles;
private DataDictionary _DeserialisedData;
public void LoadCaseFile() public void LoadCaseFile()
{ {

View File

@ -42,7 +42,7 @@ public class GameManagerRound3 : GameManagerBase
[UdonSynced] private GameStatus _GameStatus = GameStatus.Pregame; [UdonSynced] private GameStatus _GameStatus = GameStatus.Pregame;
[UdonSynced] private int _Timer = TIMER_LENGTH; [UdonSynced] private int _Timer = TIMER_LENGTH;
private const float LENGTH_OF_ONE_SECOND = 1.04444444444444444f; private const float LENGTH_OF_ONE_SECOND = 1.022222222222222222222f;
private const int TIMER_LENGTH = 45; private const int TIMER_LENGTH = 45;
[UdonSynced] private int _SuccessCounter = 0; [UdonSynced] private int _SuccessCounter = 0;
@ -75,8 +75,7 @@ public class GameManagerRound3 : GameManagerBase
} }
FloorMap CurrentMap = GetCurrentMap(); FloorMap CurrentMap = GetCurrentMap();
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CurrentMap, NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CurrentMap, NetworkEventTarget.Owner,
NetworkEventTarget.Owner,
"RandomiseCountries"); "RandomiseCountries");
} }
else else
@ -110,8 +109,7 @@ public class GameManagerRound3 : GameManagerBase
private void StartTimer() private void StartTimer()
{ {
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
NetworkEventTarget.All,
"PlayMusicLoop", MusicEventType.CarmenChaseMusic); "PlayMusicLoop", MusicEventType.CarmenChaseMusic);
_GameStatus = GameStatus.Begin; _GameStatus = GameStatus.Begin;
@ -126,8 +124,7 @@ public class GameManagerRound3 : GameManagerBase
_Timer--; _Timer--;
if (_Timer < 0) if (_Timer < 0)
{ {
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkEventTarget.Owner,
NetworkEventTarget.Owner,
nameof(GameHasBeenLost), false); nameof(GameHasBeenLost), false);
return; return;
} }
@ -148,8 +145,7 @@ public class GameManagerRound3 : GameManagerBase
_SuccessCounter++; _SuccessCounter++;
if (_SuccessCounter >= MAX_SUCCESS_COUNT) if (_SuccessCounter >= MAX_SUCCESS_COUNT)
{ {
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkEventTarget.Owner,
NetworkEventTarget.Owner,
nameof(GameHasBeenWon)); nameof(GameHasBeenWon));
} }
else else
@ -202,8 +198,7 @@ public class GameManagerRound3 : GameManagerBase
if (NextCountry < 0) if (NextCountry < 0)
{ {
// If we ran out of countries, lose the game here. // If we ran out of countries, lose the game here.
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkEventTarget.Owner,
NetworkEventTarget.Owner,
nameof(GameHasBeenLost), true); nameof(GameHasBeenLost), true);
return; return;
} }
@ -223,11 +218,23 @@ public class GameManagerRound3 : GameManagerBase
(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
GameWinInterface.HeaderUI.text = "The player has won the game. " + _Timer + " seconds to spare."; GameWinInterface.HeaderUI.text = "The player has won the game. " + _Timer + " seconds to spare.";
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
NetworkEventTarget.All, "PlaySFXLoop", SFXEventType.CarmenInJail);
"PlayMusicLoop", MusicEventType.CarmenSandiegoWindDown);
SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 5.0f);
} }
} }
public void PlayWindDownMusic()
{
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
"PlayMusicLoop", MusicEventType.CarmenSandiegoWindDown);
SendCustomEventDelayedSeconds(nameof(EndCarmenInJailSFX), 2.0f);
}
public void EndCarmenInJailSFX()
{
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "StopSFX");
}
[NetworkCallable] [NetworkCallable]
public void GameHasBeenLost(bool RanOutOfMarkers) public void GameHasBeenLost(bool RanOutOfMarkers)
@ -245,8 +252,7 @@ public class GameManagerRound3 : GameManagerBase
(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
GameLossInterface.HeaderUI.text = "The player has lost. " + _SuccessCounter + " countries in " + TIMER_LENGTH + " seconds."; GameLossInterface.HeaderUI.text = "The player has lost. " + _SuccessCounter + " countries in " + TIMER_LENGTH + " seconds.";
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
NetworkEventTarget.All,
"StopMusic"); "StopMusic");
} }
} }
@ -264,12 +270,16 @@ public class GameManagerRound3 : GameManagerBase
public void PlayCorrectSound() public void PlayCorrectSound()
{ {
_AudioManager.PlaySFX(SFXEventType.MapCorrect); NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
"PlaySFX", SFXEventType.MapCorrect);
//_AudioManager.PlaySFX(SFXEventType.MapCorrect);
} }
public void PlayIncorrectSound() public void PlayIncorrectSound()
{ {
_AudioManager.PlaySFX(SFXEventType.MapIncorrect); NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
"PlaySFX", SFXEventType.MapIncorrect);
//_AudioManager.PlaySFX(SFXEventType.MapIncorrect);
} }
private void UpdateInterface() private void UpdateInterface()

View File

@ -21,13 +21,17 @@ public class FloorMap : UdonSharpBehaviour
public void RandomiseCountries() public void RandomiseCountries()
{ {
_CurrentCountry = 0; _CurrentCountry = 0;
for (int i = 0; i < Countries.Length; i++)
{
Countries[i].gameObject.SetActive(false);
}
UnityEngine.Random.InitState(Networking.GetServerTimeInMilliseconds()); UnityEngine.Random.InitState(Networking.GetServerTimeInMilliseconds());
int[] NewRandomCountries = new int[MAX_SELECTED_COUNTRIES]; int[] NewRandomCountries = new int[MAX_SELECTED_COUNTRIES];
int[] NewRandomCities = new int[MAX_SELECTED_COUNTRIES]; int[] NewRandomCities = new int[MAX_SELECTED_COUNTRIES];
// Fill the countries array with values too big to be considered valid. // Fill the countries array with a value too big to be valid.
int NumberOfCountries = Countries.Length; int NumberOfCountries = Countries.Length;
for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++) for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++)
{ {
@ -37,7 +41,7 @@ public class FloorMap : UdonSharpBehaviour
for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++) for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++)
{ {
int NewPulledIndex = NumberOfCountries; int NewPulledIndex = NumberOfCountries;
while (CountryIsAlreadyInArray(NewRandomCountries, NewPulledIndex)) while (CountryIsAlreadyInArray(NewRandomCountries, NewPulledIndex) || Countries[NewPulledIndex].HardModeSelection)
{ {
NewPulledIndex = UnityEngine.Random.Range(0, NumberOfCountries); NewPulledIndex = UnityEngine.Random.Range(0, NumberOfCountries);
} }

View File

@ -44,7 +44,61 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 2
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: HardModeSelection
- Name: $v
Entry: 7
Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: HardModeSelection
- Name: <UserType>k__BackingField
Entry: 7
Data: 3|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 3
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -53,13 +107,13 @@ MonoBehaviour:
Data: Locations Data: Locations
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: Locations Data: Locations
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 3|System.RuntimeType, mscorlib Data: 6|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: FloorMapLocation[], Assembly-CSharp Data: FloorMapLocation[], Assembly-CSharp
@ -68,7 +122,7 @@ MonoBehaviour:
Data: Data:
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 7 Entry: 7
Data: 4|System.RuntimeType, mscorlib Data: 7|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: UnityEngine.Component[], UnityEngine.CoreModule Data: UnityEngine.Component[], UnityEngine.CoreModule
@ -89,7 +143,7 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 0 Data: 0

View File

@ -8,5 +8,6 @@ using VRC.Udon;
[UdonBehaviourSyncMode(BehaviourSyncMode.None)] [UdonBehaviourSyncMode(BehaviourSyncMode.None)]
public class FloorMapCountry : UdonSharpBehaviour public class FloorMapCountry : UdonSharpBehaviour
{ {
public bool HardModeSelection = false;
public FloorMapLocation[] Locations; public FloorMapLocation[] Locations;
} }

View File

@ -204,6 +204,8 @@ public class FloorMapMarker : UdonSharpBehaviour
{ {
transform.position = CorrectLocation; transform.position = CorrectLocation;
} }
LocationFindingEnabled = false;
} }
private bool IsUpright() private bool IsUpright()

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: BoneFollower m_Name: BoneFollower
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: InteractToggle m_Name: InteractToggle
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: PlayerModSetter m_Name: PlayerModSetter
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: GlobalToggleObject m_Name: GlobalToggleObject
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: MasterToggleObject m_Name: MasterToggleObject
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: TrackingDataFollower m_Name: TrackingDataFollower
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: WorldAudioSettings m_Name: WorldAudioSettings
m_EditorClassIdentifier: m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
type: 2} type: 2}
udonAssembly: udonAssembly:
assemblyError: assemblyError:

View File

@ -10,8 +10,8 @@ AudioManager:
Default Speaker Mode: 2 Default Speaker Mode: 2
m_SampleRate: 48000 m_SampleRate: 48000
m_DSPBufferSize: 1024 m_DSPBufferSize: 1024
m_VirtualVoiceCount: 64 m_VirtualVoiceCount: 32
m_RealVoiceCount: 32 m_RealVoiceCount: 24
m_EnableOutputSuspension: 1 m_EnableOutputSuspension: 1
m_SpatializerPlugin: OculusSpatializer m_SpatializerPlugin: OculusSpatializer
m_AmbisonicDecoderPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer

Binary file not shown.

BIN
Raw Files/TVScreen.blend Normal file

Binary file not shown.

View File

@ -45,15 +45,15 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0" inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1" inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.70710678" inkscape:zoom="1"
inkscape:cx="413.65747" inkscape:cx="295.5"
inkscape:cy="439.11331" inkscape:cy="378.5"
inkscape:window-width="1920" inkscape:window-width="1920"
inkscape:window-height="1057" inkscape:window-height="1057"
inkscape:window-x="1912" inkscape:window-x="1912"
inkscape:window-y="-8" inkscape:window-y="-8"
inkscape:window-maximized="1" inkscape:window-maximized="1"
inkscape:current-layer="svg334" /> inkscape:current-layer="g2" />
<style <style
type="text/css" type="text/css"
id="style1"> id="style1">
@ -332,8 +332,15 @@
class="st0" class="st0"
d="m 342.491,350.456 v 0 l 0.107,-0.021 0.453,-0.088 0.308,-0.024 h 0.802 l 0.308,-0.043 h 0.247 l 0.349,0.021 0.288,0.045 0.308,0.043 h 0.35 l 0.288,0.022 h 0.37 l 0.268,-0.022 0.185,-0.109 0.165,-0.219 0.061,-0.176 0.062,-0.155 -0.021,-0.155 -0.02,-0.088 0.103,-0.11 0.123,-0.177 0.124,-0.11 0.041,-0.088 0.124,-0.088 0.143,-0.155 0.082,-0.11 0.102,-0.153 0.021,-0.134 0.041,-0.177 v -0.309 l 0.041,-0.376 0.061,-0.245 0.041,-0.199 0.041,-0.31 0.124,-0.534 0.041,-0.157 0.082,-0.244 0.102,-0.224 0.082,-0.157 0.103,-0.133 0.144,-0.089 0.226,-0.09 0.165,-0.089 0.206,-0.09 0.185,-0.068 0.165,-0.09 0.062,-0.087 0.102,-0.157 0.144,-0.291 0.082,-0.18 0.124,-0.226 0.144,-0.156 0.089,-0.06 0.076,-0.051 0.186,-0.114 0.226,-0.134 0.165,-0.112 0.143,-0.114 0.124,-0.088 0.143,-0.136 0.062,-0.112 0.082,-0.203 0.102,-0.317 0.082,-0.338 0.082,-0.362 0.061,-0.226 0.062,-0.272 0.082,-0.206 0.061,-0.226 0.041,-0.091 v -0.113 l 0.041,-0.16 0.009,-0.013 0.053,-0.079 0.144,-0.044 0.164,-0.047 0.259,-0.036 0.075,-0.04 0.039,-0.133 0.03,-0.116 0.097,-0.187 0.109,-0.149 0.063,-0.091 0.085,-0.158 0.084,-0.114 0.146,-0.145 0.128,-0.114 0.043,-0.116 v -0.139 l -0.091,-0.112 -0.064,-0.206 0.265,-0.063 0.233,-0.069 0.213,-0.067 0.255,-0.092 h 0.191 l 0.149,-0.022 0.213,0.045 0.212,0.022 0.149,0.07 0.255,0.137 0.213,0.092 h 0.128 l 0.137,-0.045 0.115,-0.065 0.07,-0.004 0.106,0.047 0.166,0.092 h 0.17 l 0.17,-0.025 0.127,-0.114 0.213,-0.184 0.17,-0.137 0.153,-0.087 0.124,-0.023 h 0.138 l 0.159,-0.004 0.255,0.022 h 0.17 l 0.232,-0.031 0.194,-0.038 0.084,-0.07 v -0.092 l -0.042,-0.137 -0.046,-0.133 -0.012,-0.121 0.028,-0.128 0.03,-0.101 -0.021,-0.162 -0.06,-0.191 -0.008,-0.097 v -10e-4 h 0.276 v 0.384 0.47 0.383 0.454 l 0.001,0.454 10e-4,0.516 v 0.513 0.373 0.259 h -0.418 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.308 v 0.271 0.309 0.309 0.308 0.308 0.308 0.307 0.307 0.307 0.306 0.306 0.306 0.306 0.305 0.305 0.305 0.304 0.271 l -0.015,0.243 -0.125,0.069 -0.294,0.129 -0.302,0.132 -0.383,0.06 -0.126,0.043 -0.245,0.175 -0.322,0.229 -0.279,0.198 -0.184,0.258 -0.066,0.141 -0.027,0.149 0.022,0.142 0.1,0.285 0.027,0.143 0.016,0.249 0.017,0.271 0.018,0.292 0.018,0.292 0.019,0.311 0.02,0.31 0.02,0.312 0.015,0.231 0.018,0.292 h -0.311 -0.471 l -0.471,10e-4 -0.471,0.001 -0.471,10e-4 -0.472,0.001 -0.471,10e-4 -0.472,10e-4 -0.471,0.001 -0.471,10e-4 -0.472,0.001 -0.471,10e-4 -0.471,10e-4 h -0.471 l -0.471,0.001 -0.471,10e-4 h -0.471 -0.264 l -0.085,0.41 -0.075,0.294 -0.044,0.239 0.033,0.203 -0.104,-0.111 0.183,-1.14 z" d="m 342.491,350.456 v 0 l 0.107,-0.021 0.453,-0.088 0.308,-0.024 h 0.802 l 0.308,-0.043 h 0.247 l 0.349,0.021 0.288,0.045 0.308,0.043 h 0.35 l 0.288,0.022 h 0.37 l 0.268,-0.022 0.185,-0.109 0.165,-0.219 0.061,-0.176 0.062,-0.155 -0.021,-0.155 -0.02,-0.088 0.103,-0.11 0.123,-0.177 0.124,-0.11 0.041,-0.088 0.124,-0.088 0.143,-0.155 0.082,-0.11 0.102,-0.153 0.021,-0.134 0.041,-0.177 v -0.309 l 0.041,-0.376 0.061,-0.245 0.041,-0.199 0.041,-0.31 0.124,-0.534 0.041,-0.157 0.082,-0.244 0.102,-0.224 0.082,-0.157 0.103,-0.133 0.144,-0.089 0.226,-0.09 0.165,-0.089 0.206,-0.09 0.185,-0.068 0.165,-0.09 0.062,-0.087 0.102,-0.157 0.144,-0.291 0.082,-0.18 0.124,-0.226 0.144,-0.156 0.089,-0.06 0.076,-0.051 0.186,-0.114 0.226,-0.134 0.165,-0.112 0.143,-0.114 0.124,-0.088 0.143,-0.136 0.062,-0.112 0.082,-0.203 0.102,-0.317 0.082,-0.338 0.082,-0.362 0.061,-0.226 0.062,-0.272 0.082,-0.206 0.061,-0.226 0.041,-0.091 v -0.113 l 0.041,-0.16 0.009,-0.013 0.053,-0.079 0.144,-0.044 0.164,-0.047 0.259,-0.036 0.075,-0.04 0.039,-0.133 0.03,-0.116 0.097,-0.187 0.109,-0.149 0.063,-0.091 0.085,-0.158 0.084,-0.114 0.146,-0.145 0.128,-0.114 0.043,-0.116 v -0.139 l -0.091,-0.112 -0.064,-0.206 0.265,-0.063 0.233,-0.069 0.213,-0.067 0.255,-0.092 h 0.191 l 0.149,-0.022 0.213,0.045 0.212,0.022 0.149,0.07 0.255,0.137 0.213,0.092 h 0.128 l 0.137,-0.045 0.115,-0.065 0.07,-0.004 0.106,0.047 0.166,0.092 h 0.17 l 0.17,-0.025 0.127,-0.114 0.213,-0.184 0.17,-0.137 0.153,-0.087 0.124,-0.023 h 0.138 l 0.159,-0.004 0.255,0.022 h 0.17 l 0.232,-0.031 0.194,-0.038 0.084,-0.07 v -0.092 l -0.042,-0.137 -0.046,-0.133 -0.012,-0.121 0.028,-0.128 0.03,-0.101 -0.021,-0.162 -0.06,-0.191 -0.008,-0.097 v -10e-4 h 0.276 v 0.384 0.47 0.383 0.454 l 0.001,0.454 10e-4,0.516 v 0.513 0.373 0.259 h -0.418 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.308 v 0.271 0.309 0.309 0.308 0.308 0.308 0.307 0.307 0.307 0.306 0.306 0.306 0.306 0.305 0.305 0.305 0.304 0.271 l -0.015,0.243 -0.125,0.069 -0.294,0.129 -0.302,0.132 -0.383,0.06 -0.126,0.043 -0.245,0.175 -0.322,0.229 -0.279,0.198 -0.184,0.258 -0.066,0.141 -0.027,0.149 0.022,0.142 0.1,0.285 0.027,0.143 0.016,0.249 0.017,0.271 0.018,0.292 0.018,0.292 0.019,0.311 0.02,0.31 0.02,0.312 0.015,0.231 0.018,0.292 h -0.311 -0.471 l -0.471,10e-4 -0.471,0.001 -0.471,10e-4 -0.472,0.001 -0.471,10e-4 -0.472,10e-4 -0.471,0.001 -0.471,10e-4 -0.472,0.001 -0.471,10e-4 -0.471,10e-4 h -0.471 l -0.471,0.001 -0.471,10e-4 h -0.471 -0.264 l -0.085,0.41 -0.075,0.294 -0.044,0.239 0.033,0.203 -0.104,-0.111 0.183,-1.14 z"
id="path199" id="path199"
style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.019278;stroke-dasharray:none;stroke-opacity:1" style="display:none;fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.019278;stroke-dasharray:none;stroke-opacity:1"
inkscape:label="Western Sahara &amp; Morocco" /><path inkscape:label="Western Sahara &amp; Morocco" /><path
id="path6"
style="stroke-width:0.019278;stroke-dasharray:none;display:inline;fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-opacity:1"
class="st0"
inkscape:label="Western Sahara"
d="m 359.597,336.434 v 0.384 0.47 0.383 0.454 l 0.001,0.454 10e-4,0.516 v 0.513 0.373 0.259 h -0.418 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.383 -0.308 v 0.271 0.309 0.309 0.308 0.308 0.308 0.307 0.307 0.307 0.306 0.306 0.306 0.306 0.305 0.305 0.305 0.304 0.271 l -0.015,0.243 -0.125,0.069 -0.294,0.129 -0.302,0.132 -0.383,0.06 -0.126,0.043 -0.245,0.175 -0.322,0.229 -0.279,0.198 -0.184,0.258 -0.066,0.141 -0.027,0.149 0.022,0.142 0.1,0.285 0.027,0.143 0.016,0.249 0.017,0.271 0.018,0.292 0.018,0.292 0.019,0.311 0.02,0.31 0.02,0.312 0.015,0.231 0.018,0.292 h -0.311 -0.471 l -0.471,10e-4 -0.471,0.001 -0.471,10e-4 -0.472,0.001 -0.471,10e-4 -0.472,10e-4 -0.471,0.001 -0.471,10e-4 -0.472,0.001 -0.471,10e-4 -0.471,10e-4 h -0.471 l -0.471,0.001 -0.471,10e-4 h -0.471 -0.264 l -0.085,0.41 -0.075,0.294 -0.044,0.239 0.033,0.203 -0.104,-0.111 0.183,-1.14 0.01,-0.0965 0.1475,-1.0545 0.283,-0.573 0.225,-0.253 0.349,-0.131 0.32,-0.577 0.112,-0.533 0.211,-0.245 0.066,-0.192 -0.083,-0.147 0.199,-0.288 0.24,-0.441 0.111,-0.284 0.281,-0.439 0.034,-0.097 -0.026,-0.11 -0.11,0.094 -0.118,0.163 -0.14,0.128 0.057,-0.158 0.11,-0.232 0.25,-0.243 0.394,-0.268 0.818,-0.911 0.308,-0.157 0.277,-0.384 0.099,-0.342 0.027,-0.787 0.099,-0.416 0.181,-0.325 0.215,-0.592 0.164,-0.265 0.107,-0.541 0.117,-0.207 0.208,-0.098 0.296,-0.271 0.445,-0.168 0.527,-0.352 0.247,-0.211 0.165,-0.315 0.177,-0.629 0.316,-0.663 0.16329,-0.507 z"
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
transform="translate(2.0388467e-7)" /><path
class="st0" class="st0"
d="m 442.789,397.317 h -0.247 -0.365 -0.366 -0.365 -0.366 -0.216 l -0.043,-0.006 -0.03,-0.008 -0.138,0.026 -0.142,0.089 -0.152,0.038 -0.162,-0.015 -0.021,0.01 -0.082,-0.003 -0.118,-0.006 -0.107,0.023 -0.082,0.079 -0.083,0.134 -0.15,0.154 -0.117,0.137 -0.1,0.097 -0.228,0.16 -0.124,0.047 -0.062,-0.007 -0.038,-0.03 -0.072,-0.204 -0.044,-0.033 -0.443,0.105 -0.067,0.002 0.006,-0.064 -0.033,-0.481 -0.004,-0.294 0.058,-0.184 0.034,-0.212 0.004,-0.188 0.082,-0.319 -0.009,-0.059 0.462,-0.416 0.039,-0.266 -0.214,-0.104 -0.205,-0.003 0.002,-0.014 0.028,-0.109 0.041,-0.324 0.066,-0.1 0.058,-0.039 0.076,-0.199 0.146,-0.317 0.101,-0.164 -0.022,-0.357 0.016,-0.243 0.023,-0.054 0.215,-0.09 0.279,-0.225 0.118,-0.264 0.166,-0.169 0.322,-0.109 0.035,0.019 0.016,0.037 -0.022,0.017 0.001,0.062 0.024,0.107 -0.006,0.145 0.013,0.019 0.066,0.039 0.061,-0.014 0.051,-0.026 0.257,-0.306 0.017,-0.066 0.119,-0.175 0.222,-0.284 0.157,-0.161 0.093,-0.039 0.053,-0.035 0.184,-0.049 0.075,-0.036 0.21,-0.168 0.076,-0.112 0.036,-0.123 0.044,-0.064 0.052,-0.005 0.039,-0.042 0.025,-0.079 -0.025,-0.623 -0.007,-0.123 0.024,-0.04 0.156,-0.215 0.007,-0.031 -0.09,0.026 -0.178,0.198 -0.085,0.133 -0.083,0.135 -0.055,-0.065 -0.092,-0.084 -0.031,-0.077 -0.08,-0.038 -0.114,0.002 -0.076,-0.056 -0.086,-0.11 -0.086,-0.069 -0.271,0.006 -0.209,-0.112 0.003,-0.153 0.082,-0.302 0.159,-0.346 0.008,-0.095 -0.022,-0.082 -0.038,-0.07 -0.072,-0.069 -0.067,-0.083 0.052,-0.249 0.1,-0.244 0.082,-0.122 0.08,-0.137 -0.023,-0.112 -0.117,-0.055 0.061,-0.109 0.126,-0.184 0.244,-0.186 0.214,-0.124 0.143,-0.001 0.278,0.099 0.252,0.117 0.138,0.006 0.168,-0.049 0.348,-0.207 0.084,0.066 0.102,0.126 0.11,0.208 0.219,0.095 0.105,0.065 0.075,0.019 0.042,-0.017 0.083,-0.163 0.1,-0.089 0.185,-0.112 0.409,-0.09 0.292,-0.027 0.124,-0.02 0.208,-0.053 0.327,-0.167 0.322,0.216 0.35,0.042 0.339,-10e-4 0.103,-0.066 0.059,-0.05 0.356,-0.355 0.482,-0.481 0.321,0.678 0.11,0.04 -0.015,0.059 -0.027,0.057 0.21,0.163 0.259,0.085 0.092,0.084 0.009,0.091 -0.087,0.396 0.016,0.113 0.083,0.397 0.154,0.089 0.137,0.399 0.276,0.169 0.04,0.049 0.064,0.194 0.084,0.212 0.066,0.049 0.04,0.012 0.081,0.225 -0.047,0.126 0.064,0.384 0.103,0.343 0.028,0.41 10e-4,0.18 -0.004,0.11 -0.023,0.156 -0.049,0.09 -0.088,0.087 -0.097,0.138 -0.085,0.148 -0.053,0.073 0.042,0.221 -0.011,0.058 -0.023,0.028 -0.125,0.034 -0.16,0.059 -0.097,0.059 -0.137,0.112 -0.11,0.121 -0.146,0.357 -0.243,0.278 -0.041,0.092 -0.23,0.166 -0.101,0.204 -0.064,0.251 -0.089,0.18 -0.13,0.166 -0.06,-0.008 -0.173,0.066 -0.239,-0.046 -0.033,-0.046 -0.032,-0.159 -0.067,-0.016 -0.083,0.032 -0.122,0.16 -0.098,0.032 -0.102,-0.023 -0.073,-0.053 -0.013,-0.054 0.09,-0.046 -10e-4,-0.044 -0.047,-0.039 -0.221,-0.031 -0.045,-0.04 0.074,-0.172 -0.008,-0.039 -0.108,0.042 -0.08,-0.023 -0.057,0.023 -0.119,0.047 0.028,0.082 -0.131,0.277 -0.125,0.027 -0.013,0.093 -0.1,0.096 -0.13,0.079 -0.088,0.025 -0.04,-0.034 -0.034,-0.115 -0.054,-10e-4 -0.15,0.103 -0.092,0.021 -0.089,0.001 -0.043,-0.019 0.011,-0.04 0.072,-0.086 -0.063,-0.021 -0.069,-0.129 -0.065,0.036 -0.057,0.085 -0.048,0.193 -0.064,0.06 -0.096,0.035 -0.076,-0.007 -0.023,-0.075 -0.05,0.007 -0.061,0.047 -0.068,0.105 -0.133,-0.012 -0.059,0.052 -0.1,-0.028 -0.102,0.099 -0.214,0.034 -0.047,0.069 -0.169,0.085 -0.034,0.054 0.014,0.045 0.073,0.064 0.051,0.088 -0.013,0.135 -0.262,0.326 -0.1,0.179 -0.196,0.453 0.019,0.096 0.049,0.103 0.025,0.098 z m 1.062,-1.246 -0.053,0.165 -0.287,0.108 0.025,-0.078 0.045,-0.092 0.081,-0.091 0.006,-0.071 -0.161,-0.053 -0.053,-0.03 -0.048,-0.065 -0.033,-0.073 0.044,-0.047 0.126,0.002 0.072,0.006 -0.006,0.154 0.03,0.044 0.155,-0.085 0.103,0.096 z m 2.209,-1.241 -0.114,0.065 0.017,0.087 0.029,0.126 -0.137,-0.083 -0.018,-0.047 -0.164,-0.013 -0.008,-0.052 0.077,-0.03 0.006,-0.089 0.006,-0.089 0.193,-0.043 0.146,0.052 z" d="m 442.789,397.317 h -0.247 -0.365 -0.366 -0.365 -0.366 -0.216 l -0.043,-0.006 -0.03,-0.008 -0.138,0.026 -0.142,0.089 -0.152,0.038 -0.162,-0.015 -0.021,0.01 -0.082,-0.003 -0.118,-0.006 -0.107,0.023 -0.082,0.079 -0.083,0.134 -0.15,0.154 -0.117,0.137 -0.1,0.097 -0.228,0.16 -0.124,0.047 -0.062,-0.007 -0.038,-0.03 -0.072,-0.204 -0.044,-0.033 -0.443,0.105 -0.067,0.002 0.006,-0.064 -0.033,-0.481 -0.004,-0.294 0.058,-0.184 0.034,-0.212 0.004,-0.188 0.082,-0.319 -0.009,-0.059 0.462,-0.416 0.039,-0.266 -0.214,-0.104 -0.205,-0.003 0.002,-0.014 0.028,-0.109 0.041,-0.324 0.066,-0.1 0.058,-0.039 0.076,-0.199 0.146,-0.317 0.101,-0.164 -0.022,-0.357 0.016,-0.243 0.023,-0.054 0.215,-0.09 0.279,-0.225 0.118,-0.264 0.166,-0.169 0.322,-0.109 0.035,0.019 0.016,0.037 -0.022,0.017 0.001,0.062 0.024,0.107 -0.006,0.145 0.013,0.019 0.066,0.039 0.061,-0.014 0.051,-0.026 0.257,-0.306 0.017,-0.066 0.119,-0.175 0.222,-0.284 0.157,-0.161 0.093,-0.039 0.053,-0.035 0.184,-0.049 0.075,-0.036 0.21,-0.168 0.076,-0.112 0.036,-0.123 0.044,-0.064 0.052,-0.005 0.039,-0.042 0.025,-0.079 -0.025,-0.623 -0.007,-0.123 0.024,-0.04 0.156,-0.215 0.007,-0.031 -0.09,0.026 -0.178,0.198 -0.085,0.133 -0.083,0.135 -0.055,-0.065 -0.092,-0.084 -0.031,-0.077 -0.08,-0.038 -0.114,0.002 -0.076,-0.056 -0.086,-0.11 -0.086,-0.069 -0.271,0.006 -0.209,-0.112 0.003,-0.153 0.082,-0.302 0.159,-0.346 0.008,-0.095 -0.022,-0.082 -0.038,-0.07 -0.072,-0.069 -0.067,-0.083 0.052,-0.249 0.1,-0.244 0.082,-0.122 0.08,-0.137 -0.023,-0.112 -0.117,-0.055 0.061,-0.109 0.126,-0.184 0.244,-0.186 0.214,-0.124 0.143,-0.001 0.278,0.099 0.252,0.117 0.138,0.006 0.168,-0.049 0.348,-0.207 0.084,0.066 0.102,0.126 0.11,0.208 0.219,0.095 0.105,0.065 0.075,0.019 0.042,-0.017 0.083,-0.163 0.1,-0.089 0.185,-0.112 0.409,-0.09 0.292,-0.027 0.124,-0.02 0.208,-0.053 0.327,-0.167 0.322,0.216 0.35,0.042 0.339,-10e-4 0.103,-0.066 0.059,-0.05 0.356,-0.355 0.482,-0.481 0.321,0.678 0.11,0.04 -0.015,0.059 -0.027,0.057 0.21,0.163 0.259,0.085 0.092,0.084 0.009,0.091 -0.087,0.396 0.016,0.113 0.083,0.397 0.154,0.089 0.137,0.399 0.276,0.169 0.04,0.049 0.064,0.194 0.084,0.212 0.066,0.049 0.04,0.012 0.081,0.225 -0.047,0.126 0.064,0.384 0.103,0.343 0.028,0.41 10e-4,0.18 -0.004,0.11 -0.023,0.156 -0.049,0.09 -0.088,0.087 -0.097,0.138 -0.085,0.148 -0.053,0.073 0.042,0.221 -0.011,0.058 -0.023,0.028 -0.125,0.034 -0.16,0.059 -0.097,0.059 -0.137,0.112 -0.11,0.121 -0.146,0.357 -0.243,0.278 -0.041,0.092 -0.23,0.166 -0.101,0.204 -0.064,0.251 -0.089,0.18 -0.13,0.166 -0.06,-0.008 -0.173,0.066 -0.239,-0.046 -0.033,-0.046 -0.032,-0.159 -0.067,-0.016 -0.083,0.032 -0.122,0.16 -0.098,0.032 -0.102,-0.023 -0.073,-0.053 -0.013,-0.054 0.09,-0.046 -10e-4,-0.044 -0.047,-0.039 -0.221,-0.031 -0.045,-0.04 0.074,-0.172 -0.008,-0.039 -0.108,0.042 -0.08,-0.023 -0.057,0.023 -0.119,0.047 0.028,0.082 -0.131,0.277 -0.125,0.027 -0.013,0.093 -0.1,0.096 -0.13,0.079 -0.088,0.025 -0.04,-0.034 -0.034,-0.115 -0.054,-10e-4 -0.15,0.103 -0.092,0.021 -0.089,0.001 -0.043,-0.019 0.011,-0.04 0.072,-0.086 -0.063,-0.021 -0.069,-0.129 -0.065,0.036 -0.057,0.085 -0.048,0.193 -0.064,0.06 -0.096,0.035 -0.076,-0.007 -0.023,-0.075 -0.05,0.007 -0.061,0.047 -0.068,0.105 -0.133,-0.012 -0.059,0.052 -0.1,-0.028 -0.102,0.099 -0.214,0.034 -0.047,0.069 -0.169,0.085 -0.034,0.054 0.014,0.045 0.073,0.064 0.051,0.088 -0.013,0.135 -0.262,0.326 -0.1,0.179 -0.196,0.453 0.019,0.096 0.049,0.103 0.025,0.098 z m 1.062,-1.246 -0.053,0.165 -0.287,0.108 0.025,-0.078 0.045,-0.092 0.081,-0.091 0.006,-0.071 -0.161,-0.053 -0.053,-0.03 -0.048,-0.065 -0.033,-0.073 0.044,-0.047 0.126,0.002 0.072,0.006 -0.006,0.154 0.03,0.044 0.155,-0.085 0.103,0.096 z m 2.209,-1.241 -0.114,0.065 0.017,0.087 0.029,0.126 -0.137,-0.083 -0.018,-0.047 -0.164,-0.013 -0.008,-0.052 0.077,-0.03 0.006,-0.089 0.006,-0.089 0.193,-0.043 0.146,0.052 z"
id="path35" id="path35"
@ -437,9 +444,16 @@
class="st0" class="st0"
d="m 372.885,318.56 0.059,0.186 0.121,0.147 0.434,0.338 0.258,0.208 0.007,0.072 -0.083,0.171 -0.035,0.118 0.068,0.125 0.159,0.151 0.013,0.072 -0.038,0.084 -0.082,0.162 0.174,0.475 0.029,0.459 -0.045,0.326 0.001,0.188 0.023,0.16 0.147,0.369 -0.099,0.608 0.111,0.331 0.153,0.268 0.084,0.478 0.123,0.226 0.201,0.198 0.115,0.067 0.222,0.163 0.159,0.137 0.094,0.204 -0.2,0.168 -0.16,0.149 -0.045,0.161 0.074,0.258 v 0.139 l -0.102,0.044 -0.415,-0.014 -0.325,-0.011 -0.374,-0.013 -0.526,-0.025 -0.326,-0.015 -0.446,-0.021 -0.154,0.01 -0.41,0.072 -0.289,0.051 -0.049,0.014 -0.09,0.064 -0.062,0.19 -0.056,0.216 -0.06,0.096 -0.868,0.312 -0.339,0.043 -0.197,-0.032 -0.14,0.025 -0.12,0.066 -0.041,0.101 -0.006,0.129 0.026,0.13 0.084,0.181 0.015,0.18 -0.053,0.127 -0.013,0.128 -0.025,0.138 0.044,0.075 0.084,0.012 0.084,0.063 0.119,0.057 0.099,0.109 -0.005,0.155 -0.082,0.088 -0.072,0.047 -0.325,0.041 -0.258,0.033 -0.336,0.248 -0.358,0.263 -0.424,0.174 -0.186,0.049 -0.327,0.124 -0.39,0.207 -0.193,0.33 -0.243,0.38 -0.233,0.254 -0.319,0.24 -0.297,0.092 -0.374,0.115 -0.471,0.089 -0.333,0.029 -0.099,0.019 -0.294,0.006 -0.144,-0.018 -0.107,-0.01 -0.043,0.027 -0.014,0.06 -0.006,0.136 -0.02,0.156 -0.093,0.132 -0.066,0.059 -0.077,0.024 -0.246,-0.035 -0.207,-0.042 -0.492,-0.055 -0.098,0.013 -0.037,0.016 -0.154,0.089 -0.236,0.188 -0.16,0.164 -0.119,0.077 -0.285,0.04 -0.124,0.06 -0.532,0.41 -0.113,0.099 -0.548,0.355 -0.155,0.118 -0.121,0.117 -0.327,0.262 -0.209,0.115 -0.038,0.068 -0.01,0.16 v 0.353 0.339 0.491 0.49 0.564 h -0.276 v 0.001 l 0.008,0.097 0.06,0.191 0.021,0.162 -0.03,0.101 -0.028,0.128 0.012,0.121 0.046,0.133 0.042,0.137 v 0.092 l -0.084,0.07 -0.194,0.038 -0.232,0.031 h -0.17 l -0.255,-0.022 -0.159,0.004 h -0.138 l -0.124,0.023 -0.153,0.087 -0.17,0.137 -0.213,0.184 -0.127,0.114 -0.17,0.025 h -0.17 l -0.166,-0.092 -0.106,-0.047 -0.07,0.004 -0.115,0.065 -0.137,0.045 h -0.128 l -0.213,-0.092 -0.255,-0.137 -0.149,-0.07 -0.212,-0.022 -0.213,-0.045 -0.149,0.022 h -0.191 l -0.255,0.092 -0.213,0.067 -0.233,0.069 -0.265,0.063 0.064,0.206 0.091,0.112 v 0.139 l -0.043,0.116 -0.128,0.114 -0.146,0.145 -0.084,0.114 -0.085,0.158 -0.063,0.091 -0.109,0.149 -0.097,0.187 -0.03,0.116 -0.039,0.133 -0.075,0.04 -0.259,0.036 -0.164,0.047 -0.144,0.044 -0.053,0.079 -0.009,0.013 -0.041,0.16 v 0.113 l -0.041,0.091 -0.061,0.226 -0.082,0.206 -0.062,0.272 -0.061,0.226 -0.082,0.362 -0.082,0.338 -0.102,0.317 -0.082,0.203 -0.062,0.112 -0.143,0.136 -0.124,0.088 -0.143,0.114 -0.165,0.112 -0.226,0.134 -0.186,0.114 -0.076,0.051 -0.089,0.06 -0.144,0.156 -0.124,0.226 -0.082,0.18 -0.144,0.291 -0.102,0.157 -0.062,0.087 -0.165,0.09 -0.185,0.068 -0.206,0.09 -0.165,0.089 -0.226,0.09 -0.144,0.089 -0.103,0.133 -0.082,0.157 -0.102,0.224 -0.082,0.244 -0.041,0.157 -0.124,0.534 -0.041,0.31 -0.041,0.199 -0.061,0.245 -0.041,0.376 v 0.309 l -0.041,0.177 -0.021,0.134 -0.102,0.153 -0.082,0.11 -0.143,0.155 -0.124,0.088 -0.041,0.088 -0.124,0.11 -0.123,0.177 -0.103,0.11 0.02,0.088 0.021,0.155 -0.062,0.155 -0.061,0.176 -0.165,0.219 -0.185,0.109 -0.268,0.022 h -0.37 l -0.288,-0.022 h -0.35 l -0.308,-0.043 -0.288,-0.045 -0.349,-0.021 h -0.247 l -0.308,0.043 h -0.802 l -0.308,0.024 -0.453,0.088 -0.107,0.021 v 0 l 0.148,-1.054 0.283,-0.573 0.225,-0.253 0.349,-0.131 0.32,-0.577 0.112,-0.533 0.211,-0.245 0.066,-0.192 -0.083,-0.147 0.199,-0.288 0.24,-0.441 0.111,-0.284 0.281,-0.439 0.034,-0.097 -0.026,-0.11 -0.11,0.094 -0.118,0.163 -0.14,0.128 0.057,-0.158 0.11,-0.232 0.25,-0.243 0.394,-0.268 0.818,-0.911 0.308,-0.157 0.277,-0.384 0.099,-0.342 0.027,-0.787 0.099,-0.416 0.181,-0.325 0.215,-0.592 0.164,-0.265 0.107,-0.541 0.117,-0.207 0.208,-0.098 0.296,-0.271 0.445,-0.168 0.527,-0.352 0.247,-0.211 0.165,-0.315 0.177,-0.629 0.316,-0.663 0.162,-0.501 0.003,-0.009 0.278,-0.264 0.189,-0.334 0.319,-0.149 0.668,-0.072 0.993,-0.278 0.891,-0.42 0.252,-0.167 0.27,-0.335 0.448,-0.437 0.837,-0.526 0.385,-0.294 0.588,-0.739 0.391,-0.614 0.324,-0.395 0.225,-0.352 0.157,-0.357 0.089,-0.576 -0.06,-0.225 -0.247,-0.369 -0.166,-0.099 -0.044,-0.174 0.089,-0.308 -0.002,-0.53 0.051,-0.849 0.275,-0.688 0.673,-0.905 0.125,-0.373 0.077,-0.594 0.007,-0.21 0.842,-0.847 0.493,-0.651 0.172,-0.16 0.435,-0.299 1.519,-0.653 0.859,-0.468 0.501,-0.342 0.299,-0.405 0.828,-1.596 0.813,-2.268 0.067,-0.264 0.364,-0.076 0.257,-0.033 0.207,-0.084 0.257,-0.172 0.246,0.069 -0.123,0.117 v 0.281 l 0.175,0.329 0.303,0.37 0.551,0.468 0.429,0.188 0.613,0.113 0.715,-0.205 0.4,-0.004 0.195,-0.088 0.211,0.129 0.403,0.041 0.388,-0.068 0.294,-0.196 0.187,-0.226 0.029,0.111 0.009,0.12 0.057,0.07 0.116,0.287 0.061,0.112 0.223,-0.018 0.194,0.056 0.438,-0.027 z" d="m 372.885,318.56 0.059,0.186 0.121,0.147 0.434,0.338 0.258,0.208 0.007,0.072 -0.083,0.171 -0.035,0.118 0.068,0.125 0.159,0.151 0.013,0.072 -0.038,0.084 -0.082,0.162 0.174,0.475 0.029,0.459 -0.045,0.326 0.001,0.188 0.023,0.16 0.147,0.369 -0.099,0.608 0.111,0.331 0.153,0.268 0.084,0.478 0.123,0.226 0.201,0.198 0.115,0.067 0.222,0.163 0.159,0.137 0.094,0.204 -0.2,0.168 -0.16,0.149 -0.045,0.161 0.074,0.258 v 0.139 l -0.102,0.044 -0.415,-0.014 -0.325,-0.011 -0.374,-0.013 -0.526,-0.025 -0.326,-0.015 -0.446,-0.021 -0.154,0.01 -0.41,0.072 -0.289,0.051 -0.049,0.014 -0.09,0.064 -0.062,0.19 -0.056,0.216 -0.06,0.096 -0.868,0.312 -0.339,0.043 -0.197,-0.032 -0.14,0.025 -0.12,0.066 -0.041,0.101 -0.006,0.129 0.026,0.13 0.084,0.181 0.015,0.18 -0.053,0.127 -0.013,0.128 -0.025,0.138 0.044,0.075 0.084,0.012 0.084,0.063 0.119,0.057 0.099,0.109 -0.005,0.155 -0.082,0.088 -0.072,0.047 -0.325,0.041 -0.258,0.033 -0.336,0.248 -0.358,0.263 -0.424,0.174 -0.186,0.049 -0.327,0.124 -0.39,0.207 -0.193,0.33 -0.243,0.38 -0.233,0.254 -0.319,0.24 -0.297,0.092 -0.374,0.115 -0.471,0.089 -0.333,0.029 -0.099,0.019 -0.294,0.006 -0.144,-0.018 -0.107,-0.01 -0.043,0.027 -0.014,0.06 -0.006,0.136 -0.02,0.156 -0.093,0.132 -0.066,0.059 -0.077,0.024 -0.246,-0.035 -0.207,-0.042 -0.492,-0.055 -0.098,0.013 -0.037,0.016 -0.154,0.089 -0.236,0.188 -0.16,0.164 -0.119,0.077 -0.285,0.04 -0.124,0.06 -0.532,0.41 -0.113,0.099 -0.548,0.355 -0.155,0.118 -0.121,0.117 -0.327,0.262 -0.209,0.115 -0.038,0.068 -0.01,0.16 v 0.353 0.339 0.491 0.49 0.564 h -0.276 v 0.001 l 0.008,0.097 0.06,0.191 0.021,0.162 -0.03,0.101 -0.028,0.128 0.012,0.121 0.046,0.133 0.042,0.137 v 0.092 l -0.084,0.07 -0.194,0.038 -0.232,0.031 h -0.17 l -0.255,-0.022 -0.159,0.004 h -0.138 l -0.124,0.023 -0.153,0.087 -0.17,0.137 -0.213,0.184 -0.127,0.114 -0.17,0.025 h -0.17 l -0.166,-0.092 -0.106,-0.047 -0.07,0.004 -0.115,0.065 -0.137,0.045 h -0.128 l -0.213,-0.092 -0.255,-0.137 -0.149,-0.07 -0.212,-0.022 -0.213,-0.045 -0.149,0.022 h -0.191 l -0.255,0.092 -0.213,0.067 -0.233,0.069 -0.265,0.063 0.064,0.206 0.091,0.112 v 0.139 l -0.043,0.116 -0.128,0.114 -0.146,0.145 -0.084,0.114 -0.085,0.158 -0.063,0.091 -0.109,0.149 -0.097,0.187 -0.03,0.116 -0.039,0.133 -0.075,0.04 -0.259,0.036 -0.164,0.047 -0.144,0.044 -0.053,0.079 -0.009,0.013 -0.041,0.16 v 0.113 l -0.041,0.091 -0.061,0.226 -0.082,0.206 -0.062,0.272 -0.061,0.226 -0.082,0.362 -0.082,0.338 -0.102,0.317 -0.082,0.203 -0.062,0.112 -0.143,0.136 -0.124,0.088 -0.143,0.114 -0.165,0.112 -0.226,0.134 -0.186,0.114 -0.076,0.051 -0.089,0.06 -0.144,0.156 -0.124,0.226 -0.082,0.18 -0.144,0.291 -0.102,0.157 -0.062,0.087 -0.165,0.09 -0.185,0.068 -0.206,0.09 -0.165,0.089 -0.226,0.09 -0.144,0.089 -0.103,0.133 -0.082,0.157 -0.102,0.224 -0.082,0.244 -0.041,0.157 -0.124,0.534 -0.041,0.31 -0.041,0.199 -0.061,0.245 -0.041,0.376 v 0.309 l -0.041,0.177 -0.021,0.134 -0.102,0.153 -0.082,0.11 -0.143,0.155 -0.124,0.088 -0.041,0.088 -0.124,0.11 -0.123,0.177 -0.103,0.11 0.02,0.088 0.021,0.155 -0.062,0.155 -0.061,0.176 -0.165,0.219 -0.185,0.109 -0.268,0.022 h -0.37 l -0.288,-0.022 h -0.35 l -0.308,-0.043 -0.288,-0.045 -0.349,-0.021 h -0.247 l -0.308,0.043 h -0.802 l -0.308,0.024 -0.453,0.088 -0.107,0.021 v 0 l 0.148,-1.054 0.283,-0.573 0.225,-0.253 0.349,-0.131 0.32,-0.577 0.112,-0.533 0.211,-0.245 0.066,-0.192 -0.083,-0.147 0.199,-0.288 0.24,-0.441 0.111,-0.284 0.281,-0.439 0.034,-0.097 -0.026,-0.11 -0.11,0.094 -0.118,0.163 -0.14,0.128 0.057,-0.158 0.11,-0.232 0.25,-0.243 0.394,-0.268 0.818,-0.911 0.308,-0.157 0.277,-0.384 0.099,-0.342 0.027,-0.787 0.099,-0.416 0.181,-0.325 0.215,-0.592 0.164,-0.265 0.107,-0.541 0.117,-0.207 0.208,-0.098 0.296,-0.271 0.445,-0.168 0.527,-0.352 0.247,-0.211 0.165,-0.315 0.177,-0.629 0.316,-0.663 0.162,-0.501 0.003,-0.009 0.278,-0.264 0.189,-0.334 0.319,-0.149 0.668,-0.072 0.993,-0.278 0.891,-0.42 0.252,-0.167 0.27,-0.335 0.448,-0.437 0.837,-0.526 0.385,-0.294 0.588,-0.739 0.391,-0.614 0.324,-0.395 0.225,-0.352 0.157,-0.357 0.089,-0.576 -0.06,-0.225 -0.247,-0.369 -0.166,-0.099 -0.044,-0.174 0.089,-0.308 -0.002,-0.53 0.051,-0.849 0.275,-0.688 0.673,-0.905 0.125,-0.373 0.077,-0.594 0.007,-0.21 0.842,-0.847 0.493,-0.651 0.172,-0.16 0.435,-0.299 1.519,-0.653 0.859,-0.468 0.501,-0.342 0.299,-0.405 0.828,-1.596 0.813,-2.268 0.067,-0.264 0.364,-0.076 0.257,-0.033 0.207,-0.084 0.257,-0.172 0.246,0.069 -0.123,0.117 v 0.281 l 0.175,0.329 0.303,0.37 0.551,0.468 0.429,0.188 0.613,0.113 0.715,-0.205 0.4,-0.004 0.195,-0.088 0.211,0.129 0.403,0.041 0.388,-0.068 0.294,-0.196 0.187,-0.226 0.029,0.111 0.009,0.12 0.057,0.07 0.116,0.287 0.061,0.112 0.223,-0.018 0.194,0.056 0.438,-0.027 z"
id="path198" id="path198"
style="display:inline;fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.019278;stroke-dasharray:none;stroke-opacity:1" style="display:none;fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.019278;stroke-dasharray:none;stroke-opacity:1"
inkscape:label="Morocco &amp; Western Sahara" /><path inkscape:label="Morocco &amp; Western Sahara" /><path
class="st0" class="st0"
d="m 350.361,336.43299 0.278,-0.26599 0.189,-0.334 0.319,-0.149 0.668,-0.072 0.993,-0.278 0.891,-0.42 0.252,-0.167 0.27,-0.335 0.448,-0.437 0.837,-0.526 0.385,-0.294 0.588,-0.739 0.391,-0.614 0.324,-0.395 0.225,-0.352 0.157,-0.357 0.089,-0.576 -0.06,-0.225 -0.247,-0.369 -0.166,-0.099 -0.044,-0.174 0.089,-0.308 -0.002,-0.53 0.051,-0.849 0.275,-0.688 0.673,-0.905 0.125,-0.373 0.077,-0.594 0.007,-0.21 0.842,-0.847 0.493,-0.651 0.172,-0.16 0.435,-0.299 1.519,-0.653 0.859,-0.468 0.501,-0.342 0.299,-0.405 0.828,-1.596 0.813,-2.268 0.067,-0.264 0.364,-0.076 0.257,-0.033 0.207,-0.084 0.257,-0.172 0.246,0.069 -0.123,0.117 v 0.281 l 0.175,0.329 0.303,0.37 0.551,0.468 0.429,0.188 0.613,0.113 0.715,-0.205 0.4,-0.004 0.195,-0.088 0.211,0.129 0.403,0.041 0.388,-0.068 0.294,-0.196 0.187,-0.226 0.029,0.111 0.009,0.12 0.057,0.07 0.116,0.287 0.061,0.112 0.223,-0.018 0.194,0.056 0.438,-0.027 0.415,0.051 0.059,0.186 0.121,0.147 0.434,0.338 0.258,0.208 0.007,0.072 -0.083,0.171 -0.035,0.118 0.068,0.125 0.159,0.151 0.013,0.072 -0.038,0.084 -0.082,0.162 0.174,0.475 0.029,0.459 -0.045,0.326 0.001,0.188 0.023,0.16 0.147,0.369 -0.099,0.608 0.111,0.331 0.153,0.268 0.084,0.478 0.123,0.226 0.201,0.198 0.115,0.067 0.222,0.163 0.159,0.137 0.094,0.204 -0.2,0.168 -0.16,0.149 -0.045,0.161 0.074,0.258 v 0.139 l -0.102,0.044 -0.415,-0.014 -0.325,-0.011 -0.374,-0.013 -0.526,-0.025 -0.326,-0.015 -0.446,-0.021 -0.154,0.01 -0.41,0.072 -0.289,0.051 -0.049,0.014 -0.09,0.064 -0.062,0.19 -0.056,0.216 -0.06,0.096 -0.868,0.312 -0.339,0.043 -0.197,-0.032 -0.14,0.025 -0.12,0.066 -0.041,0.101 -0.006,0.129 0.026,0.13 0.084,0.181 0.015,0.18 -0.053,0.127 -0.013,0.128 -0.025,0.138 0.044,0.075 0.084,0.012 0.084,0.063 0.119,0.057 0.099,0.109 -0.005,0.155 -0.082,0.088 -0.072,0.047 -0.325,0.041 -0.258,0.033 -0.336,0.248 -0.358,0.263 -0.424,0.174 -0.186,0.049 -0.327,0.124 -0.39,0.207 -0.193,0.33 -0.243,0.38 -0.233,0.254 -0.319,0.24 -0.297,0.092 -0.374,0.115 -0.471,0.089 -0.333,0.029 -0.099,0.019 -0.294,0.006 -0.144,-0.018 -0.107,-0.01 -0.043,0.027 -0.014,0.06 -0.006,0.136 -0.02,0.156 -0.093,0.132 -0.066,0.059 -0.077,0.024 -0.246,-0.035 -0.207,-0.042 -0.492,-0.055 -0.098,0.013 -0.037,0.016 -0.154,0.089 -0.236,0.188 -0.16,0.164 -0.119,0.077 -0.285,0.04 -0.124,0.06 -0.532,0.41 -0.113,0.099 -0.548,0.355 -0.155,0.118 -0.121,0.117 -0.327,0.262 -0.209,0.115 -0.038,0.068 -0.01,0.16 v 0.353 0.339 0.491 0.49 l 3e-5,0.56399 z"
id="path5"
style="stroke-width:0.019278;stroke-dasharray:none;display:inline;fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-opacity:1"
inkscape:label="Morocco"
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
transform="translate(2.0388467e-7)" /><path
class="st0"
d="m 495.977,438.038 -0.26,0.062 -0.291,-0.021 -0.113,-0.117 -0.022,-0.049 0.098,-0.046 -0.006,-0.15 0.049,-0.238 0.062,-0.098 0.145,-0.087 0.059,-0.191 0.125,-0.128 0.166,-0.016 0.166,0.236 0.113,0.249 -0.023,0.249 -0.114,0.091 -0.038,0.144 z" d="m 495.977,438.038 -0.26,0.062 -0.291,-0.021 -0.113,-0.117 -0.022,-0.049 0.098,-0.046 -0.006,-0.15 0.049,-0.238 0.062,-0.098 0.145,-0.087 0.059,-0.191 0.125,-0.128 0.166,-0.016 0.166,0.236 0.113,0.249 -0.023,0.249 -0.114,0.091 -0.038,0.144 z"
id="path205" id="path205"
style="fill:#ff8000;fill-opacity:1;stroke:#000000;stroke-width:0.019278;stroke-dasharray:none;stroke-opacity:1" style="fill:#ff8000;fill-opacity:1;stroke:#000000;stroke-width:0.019278;stroke-dasharray:none;stroke-opacity:1"

Before

Width:  |  Height:  |  Size: 182 KiB

After

Width:  |  Height:  |  Size: 186 KiB