diff --git a/Assets/Resources/Prefabs/Task-Character.prefab b/Assets/Resources/Prefabs/Task-Character.prefab
index 9cf774735ea668d9c00573a923ba4fee090cf697..d278302bc1afb8b6706a8d946881713b8b9330e2 100644
--- a/Assets/Resources/Prefabs/Task-Character.prefab
+++ b/Assets/Resources/Prefabs/Task-Character.prefab
@@ -1,5 +1,88 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2538721375231184903
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7687272075612197033}
+ - component: {fileID: 3975181619734304981}
+ - component: {fileID: 3941915988432392595}
+ m_Layer: 0
+ m_Name: BackUpCam
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7687272075612197033
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2538721375231184903}
+ 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_Children: []
+ m_Father: {fileID: 7002030793187184893}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &3975181619734304981
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2538721375231184903}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 1
+ m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+ m_projectionMatrixMode: 1
+ m_GateFitMode: 2
+ m_FOVAxisMode: 0
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_FocalLength: 50
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 1000
+ field of view: 60
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 0
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
+--- !u!81 &3941915988432392595
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2538721375231184903}
+ m_Enabled: 1
--- !u!136 &6999573641307799759
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -414,6 +497,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -438,6 +522,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &6999573640440716767
MeshFilter:
m_ObjectHideFlags: 0
@@ -469,6 +554,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -494,13 +580,12 @@ MonoBehaviour:
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
m_fontSize: 3
m_fontSizeBase: 3
m_fontWeight: 400
@@ -508,6 +593,8 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 256
m_textAlignment: 258
m_characterSpacing: 0
m_wordSpacing: 0
@@ -518,10 +605,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
+ parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
@@ -529,42 +614,23 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 0
m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
- m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: -0.25493145, z: 0, w: -0.0003437996}
- m_textInfo:
- textComponent: {fileID: 6999573640440716765}
- characterCount: 0
- spriteCount: 0
- spaceCount: 0
- wordCount: 0
- linkCount: 0
- lineCount: 0
- pageCount: 0
- materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
- m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_renderer: {fileID: 6999573640440716760}
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
m_maskType: 0
+ _SortingLayer: 0
+ _SortingLayerID: 0
+ _SortingOrder: 0
--- !u!114 &6999573640440716764
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -577,7 +643,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
m_Name:
m_EditorClassIdentifier:
- Cam: {fileID: 0}
+ Cam1: {fileID: 0}
+ Cam2: {fileID: 0}
+ BackUPCam: {fileID: 3975181619734304981}
--- !u!1 &6999573642288568594
GameObject:
m_ObjectHideFlags: 0
@@ -632,6 +700,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -656,6 +725,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &6999573642288568607
MeshFilter:
m_ObjectHideFlags: 0
@@ -687,6 +757,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -712,13 +783,12 @@ MonoBehaviour:
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: 0
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
m_fontSize: 2
m_fontSizeBase: 2
m_fontWeight: 400
@@ -726,6 +796,8 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 256
m_textAlignment: 514
m_characterSpacing: 0
m_wordSpacing: 0
@@ -736,10 +808,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
+ parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
@@ -747,42 +817,23 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 0
m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
- m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: -0.16199362, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 6999573642288568605}
- characterCount: 23
- spriteCount: 0
- spaceCount: 3
- wordCount: 4
- linkCount: 0
- lineCount: 1
- pageCount: 1
- materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
- m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_renderer: {fileID: 6999573642288568600}
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
m_maskType: 0
+ _SortingLayer: 0
+ _SortingLayerID: 0
+ _SortingOrder: 0
--- !u!1 &6999573642475966540
GameObject:
m_ObjectHideFlags: 0
@@ -829,6 +880,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
textDisplay: {fileID: 6999573640440716765}
textHint: {fileID: 6999573642288568605}
+ CharakterAnimation: {fileID: 0}
sentences:
- If I only knew the size of that tree
- Hey my friend. I want to build a house for me and my children.
@@ -963,6 +1015,7 @@ Transform:
- {fileID: 7002224343011693427}
- {fileID: 5439856320987879120}
- {fileID: 6999573642475966541}
+ - {fileID: 7687272075612197033}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1048,6 +1101,7 @@ SkinnedMeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -2933,15 +2987,20 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7002030793187184893}
m_Modifications:
+ - target: {fileID: 2600518978420199386, guid: 72d2303fcd9b9b6468855dae77047a1b,
+ type: 3}
+ propertyPath: m_DynamicOccludee
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 2600518978420199386, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: d24faa9ba77ab91459039238ad17d83c, type: 2}
- - target: {fileID: 2600518978420199386, guid: 72d2303fcd9b9b6468855dae77047a1b,
+ - target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
- propertyPath: m_DynamicOccludee
- value: 0
+ propertyPath: m_RootOrder
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
@@ -2958,6 +3017,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
propertyPath: m_LocalRotation.x
@@ -2973,16 +3037,6 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
- type: 3}
- propertyPath: m_RootOrder
- value: 2
- objectReference: {fileID: 0}
- target: {fileID: 3052661700889384477, guid: 72d2303fcd9b9b6468855dae77047a1b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity
index f6c654e1913814ae5d4b846a7790485083d63d55..09daa59f896ed192d684cf49e27f04c5200e61ef 100644
--- a/Assets/Scenes/Menues/LaunchMenue.unity
+++ b/Assets/Scenes/Menues/LaunchMenue.unity
@@ -362,6 +362,120 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &507015556
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 507015557}
+ - component: {fileID: 507015561}
+ - component: {fileID: 507015560}
+ - component: {fileID: 507015559}
+ - component: {fileID: 507015558}
+ m_Layer: 6
+ m_Name: StartServer_ctrl
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &507015557
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 507015556}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
+ m_Children:
+ - {fileID: 672536968}
+ m_Father: {fileID: 1177646170}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: -0.00024414062, y: -0.000061035156}
+ m_SizeDelta: {x: 1920, y: 1080}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &507015558
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 507015556}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ac85f04c60d42c147be42fd4d0420c21, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ServerScriptGObj: {fileID: 672536967}
+--- !u!114 &507015559
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 507015556}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &507015560
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 507015556}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &507015561
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 507015556}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
--- !u!1 &637579878
GameObject:
m_ObjectHideFlags: 0
@@ -452,12 +566,12 @@ GameObject:
- component: {fileID: 672536968}
- component: {fileID: 672536969}
m_Layer: 6
- m_Name: Empty_StartServer
+ m_Name: Empty_StartServer_Standby
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &672536968
Transform:
m_ObjectHideFlags: 0
@@ -466,12 +580,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 672536967}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -960.00024, y: -540.00006, z: 0}
- m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 240922846}
- m_Father: {fileID: 1177646170}
- m_RootOrder: 2
+ m_Father: {fileID: 507015557}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &672536969
MonoBehaviour:
@@ -488,6 +602,8 @@ MonoBehaviour:
WaitingText: {fileID: 240922847}
autostart: 1
autoend: 0
+ autoprepareGame: 0
+ autocheckIfServerIsRunning: 0
--- !u!1 &731729389
GameObject:
m_ObjectHideFlags: 0
@@ -1255,6 +1371,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 675079858708547288, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 908776758143407828, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchoredPosition.x
@@ -2155,6 +2276,11 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8954018117256822208, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 9137384490485354206, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchorMax.y
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index 4c82ca3895c146330b46fa4687dc955666641d66..b0eb6b04f040663f9b9df3bbeeab06a08f3f1f98 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -39826,6 +39826,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6739942703746350236, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6899299219359387209, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchorMax.y
@@ -39861,6 +39866,11 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7713215256196366465, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 7871016058250780066, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_AnchoredPosition.y
diff --git a/Assets/Scripts/InteractionEngine/AlignText.cs b/Assets/Scripts/InteractionEngine/AlignText.cs
index cf71d2b43748a8d35967a502a07bf487e2204098..36d114d11f1d788c608ee705c590b7efe44c748e 100644
--- a/Assets/Scripts/InteractionEngine/AlignText.cs
+++ b/Assets/Scripts/InteractionEngine/AlignText.cs
@@ -11,10 +11,11 @@ public class AlignText : MonoBehaviour
private Camera Cam;
public Camera Cam1;
public Camera Cam2;
+ public Camera BackUPCam;
void Start()
{
- Cam = Camera.main;
+ Cam = toCamMain();
StartCoroutine(CheckForNewMainCamRoutine());
}
@@ -28,6 +29,17 @@ void Update()
//transform.rotation = Quaternion.Lerp(transform.parent.transform.rotation, Cam.transform.rotation, 0);
}
+ Camera toCamMain()
+ {
+ if (Camera.main != null)
+ {
+ return Camera.main;
+ }
+
+
+ return BackUPCam;
+ }
+
IEnumerator CheckForNewMainCamRoutine()
@@ -36,8 +48,10 @@ IEnumerator CheckForNewMainCamRoutine()
yield return new WaitForSeconds(2);
switch (UIconfig.MainCameraID)
{
+
+
case 0:
- Cam = Camera.main;
+ Cam = toCamMain();
break;
case 1:
Cam = Cam1;
@@ -46,7 +60,7 @@ IEnumerator CheckForNewMainCamRoutine()
Cam = Cam2;
break;
default:
- Cam = Camera.main;
+ Cam = toCamMain();
break;
}
diff --git a/Assets/Scripts/StartServer.cs b/Assets/Scripts/StartServer.cs
index 7f852371cf6c2e2084595ea95788dededd98736a..35122044a4363593fe1b107d2e445b3710f3654f 100644
--- a/Assets/Scripts/StartServer.cs
+++ b/Assets/Scripts/StartServer.cs
@@ -15,17 +15,20 @@ public class StartServer : MonoBehaviour
public static ProcessStartInfo processInfo;
public int autostart = 0; //when 1 in Start() will be ServerRoutine() launched.
public int autoend = 0; //Update() also affected
+ public int autoprepareGame = 0;
+ public int autocheckIfServerIsRunning = 0;
+
// Start is called before the first frame update
void Start()
{
CommunicationEvents.ServerRunning = false;
- if (ServerAutoStart==true && autostart == 1)
+ if (ServerAutoStart==true && autostart == 1 )
{
StartCoroutine(ServerRoutine());
}
- if (ServerAutoStart == true && autostart == 2)
+ if (ServerAutoStart == true && autostart == 2 )
{
StartCoroutine(ServerRoutine1());
}
@@ -49,9 +52,12 @@ void Update()
void PrepareGame()
{
- WaitingText.text = "Press any key to start the game";
- CommunicationEvents.ServerRunning = true;
- UnityEngine.Debug.Log("server fin");
+ if (autoprepareGame !=0)
+ {
+ WaitingText.text = "Press any key to start the game";
+ CommunicationEvents.ServerRunning = true;
+ UnityEngine.Debug.Log("server fin");
+ }
}
@@ -60,6 +66,8 @@ void PrepareGame()
+
+
IEnumerator ServerRoutine1()
{
@@ -144,8 +152,8 @@ IEnumerator ServerRoutine()
yield return null;
#endif
-
- while (true)
+
+ while (true && autocheckIfServerIsRunning != 0)
{
//Wait for 2 seconds
yield return new WaitForSecondsRealtime(2f);
diff --git a/Assets/Scripts/StartServer_mctrl.cs b/Assets/Scripts/StartServer_mctrl.cs
new file mode 100644
index 0000000000000000000000000000000000000000..65ba784426be3ad564ec70a549265eca57eaa6c0
--- /dev/null
+++ b/Assets/Scripts/StartServer_mctrl.cs
@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Diagnostics;
+using UnityEngine;
+using UnityEngine.Networking;
+using UnityEngine.SceneManagement;
+using static UIconfig;
+using static CommunicationEvents;
+
+public class StartServer_mctrl : MonoBehaviour
+{
+
+ public GameObject ServerScriptGObj;
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ StartCoroutine(ServerRoutine());
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+
+
+
+ IEnumerator ServerRoutine()
+ {
+ //Wait for 1 seconds
+ yield return new WaitForSecondsRealtime(1f);
+ if (ServerAutoStart == true)
+ {
+ ServerScriptGObj.SetActive(true);
+
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/Assets/Scripts/StartServer_mctrl.cs.meta b/Assets/Scripts/StartServer_mctrl.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c1892a9e31a81bf0f14a6f8ccde0ed15f1ca8f38
--- /dev/null
+++ b/Assets/Scripts/StartServer_mctrl.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ac85f04c60d42c147be42fd4d0420c21
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs
index 565e24fb6d400906c1a39bbf2d4a7663af7f9ce3..481814ad2b83a9e1c68447b3a6458b8d6f10ac64 100644
--- a/Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs
@@ -92,7 +92,9 @@ public static void startNextSceneFunctionNewGame()
{
NetworkJSON_Save();
CommunicationEvents.ServerAdress = "http://" + CommunicationEvents.selecIP;
+ CommunicationEvents.ServerRunning = true;
UnityEngine.Debug.Log("StartMainMenue");
+ UnityEngine.Debug.Log("CommunicationEvents.ServerAdress = " + CommunicationEvents.ServerAdress);
SceneManager.LoadScene("MainMenue");
}
diff --git a/Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs b/Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs
index 9f815b43db6526c68be133ed214175d6c3f6a06b..81acf894addb32e0b2871abfd6b50cdda6dfc6ce 100644
--- a/Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs
@@ -40,7 +40,7 @@ public void toChild1()
{
ClearUIC();
//UIconfig.Andr_Start_menue_counter = 1;
- child1_GObj.SetActive(true); ;
+ child1_GObj.SetActive(true);
}
diff --git a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
index bee476d685106e3bd649f5c196c6c2930e09616c..ccbbc00e3a75648f90e5cf99e4edd61a9d3b9990 100644
--- a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
+++ b/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs
@@ -36,24 +36,30 @@ public class StartMenue_mobile : MonoBehaviour
- void Start()
+ private void Awake()
{
-
-
-
ScreenOptimization();
toChild1();
-
- if (checkOperationSystemAlreadyDone==false) {
-
+
+ if (checkOperationSystemAlreadyDone == false)
+ {
+
start2_CheckOS_CheckConfig();
checkOperationSystemAlreadyDone = true;
}
GObj_text.text = CommunicationEvents.Opsys + "";
- CheckServerA[1]=1;
- CheckServerA[2]=1;
- CheckServerA[3]=1;
+ CheckServerA[1] = 1;
+ CheckServerA[2] = 1;
+ CheckServerA[3] = 1;
+ }
+
+ void Start()
+ {
+
+
+
+
}
void start2_CheckOS_CheckConfig()
@@ -127,6 +133,10 @@ void checkOS()
{
//CommunicationEvents.Opsys = CommunicationEvents.Opsys_Default;
}
+ if(Opsys == 1)
+ {
+ ServerAutoStart = false;
+ }
}
void checkOS2()
@@ -137,12 +147,14 @@ void checkOS2()
Debug.Log("Windows OS detected");
CommunicationEvents.Opsys = 0;
+
return;
}
if (Application.platform == RuntimePlatform.Android)
{
Debug.Log("Android OS detected");
CommunicationEvents.Opsys = 1;
+
return;
}
diff --git a/Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs b/Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs
index 627bbe3fb65f4cbdc732c9cb5adc1d82513c949d..6ce08fbc7c6b956f6ef4439df232803ba3590d03 100644
--- a/Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs
+++ b/Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs
@@ -1,5 +1,7 @@
+using System.Collections;
using UnityEngine;
using UnityEngine.SceneManagement;
+using UnityEngine.Networking;
using static UIconfig;
public class WaitingForLocalMMT : MonoBehaviour
@@ -9,13 +11,35 @@ public class WaitingForLocalMMT : MonoBehaviour
private void Start()
{
-
-
+ //StartCoroutine(ServerRoutine());
+
}
private void Update()
{
+
+
+
+ }
+ private void OnEnable()
+ {
+ StartCoroutine(ServerRoutine());
+ }
+
+ private void OnDisable()
+ {
+ StopCoroutine(ServerRoutine());
+ }
+
+ void PrepareGame()
+ {
+ if (true)
+ {
+
+ CommunicationEvents.ServerRunning = true;
+ UnityEngine.Debug.Log("set server runs");
+ }
if (CommunicationEvents.ServerRunning == true)
{
CommunicationEvents.ServerAdress = CommunicationEvents.ServerAddressLocal;
@@ -23,5 +47,39 @@ private void Update()
SceneManager.LoadScene("MainMenue");
}
+
+ }
+
+ IEnumerator ServerRoutine()
+ {
+ while (true)
+ {
+
+
+ UnityWebRequest request = UnityWebRequest.Get(CommunicationEvents.ServerAddressLocal + "/scroll/list");
+ yield return request.SendWebRequest();
+ if (request.result == UnityWebRequest.Result.ConnectionError
+ || request.result == UnityWebRequest.Result.ProtocolError)
+ {
+ // UnityEngine.Debug.Log("no running server");
+ }
+ else
+ {
+ //break;
+ PrepareGame();
+ }
+
+
+
+
+
+ //Wait for 2 seconds
+ yield return new WaitForSecondsRealtime(2f);
+ print("waiting");
+
+ yield return null;
+ }
+
+
}
}
\ No newline at end of file
diff --git a/GAMEGUIDE.md b/GAMEGUIDE.md
index 5420394e35700492e1fdb4d08861b4d9403e83e8..99a181aed167fa21ae4a8be12ac62c657896caba 100644
--- a/GAMEGUIDE.md
+++ b/GAMEGUIDE.md
@@ -21,6 +21,7 @@
- first person perspective
- compatible with (old) Input Manager
- compatible with (new) Input System Package
+ - compatbile with "Input exchange through file" (for reliable mobile Input)
- supports FrameITUI
- supports FrameITUI_mobile
@@ -68,6 +69,8 @@
- old input system
- Input_System_Package
- new input system
+ - Input exchange through file
+ - for reliable Input by mobile devices
#### Keyboard Mouse Options
- Look up or change Bindings
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 0a74b62c402f2c5273503b05534a6f733b7d29e2..681b79cabf99eb55d1333b469a01b2d9e37257cb 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -27,10 +27,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0
flags: 0
RecentlyUsedScenePath-7:
- value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
+ value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
flags: 0
RecentlyUsedScenePath-8:
- value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
+ value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
flags: 0
UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512