diff --git a/Assets/Resources/Menue.meta b/Assets/Resources/Menu.meta similarity index 100% rename from Assets/Resources/Menue.meta rename to Assets/Resources/Menu.meta diff --git a/Assets/Resources/Menue/Images.meta b/Assets/Resources/Menu/Images.meta similarity index 100% rename from Assets/Resources/Menue/Images.meta rename to Assets/Resources/Menu/Images.meta diff --git a/Assets/Resources/Menue/Images/AndrStartBg.png b/Assets/Resources/Menu/Images/AndrStartBg.png similarity index 100% rename from Assets/Resources/Menue/Images/AndrStartBg.png rename to Assets/Resources/Menu/Images/AndrStartBg.png diff --git a/Assets/Resources/Menue/Images/AndrStartBg.png.meta b/Assets/Resources/Menu/Images/AndrStartBg.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/AndrStartBg.png.meta rename to Assets/Resources/Menu/Images/AndrStartBg.png.meta diff --git a/Assets/Resources/Menue/Images/FrameWorld.png b/Assets/Resources/Menu/Images/FrameWorld.png similarity index 100% rename from Assets/Resources/Menue/Images/FrameWorld.png rename to Assets/Resources/Menu/Images/FrameWorld.png diff --git a/Assets/Resources/Menue/Images/FrameWorld.png.meta b/Assets/Resources/Menu/Images/FrameWorld.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/FrameWorld.png.meta rename to Assets/Resources/Menu/Images/FrameWorld.png.meta diff --git a/Assets/Resources/Menue/Images/ScrollBackground_blue_rectangle.png b/Assets/Resources/Menu/Images/ScrollBackground_blue_rectangle.png similarity index 100% rename from Assets/Resources/Menue/Images/ScrollBackground_blue_rectangle.png rename to Assets/Resources/Menu/Images/ScrollBackground_blue_rectangle.png diff --git a/Assets/Resources/Menue/Images/ScrollBackground_blue_rectangle.png.meta b/Assets/Resources/Menu/Images/ScrollBackground_blue_rectangle.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/ScrollBackground_blue_rectangle.png.meta rename to Assets/Resources/Menu/Images/ScrollBackground_blue_rectangle.png.meta diff --git a/Assets/Resources/Menue/Images/ScrollBackground_red_rectangle.png b/Assets/Resources/Menu/Images/ScrollBackground_red_rectangle.png similarity index 100% rename from Assets/Resources/Menue/Images/ScrollBackground_red_rectangle.png rename to Assets/Resources/Menu/Images/ScrollBackground_red_rectangle.png diff --git a/Assets/Resources/Menue/Images/ScrollBackground_red_rectangle.png.meta b/Assets/Resources/Menu/Images/ScrollBackground_red_rectangle.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/ScrollBackground_red_rectangle.png.meta rename to Assets/Resources/Menu/Images/ScrollBackground_red_rectangle.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites.meta b/Assets/Resources/Menu/Images/Sprites.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites.meta rename to Assets/Resources/Menu/Images/Sprites.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor.meta b/Assets/Resources/Menu/Images/Sprites/Cursor.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_100x100.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_140x140.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_200x200.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_300x300.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_35x35.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_50x50.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_60x60.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png diff --git a/Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png.meta b/Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png.meta rename to Assets/Resources/Menu/Images/Sprites/Cursor/mouse-cursor_lila_cut_70x70.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle.meta b/Assets/Resources/Menu/Images/Sprites/LoadingCircle.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle.meta rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle.meta diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png.meta b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png.meta rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/38-386014_loading-spinner-png-circle-logo-vector-png.png.meta diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif.meta b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif.meta rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/7266036c9f3383d21730484150602f01.gif.meta diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg.meta b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg.meta rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/imgbin-circle-icon-painted-orange-circle-brown-ring-6KDpu16nMeHmKiZNQTrfrVKib.jpg.meta diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/loadingCircle.png b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/loadingCircle.png similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/loadingCircle.png rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/loadingCircle.png diff --git a/Assets/Resources/Menue/Images/Sprites/LoadingCircle/loadingCircle.png.meta b/Assets/Resources/Menu/Images/Sprites/LoadingCircle/loadingCircle.png.meta similarity index 100% rename from Assets/Resources/Menue/Images/Sprites/LoadingCircle/loadingCircle.png.meta rename to Assets/Resources/Menu/Images/Sprites/LoadingCircle/loadingCircle.png.meta diff --git a/Assets/Resources/Menue/MenueIcons.meta b/Assets/Resources/Menu/MenuIcons.meta similarity index 100% rename from Assets/Resources/Menue/MenueIcons.meta rename to Assets/Resources/Menu/MenuIcons.meta diff --git a/Assets/Resources/Menue/MenueIcons/AssignM_1.png b/Assets/Resources/Menu/MenuIcons/AssignM_1.png similarity index 100% rename from Assets/Resources/Menue/MenueIcons/AssignM_1.png rename to Assets/Resources/Menu/MenuIcons/AssignM_1.png diff --git a/Assets/Resources/Menue/MenueIcons/AssignM_1.png.meta b/Assets/Resources/Menu/MenuIcons/AssignM_1.png.meta similarity index 100% rename from Assets/Resources/Menue/MenueIcons/AssignM_1.png.meta rename to Assets/Resources/Menu/MenuIcons/AssignM_1.png.meta diff --git a/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab b/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab index b76cdf61cd4462654248337213ca490cbac47ded..0cf5e8e7ad85c7d55a9d2137ec6b22099bc1f096 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/GameInterruptHandler 1.prefab @@ -160,7 +160,7 @@ GameObject: - component: {fileID: 3513085798742169441} - component: {fileID: 263790471593729081} m_Layer: 0 - m_Name: PauseMenueCanvas_1 + m_Name: PauseMenuCanvas_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -404,7 +404,7 @@ GameObject: - component: {fileID: 1236554007250827144} - component: {fileID: 5781923766060072314} m_Layer: 0 - m_Name: PauseMenueCanvas_0 + m_Name: PauseMenuCanvas_0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1679,7 +1679,7 @@ GameObject: - component: {fileID: 3107247070210076986} - component: {fileID: 6210387859054134033} m_Layer: 0 - m_Name: SceneStartMenueCanvas_1 + m_Name: SceneStartMenuCanvas_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1779,7 +1779,7 @@ GameObject: - component: {fileID: 8775872193731661483} - component: {fileID: 6223024070291931584} m_Layer: 0 - m_Name: PauseMenue_onoff_"2" + m_Name: PauseMenu_onoff_"2" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2168,7 +2168,7 @@ GameObject: - component: {fileID: 1693659306975441619} - component: {fileID: 8703999636723807416} m_Layer: 0 - m_Name: PauseMenue_MnCtrl + m_Name: PauseMenu_MnCtrl m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2364,7 +2364,7 @@ GameObject: - component: {fileID: 1245475418529244397} - component: {fileID: 6209703554327262860} m_Layer: 0 - m_Name: SceneStartMenueCanvas_0 + m_Name: SceneStartMenuCanvas_0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2884,7 +2884,7 @@ GameObject: - component: {fileID: 3129443418971278978} - component: {fileID: 4556724629673339128} m_Layer: 0 - m_Name: SceneStartMenue_MnCtrl + m_Name: SceneStartMenu_MnCtrl m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3384,7 +3384,7 @@ GameObject: - component: {fileID: 5601182616672436856} - component: {fileID: 5003498755144260218} m_Layer: 0 - m_Name: SceneStartMenue_onoff_"3" + m_Name: SceneStartMenu_onoff_"3" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefabs/UI/MainMenue.meta b/Assets/Resources/Prefabs/UI/MainMenu.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue.meta rename to Assets/Resources/Prefabs/UI/MainMenu.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/BarButtonContainer.prefab b/Assets/Resources/Prefabs/UI/MainMenu/BarButtonContainer.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/BarButtonContainer.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/BarButtonContainer.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/BarButtonContainer.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/BarButtonContainer.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/BarButtonContainer.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/BarButtonContainer.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Button.prefab b/Assets/Resources/Prefabs/UI/MainMenu/Button.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Button.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/Button.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Button.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/Button.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Button.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Button.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Buttons.meta b/Assets/Resources/Prefabs/UI/MainMenu/Buttons.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Buttons.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Buttons.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab b/Assets/Resources/Prefabs/UI/MainMenu/Buttons/CloseApp.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/Buttons/CloseApp.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/Buttons/CloseApp.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Buttons/CloseApp.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Buttons/CloseApp.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Buttons/SceneSwitchBttn.prefab b/Assets/Resources/Prefabs/UI/MainMenu/Buttons/SceneSwitchBttn.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Buttons/SceneSwitchBttn.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/Buttons/SceneSwitchBttn.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Buttons/SceneSwitchBttn.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/Buttons/SceneSwitchBttn.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Buttons/SceneSwitchBttn.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Buttons/SceneSwitchBttn.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Canvas_Shrink.prefab b/Assets/Resources/Prefabs/UI/MainMenu/Canvas_Shrink.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Canvas_Shrink.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/Canvas_Shrink.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Canvas_Shrink.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/Canvas_Shrink.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Canvas_Shrink.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Canvas_Shrink.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableEntryHeader.prefab b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableEntryHeader.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableEntryHeader.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableEntryHeader.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableEntryHeader.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableEntryHeader.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableEntryHeader.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableEntryHeader.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage.meta b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage.meta rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryCategory.prefab b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryCategory.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryCategory.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryCategory.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryCategory.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryCategory.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryCategory.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryCategory.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryStage.prefab b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryStage.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryStage.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryStage.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryStage.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryStage.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/CollapsableEntryStage.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/CollapsableEntryStage.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/TimeEntry.prefab b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/TimeEntry.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/TimeEntry.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/TimeEntry.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/TimeEntry.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/TimeEntry.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CollapsableStage/TimeEntry.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/CollapsableStage/TimeEntry.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CreateList.prefab b/Assets/Resources/Prefabs/UI/MainMenu/CreateList.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CreateList.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/CreateList.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/CreateList.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/CreateList.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/CreateList.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/CreateList.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab b/Assets/Resources/Prefabs/UI/MainMenu/Dropdown (0).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab rename to Assets/Resources/Prefabs/UI/MainMenu/Dropdown (0).prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/Dropdown (0).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Dropdown (0).prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Dropdown (0).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Empty_SetMouse.prefab b/Assets/Resources/Prefabs/UI/MainMenu/Empty_SetMouse.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Empty_SetMouse.prefab rename to Assets/Resources/Prefabs/UI/MainMenu/Empty_SetMouse.prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Empty_SetMouse.prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/Empty_SetMouse.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Empty_SetMouse.prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Empty_SetMouse.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/LocalEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenu/LocalEntry (0).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/LocalEntry (0).prefab rename to Assets/Resources/Prefabs/UI/MainMenu/LocalEntry (0).prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/LocalEntry (0).prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/LocalEntry (0).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/LocalEntry (0).prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/LocalEntry (0).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab b/Assets/Resources/Prefabs/UI/MainMenu/Option (0).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab rename to Assets/Resources/Prefabs/UI/MainMenu/Option (0).prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/Option (0).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/Option (0).prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/Option (0).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenu/StageEntry (0).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab rename to Assets/Resources/Prefabs/UI/MainMenu/StageEntry (0).prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/StageEntry (0).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/StageEntry (0).prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/StageEntry (0).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions.meta b/Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions.meta rename to Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/DrpEntry (0).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab rename to Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/DrpEntry (0).prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/DrpEntry (0).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/DrpEntry (0).prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/DrpEntry (0).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/InpEntry (0).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab rename to Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/InpEntry (0).prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/InpEntry (0).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/InpEntry (0).prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/InpEntry (0).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/LegEntry (0).prefab b/Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/LegEntry (0).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/LegEntry (0).prefab rename to Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/LegEntry (0).prefab diff --git a/Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/LegEntry (0).prefab.meta b/Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/LegEntry (0).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/MainMenue/SubEntrysOptions/LegEntry (0).prefab.meta rename to Assets/Resources/Prefabs/UI/MainMenu/SubEntrysOptions/LegEntry (0).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue.meta b/Assets/Resources/Prefabs/UI/NetwMenu.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue.meta rename to Assets/Resources/Prefabs/UI/NetwMenu.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASM_Shrink.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/ASM_Shrink.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/ASM_Shrink.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/ASM_Shrink.prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASM_Shrink.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/ASM_Shrink.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/ASM_Shrink.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/ASM_Shrink.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/ASMenu_MnCtrl.prefab similarity index 99% rename from Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/ASMenu_MnCtrl.prefab index e99213a3935eb1e6f8c490260b0ec62490539959..ef94bcf76ec9f444c16ae92d52eb4aa925541d6a 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenu/ASMenu_MnCtrl.prefab @@ -2795,7 +2795,7 @@ GameObject: - component: {fileID: 5366996315580957719} - component: {fileID: 3987228552946735393} m_Layer: 5 - m_Name: ASMenue_MnCtrl + m_Name: ASMenu_MnCtrl m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3074,7 +3074,7 @@ GameObject: - component: {fileID: 5366996316012566054} - component: {fileID: 5366996316012566049} m_Layer: 5 - m_Name: onlineOffline_Menue + m_Name: onlineOffline_Menu m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5929,6 +5929,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -0.00390625 objectReference: {fileID: 0} + - target: {fileID: 2815923836362319388, guid: c2b1781fb05a3d0478a9fb36c9db98b9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -4.9999847 + objectReference: {fileID: 0} - target: {fileID: 3282347303137492915, guid: c2b1781fb05a3d0478a9fb36c9db98b9, type: 3} propertyPath: m_AnchoredPosition.x @@ -6004,6 +6009,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4579715242862631517, guid: c2b1781fb05a3d0478a9fb36c9db98b9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -4.9999847 + objectReference: {fileID: 0} - target: {fileID: 4654362771177702286, guid: c2b1781fb05a3d0478a9fb36c9db98b9, type: 3} propertyPath: m_AnchorMax.y @@ -6044,6 +6054,16 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7116002430756151160, guid: c2b1781fb05a3d0478a9fb36c9db98b9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -5.0000153 + objectReference: {fileID: 0} + - target: {fileID: 7121850332990498394, guid: c2b1781fb05a3d0478a9fb36c9db98b9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -4.9999847 + objectReference: {fileID: 0} - target: {fileID: 7628291294465844033, guid: c2b1781fb05a3d0478a9fb36c9db98b9, type: 3} propertyPath: m_AnchoredPosition.y @@ -6133,7 +6153,7 @@ PrefabInstance: - target: {fileID: 1436249546824975138, guid: c26d76bda684f064780f256b396630c8, type: 3} propertyPath: m_Name - value: OptMenueCrop_1_Can + value: OptMenuCrop_1_Can objectReference: {fileID: 0} - target: {fileID: 4842440437752442199, guid: c26d76bda684f064780f256b396630c8, type: 3} @@ -6284,7 +6304,7 @@ PrefabInstance: - target: {fileID: 1436249546824975138, guid: c26d76bda684f064780f256b396630c8, type: 3} propertyPath: m_Name - value: OptMenueCrop_1_Can BG + value: OptMenuCrop_1_Can BG objectReference: {fileID: 0} - target: {fileID: 1436249546824975138, guid: c26d76bda684f064780f256b396630c8, type: 3} @@ -6575,7 +6595,7 @@ PrefabInstance: - target: {fileID: 8535045728584120954, guid: cb55b4f19dc4dab40a8d9504db571fd9, type: 3} propertyPath: m_Name - value: OptMenueBG_1_Can + value: OptMenuBG_1_Can objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb55b4f19dc4dab40a8d9504db571fd9, type: 3} @@ -6694,7 +6714,7 @@ PrefabInstance: - target: {fileID: 2353089520903266240, guid: eb08152ed328af846bb933812843b1d2, type: 3} propertyPath: m_Name - value: InnerMenueCrop_1_Can + value: InnerMenuCrop_1_Can objectReference: {fileID: 0} - target: {fileID: 4338506752186857163, guid: eb08152ed328af846bb933812843b1d2, type: 3} diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/ASMenu_MnCtrl.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/ASMenue_MnCtrl.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/ASMenu_MnCtrl.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/EventSystem_Ctrl.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/EventSystem_Ctrl.prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/EventSystem_Ctrl.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/EventSystem_Ctrl.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/EventSystem_Ctrl.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/InnerMenueCrop_1_Can.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/InnerMenuCrop_1_Can.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/NetwMenue/InnerMenueCrop_1_Can.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/InnerMenuCrop_1_Can.prefab index a5af7a649c80c85f2af5ef821a9b2da005f39645..43ccfbbd625b7195d2eac0e4423d6d6db139f8d7 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/InnerMenueCrop_1_Can.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenu/InnerMenuCrop_1_Can.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 6566516242505244673} - component: {fileID: 9037122146017936758} m_Layer: 5 - m_Name: InnerMenueCrop_1_Can + m_Name: InnerMenuCrop_1_Can m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29,6 +29,7 @@ RectTransform: 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: - {fileID: 6367746644526444746} m_Father: {fileID: 0} @@ -113,7 +114,7 @@ GameObject: - component: {fileID: 4338506752186857163} - component: {fileID: 2721890782836206577} m_Layer: 5 - m_Name: InnerMenueCrop_1 + m_Name: InnerMenuCrop_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -129,6 +130,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -15} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 606967493988332079} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/InnerMenueCrop_1_Can.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/InnerMenuCrop_1_Can.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/InnerMenueCrop_1_Can.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/InnerMenuCrop_1_Can.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/InputSystem_MnCtrl (1).prefab b/Assets/Resources/Prefabs/UI/NetwMenu/InputSystem_MnCtrl (1).prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/InputSystem_MnCtrl (1).prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/InputSystem_MnCtrl (1).prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/InputSystem_MnCtrl (1).prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/InputSystem_MnCtrl (1).prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/InputSystem_MnCtrl (1).prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/InputSystem_MnCtrl (1).prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 1.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 1.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 1.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 1.prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 1.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 1.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 1.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 1.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 2.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 2.prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 2.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl 2.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl 2.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl.prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/NetwokOptM_MnCtrl.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/NetwokOptM_MnCtrl.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OM_BackButton_1_Can.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/OM_BackButton_1_Can.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/OM_BackButton_1_Can.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/OM_BackButton_1_Can.prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OM_BackButton_1_Can.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/OM_BackButton_1_Can.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/OM_BackButton_1_Can.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/OM_BackButton_1_Can.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptMenueBG_1_Can.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/OptMenuBG_1_Can.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/NetwMenue/OptMenueBG_1_Can.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/OptMenuBG_1_Can.prefab index f9a77fe2d348c560b2984cd3d5e53eb7433259dc..99c90ddae0eea073dea78afba94a99705498b1e4 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/OptMenueBG_1_Can.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenu/OptMenuBG_1_Can.prefab @@ -28,6 +28,7 @@ RectTransform: 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: 2706781646051657721} m_RootOrder: 0 @@ -103,6 +104,7 @@ RectTransform: 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: - {fileID: 1283342823418549463} m_Father: {fileID: 2334352230693929596} @@ -164,7 +166,7 @@ GameObject: - component: {fileID: 2787669272666674191} - component: {fileID: 2879279316433536212} m_Layer: 5 - m_Name: OptMenueBG_1_Can + m_Name: OptMenuBG_1_Can m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -180,6 +182,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2706781646051657721} m_Father: {fileID: 0} @@ -233,7 +236,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &2879279316433536212 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptMenueBG_1_Can.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/OptMenuBG_1_Can.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/OptMenueBG_1_Can.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/OptMenuBG_1_Can.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptMenueCrop_1_Can.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/OptMenuCrop_1_Can.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/NetwMenue/OptMenueCrop_1_Can.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/OptMenuCrop_1_Can.prefab index 1629672dcebad54252232e103185ae1fc61de929..6fc3f140877d79be5fcc7b59535c877fe3231d4f 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/OptMenueCrop_1_Can.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenu/OptMenuCrop_1_Can.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 4842440437752442199} - component: {fileID: 4785433923051044236} m_Layer: 5 - m_Name: OptMenueCrop_1_Can + m_Name: OptMenuCrop_1_Can m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29,6 +29,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4615182551703486113} m_Father: {fileID: 0} @@ -112,7 +113,7 @@ GameObject: - component: {fileID: 7924546530868670716} - component: {fileID: 2337614776468246269} m_Layer: 5 - m_Name: OuterMenueCan + m_Name: OuterMenuCan m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -128,6 +129,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 15} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5042148637141777188} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptMenueCrop_1_Can.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/OptMenuCrop_1_Can.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/OptMenueCrop_1_Can.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/OptMenuCrop_1_Can.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/OptionsM.prefab similarity index 99% rename from Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/OptionsM.prefab index 5ab57acaa302eabe3210ada1b00375eb37b6733f..e54aeb4956ae283b2b46a3797ce05047340de539 100644 --- a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab +++ b/Assets/Resources/Prefabs/UI/NetwMenu/OptionsM.prefab @@ -1270,7 +1270,7 @@ GameObject: - component: {fileID: 266457293081967575} - component: {fileID: 266457293081967574} m_Layer: 5 - m_Name: InnerMenueCrop_1 + m_Name: InnerMenuCrop_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2657,7 +2657,7 @@ GameObject: - component: {fileID: 266457293858355247} - component: {fileID: 266457293858355246} m_Layer: 5 - m_Name: OptMenueBG_1_Can + m_Name: OptMenuBG_1_Can m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3551,7 +3551,7 @@ GameObject: - component: {fileID: 266457294040690726} - component: {fileID: 266457294040690725} m_Layer: 5 - m_Name: InnerMenueCrop_1_Can + m_Name: InnerMenuCrop_1_Can m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4208,7 +4208,7 @@ GameObject: - component: {fileID: 266457294239668257} - component: {fileID: 266457294239668256} m_Layer: 5 - m_Name: OuterMenueCan + m_Name: OuterMenuCan m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4362,7 +4362,7 @@ GameObject: - component: {fileID: 266457294300290651} - component: {fileID: 266457294300290650} m_Layer: 5 - m_Name: OuterMenueCan + m_Name: OuterMenuCan m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5298,7 +5298,7 @@ GameObject: - component: {fileID: 266457294837486647} - component: {fileID: 266457294837486646} m_Layer: 5 - m_Name: OptMenueCrop_1_Can + m_Name: OptMenuCrop_1_Can m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5479,7 +5479,7 @@ GameObject: - component: {fileID: 266457294942239438} - component: {fileID: 266457294942239437} m_Layer: 5 - m_Name: OptMenueCrop_1_Can BG + m_Name: OptMenuCrop_1_Can BG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5549,7 +5549,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &266457294942239437 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/OptionsM.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/OptionsM.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/RebindAction.prefab b/Assets/Resources/Prefabs/UI/NetwMenu/RebindAction.prefab similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/RebindAction.prefab rename to Assets/Resources/Prefabs/UI/NetwMenu/RebindAction.prefab diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/RebindAction.prefab.meta b/Assets/Resources/Prefabs/UI/NetwMenu/RebindAction.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/NetwMenue/RebindAction.prefab.meta rename to Assets/Resources/Prefabs/UI/NetwMenu/RebindAction.prefab.meta diff --git a/Assets/Scenes/Menues.meta b/Assets/Scenes/Menus.meta similarity index 100% rename from Assets/Scenes/Menues.meta rename to Assets/Scenes/Menus.meta diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menus/LaunchMenu.unity similarity index 96% rename from Assets/Scenes/Menues/LaunchMenue.unity rename to Assets/Scenes/Menus/LaunchMenu.unity index 045cb5a06010d6258afab4912c1fda55d4f9859d..d0b1108f84006b48382c9604d2253ca37f699e67 100644 --- a/Assets/Scenes/Menues/LaunchMenue.unity +++ b/Assets/Scenes/Menus/LaunchMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44631976, g: 0.49611664, b: 0.5744803, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1763,6 +1763,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 403113121447593039, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 493827217981746918, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -1773,6 +1778,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 643980811572230372, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 675079858708547288, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y @@ -1783,6 +1793,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 707064040835004558, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 883341646393736448, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -1823,6 +1838,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 1095154148227945438, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 1410769580140872472, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y @@ -1848,6 +1868,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1570933172815917709, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 1576601171175349906, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2013,6 +2038,16 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 2748440379698992153, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} + - target: {fileID: 2842594205562493918, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2869114312252178222, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.x @@ -2023,6 +2058,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2973803960881862375, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 3039527528659726532, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2031,7 +2071,7 @@ PrefabInstance: - target: {fileID: 3100971661806590510, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -4.999939 + value: -4.999771 objectReference: {fileID: 0} - target: {fileID: 3102464668348079172, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} @@ -2041,7 +2081,7 @@ PrefabInstance: - target: {fileID: 3106400641319494412, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -5 + value: -4.9999847 objectReference: {fileID: 0} - target: {fileID: 3193466678055259699, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} @@ -2253,6 +2293,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 1.2089844 objectReference: {fileID: 0} + - target: {fileID: 3721522261733346324, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 3817363730593151953, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y @@ -2298,6 +2343,21 @@ PrefabInstance: propertyPath: m_Name value: ResetAll objectReference: {fileID: 0} + - target: {fileID: 4577032551960066354, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} + - target: {fileID: 4612279584542897437, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} + - target: {fileID: 4619653780961505489, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 4648953805413023611, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -2496,7 +2556,7 @@ PrefabInstance: - target: {fileID: 5366996315580957714, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_Name - value: ASMenue_MnCtrl + value: ASMenu_MnCtrl objectReference: {fileID: 0} - target: {fileID: 5366996315580957714, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} @@ -2938,6 +2998,11 @@ PrefabInstance: propertyPath: m_FontData.m_Alignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 5968713776705908897, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6039154815366894334, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y @@ -2948,11 +3013,26 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 6202981122540516180, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 6269336453185523466, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 6455333838765755398, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_Name + value: OptMenuCrop_1_Can BG + objectReference: {fileID: 0} + - target: {fileID: 6455333839722001418, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_Name + value: OptMenuCrop_1_Can + objectReference: {fileID: 0} - target: {fileID: 6607041489703631481, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.y @@ -3003,6 +3083,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 7143957040207882570, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 7217482720083020611, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchorMax.y @@ -3018,6 +3103,11 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7382112394741229858, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 + objectReference: {fileID: 0} - target: {fileID: 7389608447713087043, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x @@ -3046,7 +3136,12 @@ PrefabInstance: - target: {fileID: 7988796428748055370, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -5 + value: -4.9999847 + objectReference: {fileID: 0} + - target: {fileID: 8008812519178292580, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 8020720250564787701, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} @@ -3076,7 +3171,12 @@ PrefabInstance: - target: {fileID: 8522967146069057291, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -5 + value: -4.9999847 + objectReference: {fileID: 0} + - target: {fileID: 8624388490878500135, guid: d55296411d4f39e43804eb54bbc798fc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -30.240234 objectReference: {fileID: 0} - target: {fileID: 8717619082247649776, guid: d55296411d4f39e43804eb54bbc798fc, type: 3} diff --git a/Assets/Scenes/Menues/LaunchMenue.unity.meta b/Assets/Scenes/Menus/LaunchMenu.unity.meta similarity index 100% rename from Assets/Scenes/Menues/LaunchMenue.unity.meta rename to Assets/Scenes/Menus/LaunchMenu.unity.meta diff --git a/Assets/Scenes/Menues/LoadingScene.unity b/Assets/Scenes/Menus/LoadingScene.unity similarity index 100% rename from Assets/Scenes/Menues/LoadingScene.unity rename to Assets/Scenes/Menus/LoadingScene.unity diff --git a/Assets/Scenes/Menues/LoadingScene.unity.meta b/Assets/Scenes/Menus/LoadingScene.unity.meta similarity index 100% rename from Assets/Scenes/Menues/LoadingScene.unity.meta rename to Assets/Scenes/Menus/LoadingScene.unity.meta diff --git a/Assets/Scenes/Menues/MainMenue.unity b/Assets/Scenes/Menus/MainMenu.unity similarity index 99% rename from Assets/Scenes/Menues/MainMenue.unity rename to Assets/Scenes/Menus/MainMenu.unity index 5f6c52ec01082e7f84f02c803581404bc74c8824..9d5f87c56ad52ccf78543bf132747561d69ba31d 100644 --- a/Assets/Scenes/Menues/MainMenue.unity +++ b/Assets/Scenes/Menus/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3730807, g: 0.380755, b: 0.35876408, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.35872743, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -33198,7 +33198,7 @@ PrefabInstance: propertyPath: m_Text value: 'Home - Menue' + Menu' objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca3d3f1b1c101bb4394beb9547dd782c, type: 3} diff --git a/Assets/Scenes/Menues/MainMenue.unity.meta b/Assets/Scenes/Menus/MainMenu.unity.meta similarity index 100% rename from Assets/Scenes/Menues/MainMenue.unity.meta rename to Assets/Scenes/Menus/MainMenu.unity.meta diff --git a/Assets/Scenes/Menues/StartScreen.unity b/Assets/Scenes/Menus/StartScreen.unity similarity index 100% rename from Assets/Scenes/Menues/StartScreen.unity rename to Assets/Scenes/Menus/StartScreen.unity diff --git a/Assets/Scenes/Menues/StartScreen.unity.meta b/Assets/Scenes/Menus/StartScreen.unity.meta similarity index 100% rename from Assets/Scenes/Menues/StartScreen.unity.meta rename to Assets/Scenes/Menus/StartScreen.unity.meta diff --git a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs index 2004009fdefaa9ba7dcc623c3abdb4c36cd82176..7180a18ac58a138543bc1534378a9b58d2ae173c 100644 --- a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs +++ b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs @@ -40,7 +40,7 @@ public static class CommunicationEvents public static string ServerAddressLocalhost = "http://localhost"; //Without Port //Kann das weg? public static string ServerAddressLocal = "http://localhost:8085"; // "http://localhost:8085" //Kann das weg? - public static string ServerAdress = "http://localhost:8085"; //need "http://" //used by dispalyScrolls.cs //http://10.231.4.95:8085"; //IMPORTANT for MAINMENUE + public static string ServerAdress = "http://localhost:8085"; //need "http://" //used by dispalyScrolls.cs //http://10.231.4.95:8085"; //IMPORTANT for MAINMENU public static Process process_mmt_frameIT_server; diff --git a/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs b/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs index 4c53f8a4d62209b04c550881bbbd8408e48ab0a7..57c0ebacd3cbeebd2982c0f6dfcc416775274b95 100644 --- a/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs +++ b/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs @@ -147,7 +147,7 @@ void Update() else if (Input.GetAxis("Mouse ScrollWheel") != 0) { offset = (int)Mathf.Sign(Input.GetAxis("Mouse ScrollWheel")) - * UIconfig.scrolldirection; //Invert Offset if toggled in Optionsmenue->Controls. + * UIconfig.scrolldirection; //Invert Offset if toggled in Optionsmenu->Controls. } if (offset != 0) diff --git a/Assets/Scripts/Restart.cs b/Assets/Scripts/Restart.cs index a2fac0efd6c4fc09104fc2bdf353cf11d84059cf..4119d92eecdf167e916b3f15f4df55c268aa783f 100644 --- a/Assets/Scripts/Restart.cs +++ b/Assets/Scripts/Restart.cs @@ -9,10 +9,10 @@ public static void LevelReset() Loader.LoadStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder, false); } - public static void LoadMainMenue() + public static void LoadMainMenu() { - //not over SceneManager.LoadingScreen as MainMenue is too light to need to load over a LoadingScreen - SceneManager.LoadScene("MainMenue"); + //not over SceneManager.LoadingScreen as MainMenu is too light to need to load over a LoadingScreen + SceneManager.LoadScene("MainMenu"); } diff --git a/Assets/Scripts/StageStatic.cs b/Assets/Scripts/StageStatic.cs index 0db24b44640c6e836cacdae461903cef8629b306..a6e2ff448246193580a1778d63664dccb4894cb9 100644 --- a/Assets/Scripts/StageStatic.cs +++ b/Assets/Scripts/StageStatic.cs @@ -26,7 +26,7 @@ public static class StageStatic private static readonly List<Dictionary<string, Stage>> StageChapters = new() { new(), new() }; /// <summary> - /// Used to map <see cref="StageOfficial"/> <see cref="Stage.category">categories</see> into a ordered list for the StageMenue. + /// Used to map <see cref="StageOfficial"/> <see cref="Stage.category">categories</see> into a ordered list for the StageMenu. /// </summary> public static Dictionary<string, int> Category = new Dictionary<string, int> { { "", -1 }, diff --git a/Assets/Scripts/UI/HideUI.cs b/Assets/Scripts/UI/HideUI.cs index 27bde70969379d16016553b0ce079e1da0068c46..f25240521458840207c1dbd1336835c2eadb5d39 100644 --- a/Assets/Scripts/UI/HideUI.cs +++ b/Assets/Scripts/UI/HideUI.cs @@ -67,7 +67,7 @@ private void Awake() { //New InputSystem input_ControlMapping = new ControlMapping(); - input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.Enable(); + input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.Enable(); input_ControlMapping.Actionmap1.ToolMode.Enable(); input_ControlMapping.Actionmap1.MathMode.Enable(); input_ControlMapping.Actionmap1.Modifier.Enable(); @@ -80,7 +80,7 @@ private void Awake() playerInput = GetComponent<PlayerInput>(); action_MathM = playerInput.actions["MathMode"]; action_ToolM = playerInput.actions["ToolMode"]; - action_Cancel_PM = playerInput.actions["Cancel_or_PauseMenue"]; + action_Cancel_PM = playerInput.actions["Cancel_or_PauseMenu"]; action_modifier = playerInput.actions["Modifier"]; action_load = playerInput.actions["Load"]; action_save = playerInput.actions["Save"]; @@ -91,7 +91,7 @@ private void Awake() } private void OnEnable() { - input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.Enable(); + input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.Enable(); input_ControlMapping.Actionmap1.ToolMode.Enable(); input_ControlMapping.Actionmap1.MathMode.Enable(); input_ControlMapping.Actionmap1.Modifier.Enable(); @@ -104,7 +104,7 @@ private void OnEnable() private void OnDisable() { - input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.Disable(); + input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.Disable(); input_ControlMapping.Actionmap1.ToolMode.Disable(); input_ControlMapping.Actionmap1.MathMode.Disable(); input_ControlMapping.Actionmap1.Modifier.Enable(); @@ -256,7 +256,7 @@ void CheckIf() if (UIconfig.InputManagerVersion == 2 && numinputtrigger == 0) { - if (action_Cancel_PM.ReadValue<float>() != 0 || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.ReadValue<float>() != 0) + if (action_Cancel_PM.ReadValue<float>() != 0 || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.ReadValue<float>() != 0) { numinputtrigger++; action_Cancel_PM_int = 0; @@ -421,7 +421,7 @@ private void SetCamControl123(bool opt) - public void SetCancelOrPauseMenue() + public void SetCancelOrPauseMenu() { action_Cancel_PM_int = 1; } diff --git a/Assets/Scripts/UI/HideUI_mobile.cs b/Assets/Scripts/UI/HideUI_mobile.cs index 651a65000f040ce2a357d1bd7f90b3c0d8a74bd2..f94050dfa51aa4e9e0cb903dcd359ee4663d38cd 100644 --- a/Assets/Scripts/UI/HideUI_mobile.cs +++ b/Assets/Scripts/UI/HideUI_mobile.cs @@ -62,7 +62,7 @@ private void Awake() { //New InputSystem input_ControlMapping = new ControlMapping(); - input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.Enable(); + input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.Enable(); input_ControlMapping.Actionmap1.ToolMode.Enable(); input_ControlMapping.Actionmap1.MathMode.Enable(); input_ControlMapping.Actionmap1.Modifier.Enable(); @@ -75,7 +75,7 @@ private void Awake() playerInput = GetComponent<PlayerInput>(); action_MathM = playerInput.actions["MathMode"]; action_ToolM = playerInput.actions["ToolMode"]; - action_Cancel_PM = playerInput.actions["Cancel_or_PauseMenue"]; + action_Cancel_PM = playerInput.actions["Cancel_or_PauseMenu"]; action_modifier = playerInput.actions["Modifier"]; action_load = playerInput.actions["Load"]; action_save = playerInput.actions["Save"]; @@ -85,7 +85,7 @@ private void Awake() } private void OnEnable() { - input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.Enable(); + input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.Enable(); input_ControlMapping.Actionmap1.ToolMode.Enable(); input_ControlMapping.Actionmap1.MathMode.Enable(); input_ControlMapping.Actionmap1.Modifier.Enable(); @@ -98,7 +98,7 @@ private void OnEnable() private void OnDisable() { - input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.Disable(); + input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.Disable(); input_ControlMapping.Actionmap1.ToolMode.Disable(); input_ControlMapping.Actionmap1.MathMode.Disable(); input_ControlMapping.Actionmap1.Modifier.Enable(); @@ -323,7 +323,7 @@ void CheckIf() return; } - if (action_Cancel_PM.ReadValue<float>() != 0 || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.ReadValue<float>() != 0) + if (action_Cancel_PM.ReadValue<float>() != 0 || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.ReadValue<float>() != 0) { UIconfig.CanvasOnOff_Array[02] = 1; UIconfig.CanvasOnOff_Array[10] = 0; @@ -386,7 +386,7 @@ void CheckIf() return; } - if (action_Cancel_PM.ReadValue<float>() != 0 || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.ReadValue<float>() != 0) + if (action_Cancel_PM.ReadValue<float>() != 0 || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.ReadValue<float>() != 0) { UIconfig.CanvasOnOff_Array[02] = 1; UIconfig.CanvasOnOff_Array[10] = 0; @@ -398,9 +398,9 @@ void CheckIf() return; } } - //PauseMenue + //PauseMenu - //MathMenue + //MathMenu if (UIconfig.InputManagerVersion == 1) { if (Input.GetButtonDown(MathMode_keyBind)) @@ -432,7 +432,7 @@ void CheckIf() return; } - if (action_Cancel_PM.ReadValue<float>() != 0f || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenue.ReadValue<float>() != 0) + if (action_Cancel_PM.ReadValue<float>() != 0f || action_Cancel_PM_int != 0)//input_ControlMapping.Actionmap1.Cancel_or_PauseMenu.ReadValue<float>() != 0) { UIconfig.CanvasOnOff_Array[02] = 1; UIconfig.CanvasOnOff_Array[10] = 0; @@ -521,7 +521,7 @@ void CheckUI_Vis() } return; } - //PauseMenue + //PauseMenu if (UIconfig.CanvasOnOff_Array[2] == 1) { if (LockOnly) @@ -542,7 +542,7 @@ void CheckUI_Vis() return; } - //Startmenue + //Startmenu if (UIconfig.CanvasOnOff_Array[3] == 1) { if (LockOnly) @@ -684,7 +684,7 @@ private void SetCamControl123(bool opt) CamControl_ScriptChar.enabled = opt; } - public void SetCancelOrPauseMenue() + public void SetCancelOrPauseMenu() { action_Cancel_PM_int = 1; } diff --git a/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs b/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs index fa944691b1fb24cc7b33b5157b61d72b28aa1f29..9f95da97c4e9190507752ec4642ea27175ce3baf 100644 --- a/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs +++ b/Assets/Scripts/UI/InGame/InputUI_Ctrl_mobile.cs @@ -51,7 +51,7 @@ public void toMobileUI() public void toMouseUI2() { ClearUIC(); - //UIconfig.Andr_Start_menue_counter = 1; + //UIconfig.Andr_Start_menu_counter = 1; FrameITUI_GObj.SetActive(true); @@ -60,7 +60,7 @@ public void toMouseUI2() public void toMobileUI2() { ClearUIC(); - //UIconfig.Andr_Start_menue_counter = 1; + //UIconfig.Andr_Start_menu_counter = 1; FrameITUI_mobile_GObj.SetActive(true); diff --git a/Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs b/Assets/Scripts/UI/InGame/Pause_Menu_mobile.cs similarity index 92% rename from Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs rename to Assets/Scripts/UI/InGame/Pause_Menu_mobile.cs index 00925803c13c8d99a3d49b982badf234e4976603..690995294488ef18e325382190f789ce1f193c4a 100644 --- a/Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs +++ b/Assets/Scripts/UI/InGame/Pause_Menu_mobile.cs @@ -12,7 +12,7 @@ https://gamedevbeginner.com/the-right-way-to-pause-the-game-in-unity/#:~:text=The%20most%20convenient%20method%20for%20pausing%20the%20game,will%20return%20the%20game%20to%20its%20normal%20speed. */ -public class Pause_Menue_mobile : MonoBehaviour, IPointerDownHandler, IPointerUpHandler +public class Pause_Menu_mobile : MonoBehaviour, IPointerDownHandler, IPointerUpHandler { //public GameObject myself_GObj; @@ -135,16 +135,16 @@ private void ResumeGame() //SceneSwitcher ScSw = new SceneSwitcher(); //ScSw.NowsSwitchToScene(switchToScene_ID_); - //SceneManager.LoadScene("MainMenue"); + //SceneManager.LoadScene("MainMenu"); switch (switchToScene_ID_) { case 4: - SceneManager.LoadScene("MainMenue"); + SceneManager.LoadScene("MainMenu"); break; case 3: default: - SceneManager.LoadScene("LaunchMenue"); + SceneManager.LoadScene("LaunchMenu"); break; } diff --git a/Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs.meta b/Assets/Scripts/UI/InGame/Pause_Menu_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/InGame/Pause_Menue_mobile.cs.meta rename to Assets/Scripts/UI/InGame/Pause_Menu_mobile.cs.meta diff --git a/Assets/Scripts/UI/InGame/SceneStartMenue_101.cs b/Assets/Scripts/UI/InGame/SceneStartMenu_101.cs similarity index 98% rename from Assets/Scripts/UI/InGame/SceneStartMenue_101.cs rename to Assets/Scripts/UI/InGame/SceneStartMenu_101.cs index c83ce5988fee919f198dc725245303bb03bb312e..2a05c74e2dc1fbb8b1e059287aad9fa8485adf6e 100644 --- a/Assets/Scripts/UI/InGame/SceneStartMenue_101.cs +++ b/Assets/Scripts/UI/InGame/SceneStartMenu_101.cs @@ -10,7 +10,7 @@ https://gamedevbeginner.com/the-right-way-to-pause-the-game-in-unity/#:~:text=The%20most%20convenient%20method%20for%20pausing%20the%20game,will%20return%20the%20game%20to%20its%20normal%20speed. */ -public class SceneStartMenue_101 : MonoBehaviour//, IPointerDownHandler, IPointerUpHandler +public class SceneStartMenu_101 : MonoBehaviour//, IPointerDownHandler, IPointerUpHandler { //public GameObject myself_GObj_Txt; diff --git a/Assets/Scripts/UI/InGame/SceneStartMenue_101.cs.meta b/Assets/Scripts/UI/InGame/SceneStartMenu_101.cs.meta similarity index 100% rename from Assets/Scripts/UI/InGame/SceneStartMenue_101.cs.meta rename to Assets/Scripts/UI/InGame/SceneStartMenu_101.cs.meta diff --git a/Assets/Scripts/UI/MainMenue.meta b/Assets/Scripts/UI/MainMenu.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue.meta rename to Assets/Scripts/UI/MainMenu.meta diff --git a/Assets/Scripts/UI/MainMenue/CollapsableStage.meta b/Assets/Scripts/UI/MainMenu/CollapsableStage.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/CollapsableStage.meta rename to Assets/Scripts/UI/MainMenu/CollapsableStage.meta diff --git a/Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableCategory.cs b/Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableCategory.cs similarity index 95% rename from Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableCategory.cs rename to Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableCategory.cs index 4ee9d6a5a5a020f1897d41aa3b619b0c8083db6a..548df8034d0d4e76fc64e5d70aa8304a3396d287 100644 --- a/Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableCategory.cs +++ b/Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableCategory.cs @@ -6,7 +6,7 @@ public class CollapsableCategory : MonoBehaviour { public GameObject StageEntry; public GameObject StageEntryEntry; - public MenueLoader pageMenue; + public MenuLoader pageMenu; public EditLoader editLoader; public List<Stage> content; @@ -51,7 +51,7 @@ public float DrawChildren() CollapsableStage stage_beahviour = stage_entry.GetComponent<CollapsableStage>(); stage_beahviour.stage_name = stage.name; stage_beahviour.local = !stage.use_install_folder; - stage_beahviour.pageMenue = pageMenue; + stage_beahviour.pageMenu = pageMenu; stage_beahviour.editLoader = editLoader; stage_beahviour.TimeEntry = StageEntryEntry; stage_beahviour.Init(); diff --git a/Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableCategory.cs.meta b/Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableCategory.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableCategory.cs.meta rename to Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableCategory.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableStage.cs b/Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableStage.cs similarity index 98% rename from Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableStage.cs rename to Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableStage.cs index 413a1cbd4460f74af9b084e8a2fe29e3329ae079..1ad4de16424d260ca10d6bb5f467bbe8fd2da12c 100644 --- a/Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableStage.cs +++ b/Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableStage.cs @@ -7,7 +7,7 @@ public class CollapsableStage : MonoBehaviour { public GameObject TimeEntry; - public MenueLoader pageMenue; + public MenuLoader pageMenu; public EditLoader editLoader; public string stage_name; public bool local; @@ -35,7 +35,7 @@ public void Init() // set explicit edit button header.GetNthChild(new List<int> { 3, 0 }).GetComponent<UnityEngine.UI.Button>().onClick.AddListener(delegate { - pageMenue.SetMode(3); + pageMenu.SetMode(3); editLoader.SetStage(stage.name, !stage.use_install_folder); }); diff --git a/Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableStage.cs.meta b/Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableStage.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/CollapsableStage/CollapsableStage.cs.meta rename to Assets/Scripts/UI/MainMenu/CollapsableStage/CollapsableStage.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/ListLoader.cs b/Assets/Scripts/UI/MainMenu/ListLoader.cs similarity index 91% rename from Assets/Scripts/UI/MainMenue/ListLoader.cs rename to Assets/Scripts/UI/MainMenu/ListLoader.cs index c2c1449b2ed10550843c382018e734324e37f614..b3bf2d8a026861e6d1adb0868efa816e9bc24e97 100644 --- a/Assets/Scripts/UI/MainMenue/ListLoader.cs +++ b/Assets/Scripts/UI/MainMenu/ListLoader.cs @@ -2,10 +2,10 @@ using UnityEngine; /// <summary> -/// Allowes for Pages of <see cref="MenueLoader"/> to contain Lists. +/// Allowes for Pages of <see cref="MenuLoader"/> to contain Lists. /// </summary> /// <typeparam name="T">Type to list</typeparam> -public abstract class ListLoader<T> : MenueLoader +public abstract class ListLoader<T> : MenuLoader { /// <summary> <see cref="GameObject"/> to which new <see cref="EntryHeader"/> entries are being added. </summary> public GameObject List; diff --git a/Assets/Scripts/UI/MainMenue/ListLoader.cs.meta b/Assets/Scripts/UI/MainMenu/ListLoader.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/ListLoader.cs.meta rename to Assets/Scripts/UI/MainMenu/ListLoader.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/MenueLoader.cs b/Assets/Scripts/UI/MainMenu/MenuLoader.cs similarity index 92% rename from Assets/Scripts/UI/MainMenue/MenueLoader.cs rename to Assets/Scripts/UI/MainMenu/MenuLoader.cs index 361ba63f2ccd2b276ff93196592d05166ac30a10..b9e1b4efa05829160b25d3278d05abbc4574da1a 100644 --- a/Assets/Scripts/UI/MainMenue/MenueLoader.cs +++ b/Assets/Scripts/UI/MainMenu/MenuLoader.cs @@ -3,9 +3,9 @@ /// <summary> /// Allows multiple Pages (direct children of this) to switch/ scroll through. /// </summary> -public class MenueLoader : MonoBehaviour +public class MenuLoader : MonoBehaviour { - public MenueLoader pageMenue; + public MenuLoader pageMenu; public UnityEngine.UI.ScrollRect scroll = null; public GameObject Pages; diff --git a/Assets/Scripts/UI/MainMenue/MenueLoader.cs.meta b/Assets/Scripts/UI/MainMenu/MenuLoader.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/MenueLoader.cs.meta rename to Assets/Scripts/UI/MainMenu/MenuLoader.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/PageLoader.meta b/Assets/Scripts/UI/MainMenu/PageLoader.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/PageLoader.meta rename to Assets/Scripts/UI/MainMenu/PageLoader.meta diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/CreateLoader.cs b/Assets/Scripts/UI/MainMenu/PageLoader/CreateLoader.cs similarity index 98% rename from Assets/Scripts/UI/MainMenue/PageLoader/CreateLoader.cs rename to Assets/Scripts/UI/MainMenu/PageLoader/CreateLoader.cs index fa19971015ebbbdc852c935dca059ab645f06b55..85e25c97f050a22f6b5ba23ba84553a8e14b5963 100644 --- a/Assets/Scripts/UI/MainMenue/PageLoader/CreateLoader.cs +++ b/Assets/Scripts/UI/MainMenu/PageLoader/CreateLoader.cs @@ -1,6 +1,6 @@ using UnityEngine; -public class CreateLoader : MenueLoader +public class CreateLoader : MenuLoader { public TMPro.TMP_InputField Category; public TMPro.TMP_InputField Id; diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/CreateLoader.cs.meta b/Assets/Scripts/UI/MainMenu/PageLoader/CreateLoader.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/PageLoader/CreateLoader.cs.meta rename to Assets/Scripts/UI/MainMenu/PageLoader/CreateLoader.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/EditLoader.cs b/Assets/Scripts/UI/MainMenu/PageLoader/EditLoader.cs similarity index 97% rename from Assets/Scripts/UI/MainMenue/PageLoader/EditLoader.cs rename to Assets/Scripts/UI/MainMenu/PageLoader/EditLoader.cs index 04df547ece7fa7ab5968480e87b36da7f32b85e6..f009a7cc066f7750effa1f51ce1df3dd364e9db6 100644 --- a/Assets/Scripts/UI/MainMenue/PageLoader/EditLoader.cs +++ b/Assets/Scripts/UI/MainMenu/PageLoader/EditLoader.cs @@ -39,7 +39,7 @@ public void Delete() //Reset(); //TODO: ask user _Delete(); - pageMenue.RevertMode(); + pageMenu.RevertMode(); } private bool _Clone(bool overwrite) @@ -102,7 +102,7 @@ public void Save() if (!_Save()) return; - pageMenue.RevertMode(); + pageMenu.RevertMode(); } public void Edit() diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/EditLoader.cs.meta b/Assets/Scripts/UI/MainMenu/PageLoader/EditLoader.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/PageLoader/EditLoader.cs.meta rename to Assets/Scripts/UI/MainMenu/PageLoader/EditLoader.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/LocalLoader.cs b/Assets/Scripts/UI/MainMenu/PageLoader/LocalLoader.cs similarity index 100% rename from Assets/Scripts/UI/MainMenue/PageLoader/LocalLoader.cs rename to Assets/Scripts/UI/MainMenu/PageLoader/LocalLoader.cs diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/LocalLoader.cs.meta b/Assets/Scripts/UI/MainMenu/PageLoader/LocalLoader.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/PageLoader/LocalLoader.cs.meta rename to Assets/Scripts/UI/MainMenu/PageLoader/LocalLoader.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/StageLoader.cs b/Assets/Scripts/UI/MainMenu/PageLoader/StageLoader.cs similarity index 97% rename from Assets/Scripts/UI/MainMenue/PageLoader/StageLoader.cs rename to Assets/Scripts/UI/MainMenu/PageLoader/StageLoader.cs index 5fa7e8c349d98c37f5d4173a5c4e3d9cd1a34e86..fa792c53feeed70a7a6dcf3d448e5110b6576734 100644 --- a/Assets/Scripts/UI/MainMenue/PageLoader/StageLoader.cs +++ b/Assets/Scripts/UI/MainMenu/PageLoader/StageLoader.cs @@ -56,7 +56,7 @@ protected override void ListButtonsWrapped(List<Stage> list) category_behaviour = category_entry.GetComponent<CollapsableCategory>(); category_behaviour.content = list.Where(s => s.category == cat).ToList(); category_behaviour.category = cat; - category_behaviour.pageMenue = pageMenue; + category_behaviour.pageMenu = pageMenu; category_behaviour.editLoader = editLoader; category_behaviour.StageEntry = EntryBody; category_behaviour.StageEntryEntry = EntryTime; diff --git a/Assets/Scripts/UI/MainMenue/PageLoader/StageLoader.cs.meta b/Assets/Scripts/UI/MainMenu/PageLoader/StageLoader.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/PageLoader/StageLoader.cs.meta rename to Assets/Scripts/UI/MainMenu/PageLoader/StageLoader.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/QuitApp.cs b/Assets/Scripts/UI/MainMenu/QuitApp.cs similarity index 100% rename from Assets/Scripts/UI/MainMenue/QuitApp.cs rename to Assets/Scripts/UI/MainMenu/QuitApp.cs diff --git a/Assets/Scripts/UI/MainMenue/QuitApp.cs.meta b/Assets/Scripts/UI/MainMenu/QuitApp.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/QuitApp.cs.meta rename to Assets/Scripts/UI/MainMenu/QuitApp.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/SceneSwitcher.cs b/Assets/Scripts/UI/MainMenu/SceneSwitcher.cs similarity index 82% rename from Assets/Scripts/UI/MainMenue/SceneSwitcher.cs rename to Assets/Scripts/UI/MainMenu/SceneSwitcher.cs index 36d2a61d9767e635497b51a410288768838e6d42..95ad37ae1dca467d6cf81bd23eed1f46a3e35271 100644 --- a/Assets/Scripts/UI/MainMenue/SceneSwitcher.cs +++ b/Assets/Scripts/UI/MainMenu/SceneSwitcher.cs @@ -39,13 +39,13 @@ public void NowsSwitchToScene(int switchToSceneID_2) switch (switchToSceneID_2) { case 3: - SceneManager.LoadScene("LaunchMenue"); + SceneManager.LoadScene("LaunchMenu"); break; case 4: - SceneManager.LoadScene("MainMenue"); + SceneManager.LoadScene("MainMenu"); break; default: - SceneManager.LoadScene("LaunchMenue"); + SceneManager.LoadScene("LaunchMenu"); break; } diff --git a/Assets/Scripts/UI/MainMenue/SceneSwitcher.cs.meta b/Assets/Scripts/UI/MainMenu/SceneSwitcher.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/SceneSwitcher.cs.meta rename to Assets/Scripts/UI/MainMenu/SceneSwitcher.cs.meta diff --git a/Assets/Scripts/UI/MainMenue/ScrollListWindowInitializer.cs b/Assets/Scripts/UI/MainMenu/ScrollListWindowInitializer.cs similarity index 100% rename from Assets/Scripts/UI/MainMenue/ScrollListWindowInitializer.cs rename to Assets/Scripts/UI/MainMenu/ScrollListWindowInitializer.cs diff --git a/Assets/Scripts/UI/MainMenue/ScrollListWindowInitializer.cs.meta b/Assets/Scripts/UI/MainMenu/ScrollListWindowInitializer.cs.meta similarity index 100% rename from Assets/Scripts/UI/MainMenue/ScrollListWindowInitializer.cs.meta rename to Assets/Scripts/UI/MainMenu/ScrollListWindowInitializer.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue.meta b/Assets/Scripts/UI/NetwMenu.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue.meta rename to Assets/Scripts/UI/NetwMenu.meta diff --git a/Assets/Scripts/UI/NetwMenue/BackToButton_mobile.cs b/Assets/Scripts/UI/NetwMenu/BackToButton_mobile.cs similarity index 100% rename from Assets/Scripts/UI/NetwMenue/BackToButton_mobile.cs rename to Assets/Scripts/UI/NetwMenu/BackToButton_mobile.cs diff --git a/Assets/Scripts/UI/NetwMenue/BackToButton_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/BackToButton_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/BackToButton_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/BackToButton_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs b/Assets/Scripts/UI/NetwMenu/ControlOptionsM_Keyboard_mobile.cs similarity index 100% rename from Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs rename to Assets/Scripts/UI/NetwMenu/ControlOptionsM_Keyboard_mobile.cs diff --git a/Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/ControlOptionsM_Keyboard_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/ControlOptionsM_Keyboard_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/ControlOptionsM_Keyboard_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/ControlOptionsMenuePreview_mobile.cs b/Assets/Scripts/UI/NetwMenu/ControlOptionsMenuPreview_mobile.cs similarity index 98% rename from Assets/Scripts/UI/NetwMenue/ControlOptionsMenuePreview_mobile.cs rename to Assets/Scripts/UI/NetwMenu/ControlOptionsMenuPreview_mobile.cs index 072bf4b6d571c5ea5aa0a08be051d65f9bc3bb6e..aa9d8346b77e39a75ad0a33a9d27a7ce11bdb337 100644 --- a/Assets/Scripts/UI/NetwMenue/ControlOptionsMenuePreview_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/ControlOptionsMenuPreview_mobile.cs @@ -5,7 +5,7 @@ -public class ControlOptionsMenuePreview_mobile : MonoBehaviour +public class ControlOptionsMenuPreview_mobile : MonoBehaviour { public GameObject ExBttnPreview1; public GameObject ExBttnPreview2l; diff --git a/Assets/Scripts/UI/NetwMenue/ControlOptionsMenuePreview_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/ControlOptionsMenuPreview_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/ControlOptionsMenuePreview_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/ControlOptionsMenuPreview_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/ControlOptionsMenue_mobile.cs b/Assets/Scripts/UI/NetwMenu/ControlOptionsMenu_mobile.cs similarity index 96% rename from Assets/Scripts/UI/NetwMenue/ControlOptionsMenue_mobile.cs rename to Assets/Scripts/UI/NetwMenu/ControlOptionsMenu_mobile.cs index 628731436d359bb6cba6132df0eb2d74eb34f85b..7de1c33364b13b5970d31fab7dd3e531b400b74c 100644 --- a/Assets/Scripts/UI/NetwMenue/ControlOptionsMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/ControlOptionsMenu_mobile.cs @@ -4,7 +4,7 @@ using static UIconfig; -public class ControlOptionsMenue_mobile : MonoBehaviour +public class ControlOptionsMenu_mobile : MonoBehaviour { public GameObject TouchControlButtonT; public GameObject TouchControlButtonUT; @@ -67,9 +67,9 @@ public void InputTXTupdate() "Talk: " + "\n" + "Change Tool: " + "\n" + //"\n" + - "Menue Tools: " + "\n" + - "Menue Mathematics: " + "\n" + - "Menue Cancel: " + "\n" + + "Menu Tools: " + "\n" + + "Menu Mathematics: " + "\n" + + "Menu Cancel: " + "\n" + //"\n" + "Command Load: " + "\n" + "Command Save: " + "\n" + @@ -89,8 +89,8 @@ public void InputTXTupdate() InputManager_KeyBinding_talk_1 + "\n" + InputManager_KeyBinding_MouseScrollWheel_1 + "\n" + //"\n" + - InputManager_KeyBinding_ToolmMenue_1 + "\n" + - InputManager_KeyBinding_MathMenue_1 + "\n" + + InputManager_KeyBinding_ToolmMenu_1 + "\n" + + InputManager_KeyBinding_MathMenu_1 + "\n" + InputManager_KeyBinding_Cancel_1 + "\n" + //"\n" + InputManager_KeyBinding_modifier + " + " + InputManager_KeyBinding_mod_load_1 + "\n" + diff --git a/Assets/Scripts/UI/NetwMenue/ControlOptionsMenue_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/ControlOptionsMenu_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/ControlOptionsMenue_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/ControlOptionsMenu_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/FindIP.cs b/Assets/Scripts/UI/NetwMenu/FindIP.cs similarity index 98% rename from Assets/Scripts/UI/NetwMenue/FindIP.cs rename to Assets/Scripts/UI/NetwMenu/FindIP.cs index fb2b211b1c374a691b5820f15be09f5e3f9b8a73..a0f5624f46f1913d39aa70240f855f85b3fc0709 100644 --- a/Assets/Scripts/UI/NetwMenue/FindIP.cs +++ b/Assets/Scripts/UI/NetwMenu/FindIP.cs @@ -151,7 +151,7 @@ public void SetText(string text) CommunicationEvents.selecIP = CommunicationEvents.newIP; CommunicationEvents.IPcheckGeneration++; - //Safefieldmenue(); + //Safefieldmenu(); goBackButtonOPTM(); @@ -168,7 +168,7 @@ public void goBackButtonOPTM() NetworkJSON_Save(); ClearUIC(); - //UIconfig.Andr_Start_menue_counter = 1; + //UIconfig.Andr_Start_menu_counter = 1; backTo_GObj.SetActive(true); diff --git a/Assets/Scripts/UI/NetwMenue/FindIP.cs.meta b/Assets/Scripts/UI/NetwMenu/FindIP.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/FindIP.cs.meta rename to Assets/Scripts/UI/NetwMenu/FindIP.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs b/Assets/Scripts/UI/NetwMenu/GameplayOptionsMenu_mobile.cs similarity index 96% rename from Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs rename to Assets/Scripts/UI/NetwMenu/GameplayOptionsMenu_mobile.cs index b9b4454ff09614f1d8171fb2f40a5caf7c38d6d5..7a74428ab2565476fdd5b453b5300f7d6a653546 100644 --- a/Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/GameplayOptionsMenu_mobile.cs @@ -2,7 +2,7 @@ using UnityEngine.UI; //andr -public class GameplayOptionsMenue_mobile : MonoBehaviour +public class GameplayOptionsMenu_mobile : MonoBehaviour { public GameObject cllscaleAll_Slider; diff --git a/Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/GameplayOptionsMenu_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/GameplayOptionsMenue_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/GameplayOptionsMenu_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/GraphicOptionsMenue_mobile.cs b/Assets/Scripts/UI/NetwMenu/GraphicOptionsMenu_mobile.cs similarity index 95% rename from Assets/Scripts/UI/NetwMenue/GraphicOptionsMenue_mobile.cs rename to Assets/Scripts/UI/NetwMenu/GraphicOptionsMenu_mobile.cs index 2d5ae763fe28f55043e92f33aef7c696efd8208d..417f9a7f8d174d3d3e92e53980edc4f6e6d63f94 100644 --- a/Assets/Scripts/UI/NetwMenue/GraphicOptionsMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/GraphicOptionsMenu_mobile.cs @@ -2,7 +2,7 @@ using UnityEngine.UI; //andr -public class GraphicOptionsMenue_mobile : MonoBehaviour +public class GraphicOptionsMenu_mobile : MonoBehaviour { public GameObject cursorScaler_Slider; diff --git a/Assets/Scripts/UI/NetwMenue/GraphicOptionsMenue_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/GraphicOptionsMenu_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/GraphicOptionsMenue_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/GraphicOptionsMenu_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs b/Assets/Scripts/UI/NetwMenu/LaunchMenu_mobile.cs similarity index 84% rename from Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs rename to Assets/Scripts/UI/NetwMenu/LaunchMenu_mobile.cs index d6e499588d25af5d710e594c8b1da94581b4c4ab..34c0521ad575dd3df39e81071ed0e6682598ac13 100644 --- a/Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/LaunchMenu_mobile.cs @@ -7,7 +7,7 @@ using static StreamingAssetLoader; -public class LaunchMenue_mobile : MonoBehaviour, IPointerDownHandler, IPointerUpHandler +public class LaunchMenu_mobile : MonoBehaviour, IPointerDownHandler, IPointerUpHandler { @@ -35,7 +35,7 @@ void Start() private void Update() { - //UnityEngine.Debug.Log("StartMainMenue"); + //UnityEngine.Debug.Log("StartMainMenu"); } @@ -58,7 +58,7 @@ public void StartWithLastServerButton() public void toNetwOptionsM() { ClearUIC(); - UIconfig.Andr_Start_menue_counter = 2; + UIconfig.Andr_Start_menu_counter = 2; optionsNetwM_GObj.SetActive(true); @@ -85,9 +85,9 @@ public static void startNextSceneFunctionNewGame() NetworkJSON_Save(); CommunicationEvents.ServerAdress = "http://" + CommunicationEvents.selecIP; CommunicationEvents.ServerRunning = true; - //UnityEngine.Debug.Log("StartMainMenue"); + //UnityEngine.Debug.Log("StartMainMenu"); //UnityEngine.Debug.Log("CommunicationEvents.ServerAdress = " + CommunicationEvents.ServerAdress); - SceneManager.LoadScene("MainMenue"); + SceneManager.LoadScene("MainMenu"); } } diff --git a/Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/LaunchMenu_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/LaunchMenue_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/LaunchMenu_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/LoadingCircle.cs b/Assets/Scripts/UI/NetwMenu/LoadingCircle.cs similarity index 100% rename from Assets/Scripts/UI/NetwMenue/LoadingCircle.cs rename to Assets/Scripts/UI/NetwMenu/LoadingCircle.cs diff --git a/Assets/Scripts/UI/NetwMenue/LoadingCircle.cs.meta b/Assets/Scripts/UI/NetwMenu/LoadingCircle.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/LoadingCircle.cs.meta rename to Assets/Scripts/UI/NetwMenu/LoadingCircle.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs b/Assets/Scripts/UI/NetwMenu/MenuControl_mobile.cs similarity index 89% rename from Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs rename to Assets/Scripts/UI/NetwMenu/MenuControl_mobile.cs index 313ff8b6f78ac9c468221d7438620365ad0e3710..a5e22d6c79099a626cb58a418cc7f8ac93d8e361 100644 --- a/Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/MenuControl_mobile.cs @@ -4,7 +4,7 @@ //using static CommunicationEvents; -public class MenueControl_mobile : MonoBehaviour +public class MenuControl_mobile : MonoBehaviour { @@ -31,7 +31,7 @@ private void Update() public void toChild1() { ClearUIC(); - //UIconfig.Andr_Start_menue_counter = 1; + //UIconfig.Andr_Start_menu_counter = 1; child1_GObj.SetActive(true); diff --git a/Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/MenuControl_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/MenueControl_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/MenuControl_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/ResetSaveDataButton_mobile.cs b/Assets/Scripts/UI/NetwMenu/ResetSaveDataButton_mobile.cs similarity index 92% rename from Assets/Scripts/UI/NetwMenue/ResetSaveDataButton_mobile.cs rename to Assets/Scripts/UI/NetwMenu/ResetSaveDataButton_mobile.cs index 939a05e3e8a4da1c52a661d2db9a988c140ad505..4f93b12ff1939b96839bb273d4c40e045082819b 100644 --- a/Assets/Scripts/UI/NetwMenue/ResetSaveDataButton_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/ResetSaveDataButton_mobile.cs @@ -38,7 +38,7 @@ public void ReloadStreamingAsset_Bttn() public void GenerateAllDemoFiles() { GenerateDemoFiles.GenerateAll(); // has to happen in a Level. - SceneManager.LoadScene("MainMenue"); // reload generated content + SceneManager.LoadScene("MainMenu"); // reload generated content Application.Quit(); } } \ No newline at end of file diff --git a/Assets/Scripts/UI/NetwMenue/ResetSaveDataButton_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/ResetSaveDataButton_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/ResetSaveDataButton_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/ResetSaveDataButton_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs b/Assets/Scripts/UI/NetwMenu/SaveNetwAddr_mobile.cs similarity index 100% rename from Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs rename to Assets/Scripts/UI/NetwMenu/SaveNetwAddr_mobile.cs diff --git a/Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/SaveNetwAddr_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/SaveNetwAddr_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/SaveNetwAddr_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs b/Assets/Scripts/UI/NetwMenu/SelectNetwServer_mobile.cs similarity index 99% rename from Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs rename to Assets/Scripts/UI/NetwMenu/SelectNetwServer_mobile.cs index 2efbebc95c2b7811abca8e70564bc5c0d8bfab0d..3f924d0ffa94f85934fc079bfe9680eb885194fc 100644 --- a/Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/SelectNetwServer_mobile.cs @@ -47,7 +47,7 @@ public void SlotLPS() NetworkJSON_Save(); //SceneManager.LoadScene("Andr_TreeWorld"); - //SceneManager.LoadScene("MainMenue"); + //SceneManager.LoadScene("MainMenu"); } @@ -63,7 +63,7 @@ public void Slot1() NetworkJSON_Save(); //SceneManager.LoadScene("Andr_TreeWorld"); - //SceneManager.LoadScene("MainMenue"); + //SceneManager.LoadScene("MainMenu"); } @@ -80,7 +80,7 @@ public void Slot2() NetworkJSON_Save(); //SceneManager.LoadScene("Andr_TreeWorld"); - //SceneManager.LoadScene("MainMenue"); + //SceneManager.LoadScene("MainMenu"); } public void Slot3() diff --git a/Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/SelectNetwServer_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/SelectNetwServer_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/SelectNetwServer_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/SelectedNetwServer_mobile.cs b/Assets/Scripts/UI/NetwMenu/SelectedNetwServer_mobile.cs similarity index 99% rename from Assets/Scripts/UI/NetwMenue/SelectedNetwServer_mobile.cs rename to Assets/Scripts/UI/NetwMenu/SelectedNetwServer_mobile.cs index bc9f6291ed123ce726ebc24e5cb927b108e9071c..06cd8b696f728e834c61f836b2b7758f369a0ad8 100644 --- a/Assets/Scripts/UI/NetwMenue/SelectedNetwServer_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/SelectedNetwServer_mobile.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.UI; //andr -using static LaunchMenue_mobile; +using static LaunchMenu_mobile; using static UIconfig; public class SelectedNetwServer_mobile : MonoBehaviour diff --git a/Assets/Scripts/UI/NetwMenue/SelectedNetwServer_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/SelectedNetwServer_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/SelectedNetwServer_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/SelectedNetwServer_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/SelectedNewNetwServer_mobile.cs b/Assets/Scripts/UI/NetwMenu/SelectedNewNetwServer_mobile.cs similarity index 99% rename from Assets/Scripts/UI/NetwMenue/SelectedNewNetwServer_mobile.cs rename to Assets/Scripts/UI/NetwMenu/SelectedNewNetwServer_mobile.cs index f5b0a04a6b7850be6c5f1eb52bd729fdd2e5027c..bf0014ae2ecc30418aa13763c24758748210e8f7 100644 --- a/Assets/Scripts/UI/NetwMenue/SelectedNewNetwServer_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/SelectedNewNetwServer_mobile.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.UI; //andr -using static LaunchMenue_mobile; +using static LaunchMenu_mobile; using static UIconfig; public class SelectedNewNetwServer_mobile : MonoBehaviour diff --git a/Assets/Scripts/UI/NetwMenue/SelectedNewNetwServer_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/SelectedNewNetwServer_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/SelectedNewNetwServer_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/SelectedNewNetwServer_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs b/Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs similarity index 98% rename from Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs rename to Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs index f9f95fe567ee5c5b39cef1cb019e8a5fde7050d8..3e4e83b7d92d03cd5705d67520d5777ba1b4a9a4 100644 --- a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs @@ -8,7 +8,7 @@ //using static CommunicationEvents; using static UIconfig; -public class StartMenue_mobile : MonoBehaviour +public class StartMenu_mobile : MonoBehaviour { @@ -238,7 +238,7 @@ void ScreenOptimization() scaleFactor = Mathf.Pow(kLogBase, logWeightedAverage); - //GameObject.Find("ASMenue").GetComponent; + //GameObject.Find("ASMenu").GetComponent; //Camera; @@ -282,7 +282,7 @@ void ScreenOptimization() public void toChild1() { ClearUIC(); - UIconfig.Andr_Start_menue_counter = 1; + UIconfig.Andr_Start_menu_counter = 1; child1_GObj.SetActive(true); ; diff --git a/Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/StartMenue_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/StartMenu_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs b/Assets/Scripts/UI/NetwMenu/SystemOptionsMenu_mobile.cs similarity index 99% rename from Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs rename to Assets/Scripts/UI/NetwMenu/SystemOptionsMenu_mobile.cs index 9e2e92d9ce5d230c5464d16f03f9eedcb8c2cd2f..8b682d43fca3abc1040c92c9db1b6c5c15942b05 100644 --- a/Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs +++ b/Assets/Scripts/UI/NetwMenu/SystemOptionsMenu_mobile.cs @@ -3,7 +3,7 @@ using static CommunicationEvents; using static StreamingAssetLoader; -public class SystemOptionsMenue_mobile : MonoBehaviour +public class SystemOptionsMenu_mobile : MonoBehaviour { public GameObject AutoOSreq_ButtonT; diff --git a/Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs.meta b/Assets/Scripts/UI/NetwMenu/SystemOptionsMenu_mobile.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/SystemOptionsMenue_mobile.cs.meta rename to Assets/Scripts/UI/NetwMenu/SystemOptionsMenu_mobile.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs b/Assets/Scripts/UI/NetwMenu/WaitingForLocalMMT.cs similarity index 94% rename from Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs rename to Assets/Scripts/UI/NetwMenu/WaitingForLocalMMT.cs index ff75261c1eb10c7caa0a06f4215ae2e3d1f91372..36862caac78457e924d786f3555e02af128b76c9 100644 --- a/Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs +++ b/Assets/Scripts/UI/NetwMenu/WaitingForLocalMMT.cs @@ -42,8 +42,8 @@ void PrepareGame() if (CommunicationEvents.ServerRunning == true) { CommunicationEvents.ServerAdress = CommunicationEvents.ServerAddressLocal; - //UnityEngine.Debug.Log("StartMainMenue"); - SceneManager.LoadScene("MainMenue"); + //UnityEngine.Debug.Log("StartMainMenu"); + SceneManager.LoadScene("MainMenu"); } diff --git a/Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs.meta b/Assets/Scripts/UI/NetwMenu/WaitingForLocalMMT.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/WaitingForLocalMMT.cs.meta rename to Assets/Scripts/UI/NetwMenu/WaitingForLocalMMT.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/updateMouseCursor.cs b/Assets/Scripts/UI/NetwMenu/updateMouseCursor.cs similarity index 100% rename from Assets/Scripts/UI/NetwMenue/updateMouseCursor.cs rename to Assets/Scripts/UI/NetwMenu/updateMouseCursor.cs diff --git a/Assets/Scripts/UI/NetwMenue/updateMouseCursor.cs.meta b/Assets/Scripts/UI/NetwMenu/updateMouseCursor.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/updateMouseCursor.cs.meta rename to Assets/Scripts/UI/NetwMenu/updateMouseCursor.cs.meta diff --git a/Assets/Scripts/UI/NetwMenue/uploadMouseCursor.cs b/Assets/Scripts/UI/NetwMenu/uploadMouseCursor.cs similarity index 100% rename from Assets/Scripts/UI/NetwMenue/uploadMouseCursor.cs rename to Assets/Scripts/UI/NetwMenu/uploadMouseCursor.cs diff --git a/Assets/Scripts/UI/NetwMenue/uploadMouseCursor.cs.meta b/Assets/Scripts/UI/NetwMenu/uploadMouseCursor.cs.meta similarity index 100% rename from Assets/Scripts/UI/NetwMenue/uploadMouseCursor.cs.meta rename to Assets/Scripts/UI/NetwMenu/uploadMouseCursor.cs.meta diff --git a/Assets/Scripts/UI/PlayerControls/ControlMapping.cs b/Assets/Scripts/UI/PlayerControls/ControlMapping.cs index daf102228825a8cd4c3b53c3a9cd947f9e7459c3..74af2bb0e40dcd570f6195da948f04e30115b6ea 100644 --- a/Assets/Scripts/UI/PlayerControls/ControlMapping.cs +++ b/Assets/Scripts/UI/PlayerControls/ControlMapping.cs @@ -64,7 +64,7 @@ public @ControlMapping() ""initialStateCheck"": false }, { - ""name"": ""Cancel_or_PauseMenue"", + ""name"": ""Cancel_or_PauseMenu"", ""type"": ""PassThrough"", ""id"": ""d5aafbfd-31bc-402e-89dc-c21c91212bbc"", ""expectedControlType"": ""Button"", @@ -334,7 +334,7 @@ public @ControlMapping() ""interactions"": """", ""processors"": """", ""groups"": ""KeyboardMouse;Keyboard;Gamepad;test;Android"", - ""action"": ""Cancel_or_PauseMenue"", + ""action"": ""Cancel_or_PauseMenu"", ""isComposite"": false, ""isPartOfComposite"": false }, @@ -1836,7 +1836,7 @@ public @ControlMapping() m_Actionmap1_LookCamera = m_Actionmap1.FindAction("LookCamera", throwIfNotFound: true); m_Actionmap1_Fire1_or_Interacting = m_Actionmap1.FindAction("Fire1_or_Interacting", throwIfNotFound: true); m_Actionmap1_Camerazoom = m_Actionmap1.FindAction("Camerazoom", throwIfNotFound: true); - m_Actionmap1_Cancel_or_PauseMenue = m_Actionmap1.FindAction("Cancel_or_PauseMenue", throwIfNotFound: true); + m_Actionmap1_Cancel_or_PauseMenu = m_Actionmap1.FindAction("Cancel_or_PauseMenu", throwIfNotFound: true); m_Actionmap1_ToolMode = m_Actionmap1.FindAction("ToolMode", throwIfNotFound: true); m_Actionmap1_MathMode = m_Actionmap1.FindAction("MathMode", throwIfNotFound: true); m_Actionmap1_Talking = m_Actionmap1.FindAction("Talking", throwIfNotFound: true); @@ -1944,7 +1944,7 @@ public int FindBinding(InputBinding bindingMask, out InputAction action) private readonly InputAction m_Actionmap1_LookCamera; private readonly InputAction m_Actionmap1_Fire1_or_Interacting; private readonly InputAction m_Actionmap1_Camerazoom; - private readonly InputAction m_Actionmap1_Cancel_or_PauseMenue; + private readonly InputAction m_Actionmap1_Cancel_or_PauseMenu; private readonly InputAction m_Actionmap1_ToolMode; private readonly InputAction m_Actionmap1_MathMode; private readonly InputAction m_Actionmap1_Talking; @@ -1964,7 +1964,7 @@ public struct Actionmap1Actions public InputAction @LookCamera => m_Wrapper.m_Actionmap1_LookCamera; public InputAction @Fire1_or_Interacting => m_Wrapper.m_Actionmap1_Fire1_or_Interacting; public InputAction @Camerazoom => m_Wrapper.m_Actionmap1_Camerazoom; - public InputAction @Cancel_or_PauseMenue => m_Wrapper.m_Actionmap1_Cancel_or_PauseMenue; + public InputAction @Cancel_or_PauseMenu => m_Wrapper.m_Actionmap1_Cancel_or_PauseMenu; public InputAction @ToolMode => m_Wrapper.m_Actionmap1_ToolMode; public InputAction @MathMode => m_Wrapper.m_Actionmap1_MathMode; public InputAction @Talking => m_Wrapper.m_Actionmap1_Talking; @@ -1997,9 +1997,9 @@ public void SetCallbacks(IActionmap1Actions instance) @Camerazoom.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCamerazoom; @Camerazoom.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCamerazoom; @Camerazoom.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCamerazoom; - @Cancel_or_PauseMenue.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel_or_PauseMenue; - @Cancel_or_PauseMenue.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel_or_PauseMenue; - @Cancel_or_PauseMenue.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel_or_PauseMenue; + @Cancel_or_PauseMenu.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel_or_PauseMenu; + @Cancel_or_PauseMenu.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel_or_PauseMenu; + @Cancel_or_PauseMenu.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnCancel_or_PauseMenu; @ToolMode.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnToolMode; @ToolMode.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnToolMode; @ToolMode.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnToolMode; @@ -2049,9 +2049,9 @@ public void SetCallbacks(IActionmap1Actions instance) @Camerazoom.started += instance.OnCamerazoom; @Camerazoom.performed += instance.OnCamerazoom; @Camerazoom.canceled += instance.OnCamerazoom; - @Cancel_or_PauseMenue.started += instance.OnCancel_or_PauseMenue; - @Cancel_or_PauseMenue.performed += instance.OnCancel_or_PauseMenue; - @Cancel_or_PauseMenue.canceled += instance.OnCancel_or_PauseMenue; + @Cancel_or_PauseMenu.started += instance.OnCancel_or_PauseMenu; + @Cancel_or_PauseMenu.performed += instance.OnCancel_or_PauseMenu; + @Cancel_or_PauseMenu.canceled += instance.OnCancel_or_PauseMenu; @ToolMode.started += instance.OnToolMode; @ToolMode.performed += instance.OnToolMode; @ToolMode.canceled += instance.OnToolMode; @@ -2422,7 +2422,7 @@ public interface IActionmap1Actions void OnLookCamera(InputAction.CallbackContext context); void OnFire1_or_Interacting(InputAction.CallbackContext context); void OnCamerazoom(InputAction.CallbackContext context); - void OnCancel_or_PauseMenue(InputAction.CallbackContext context); + void OnCancel_or_PauseMenu(InputAction.CallbackContext context); void OnToolMode(InputAction.CallbackContext context); void OnMathMode(InputAction.CallbackContext context); void OnTalking(InputAction.CallbackContext context); diff --git a/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions b/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions index 9fc419eec5bde551450cd00142a271e000ca598b..37fbc3759d3fd9b22f665a9c77cb63e5f1416127 100644 --- a/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions +++ b/Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions @@ -42,7 +42,7 @@ "initialStateCheck": false }, { - "name": "Cancel_or_PauseMenue", + "name": "Cancel_or_PauseMenu", "type": "PassThrough", "id": "d5aafbfd-31bc-402e-89dc-c21c91212bbc", "expectedControlType": "Button", @@ -312,7 +312,7 @@ "interactions": "", "processors": "", "groups": "KeyboardMouse;Keyboard;Gamepad;test;Android", - "action": "Cancel_or_PauseMenue", + "action": "Cancel_or_PauseMenu", "isComposite": false, "isPartOfComposite": false }, diff --git a/Assets/Scripts/UI/SetButtonColours_default.cs b/Assets/Scripts/UI/SetButtonColours_default.cs index ff5d13674d62f20720b2f9e610f826724bd7f835..0b01d0ea3df759db0c062929ead5492d0a16da4e 100644 --- a/Assets/Scripts/UI/SetButtonColours_default.cs +++ b/Assets/Scripts/UI/SetButtonColours_default.cs @@ -8,7 +8,7 @@ public class SetButtonColours_default : MonoBehaviour void Start() { - RecursivelySetAllButtonsOfMenueToDefaultColors(gameObject); + RecursivelySetAllButtonsOfMenuToDefaultColors(gameObject); } @@ -16,7 +16,7 @@ void Start() /// Recursively go through all button components of GameObjects including and below @gameObject. /// Set their colors to the default values, defined in UIconfig. /// </summary> - public static void RecursivelySetAllButtonsOfMenueToDefaultColors(GameObject gameObject) + public static void RecursivelySetAllButtonsOfMenuToDefaultColors(GameObject gameObject) { // first check, wether the object has a button component Button button = gameObject.GetComponent<Button>(); @@ -33,7 +33,7 @@ public static void RecursivelySetAllButtonsOfMenueToDefaultColors(GameObject gam // now recursively call for all children for (int i = 0; i < gameObject.transform.childCount; i++) { - RecursivelySetAllButtonsOfMenueToDefaultColors(gameObject.transform.GetChild(i).gameObject); + RecursivelySetAllButtonsOfMenuToDefaultColors(gameObject.transform.GetChild(i).gameObject); } } diff --git a/Assets/Scripts/UI/UIconfig.cs b/Assets/Scripts/UI/UIconfig.cs index dffba5bc337072077b6190157aa13e848f93bba2..2f056db8edbc86332371a62a56b1874f2dacda3b 100644 --- a/Assets/Scripts/UI/UIconfig.cs +++ b/Assets/Scripts/UI/UIconfig.cs @@ -53,8 +53,8 @@ public enum InteractingRangeMode public static float scaleMatch = -1; - public static int Andr_Start_menue_counter = 1; - //public static int Andr_Start_menue_counter = 1; + public static int Andr_Start_menu_counter = 1; + //public static int Andr_Start_menu_counter = 1; public static ControlMode controlMode = ControlMode.Keyboard; //1=keyboard 2=mobile public enum ControlMode @@ -163,8 +163,8 @@ public class NetworkJSONonlyString public static string InputManager_KeyBinding_Vertical_02 = "s"; public static string InputManager_KeyBinding_Vertical_2 = "w"; public static string InputManager_KeyBinding_Running_1 = "left shift"; - public static string InputManager_KeyBinding_ToolmMenue_1 = "e"; - public static string InputManager_KeyBinding_MathMenue_1 = "tab"; + public static string InputManager_KeyBinding_ToolmMenu_1 = "e"; + public static string InputManager_KeyBinding_MathMenu_1 = "tab"; public static string InputManager_KeyBinding_Jump_1 = "space"; public static string InputManager_KeyBinding_Cancel_1 = "escape"; public static string InputManager_KeyBinding_modifier = "m"; @@ -182,7 +182,7 @@ public class NetworkJSONonlyString // 11=TouchUI_onoff // TODO: setter/getter event? public static int[] CanvasOnOff_Array = new int[30]; //1= ON 0=off, 2=on_withoutStartdefault , 3=off_withoutStartdefault - //Which UI to activate after "ContinueGame" from "PauseMenue" + //Which UI to activate after "ContinueGame" from "PauseMenu" public static int[] CanvasOn_afterPM = new int[10] { 10, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; public static Boolean GamePaused = false; diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 71bac729c4a37477f969408c315f3b0d17796f43..95d9a8bb3cde90e749b0f1c0b6f1930f308e2bc4 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,16 +6,16 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 0 - path: Assets/Scenes/Menues/StartScreen.unity + path: Assets/Scenes/Menus/StartScreen.unity guid: 80736d45fa76e1b488eab0eb8650ff3d - enabled: 1 - path: Assets/Scenes/Menues/LaunchMenue.unity + path: Assets/Scenes/Menus/LaunchMenu.unity guid: f3d77579acbf6da4b8ab388fa56309ad - enabled: 1 - path: Assets/Scenes/Menues/MainMenue.unity + path: Assets/Scenes/Menus/MainMenu.unity guid: 4aac33ac7893f094695103325725f1ef - enabled: 1 - path: Assets/Scenes/Menues/LoadingScene.unity + path: Assets/Scenes/Menus/LoadingScene.unity guid: 103e8987ec80e544eb5d6dd1daa6a6c0 - enabled: 1 path: Assets/Scenes/Worlds/RiverWorld.unity