123
123
12
Merge branch 'Zc-Z' into Master_2

Conflicts:
	Gemini/Assets/Script/GameStart.cs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/EditorUserBuildSettings.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
	Gemini/ProjectSettings/EditorBuildSettings.asset
12
before thursday test
Merge branch 'Master_2' into Atlas_3
thunder
bugfixed
dark cloud auto-clear after level clean
Merge branch 'Atlas_3'

This reverts commit faeb4c8d6e7cda63c51e699b9e4bb73e1b7f1ef5, reversing
changes made to 5be30ae23a3acadb983e4c2da84db13a30c800e1.

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_ForJenova.unity
	Gemini/Assets/Script/UI/MinimalismControl.cs