Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master

Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab

@@ -105,8 +105,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: "\u6B63\u5728\u52A0\u8F7D\uFF0C\u8BF7\u7A0D\u540E..."
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
-  m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
+  m_sharedMaterial: {fileID: -2120909647377011300, guid: f23cde0c3d86dad49bedc202ad993d21, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -137,8 +137,8 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0

Assets/Resources/UI/UI_Panel/UI_MainTitlePanel.prefab

@@ -327,9 +327,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -41}
-  m_SizeDelta: {x: 0, y: 80}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3513157747320874931
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Scenes/Common/01_InitScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.20464694, g: 0.26801512, b: 0.30485857, a: 1}
+  m_IndirectSpecularColor: {r: 0.20464736, g: 0.26801568, b: 0.30485883, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -277,7 +277,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   systemId: 10002
-  startSceneName: 03_OfficeScene
+  startSceneName: 03_LiveScene
 --- !u!114 &1686064644
 MonoBehaviour:
   m_ObjectHideFlags: 0

ProjectSettings/EditorBuildSettings.asset

@@ -20,4 +20,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
     guid: fb603ca5b91a6e9469af94de0036a9cf
+  - enabled: 1
+    path: Assets/HQB/Scene/10002_2002_03_LiveScene.unity
+    guid: a33b875cf83b7ac44957fb2a66c9e268
   m_configObjects: {}