Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -37,7 +37,7 @@ namespace GFGGame
             spr1.sprite = sp1;
             //角色
             CustomSuitData suitSavedData = CustomSuitDataManager.GetCurrentSuitList();
-            MyDressUpHelper.dressUpObj.setSceneObj(sceneObj, false, true, null, false);
+            MyDressUpHelper.dressUpObj.setSceneObj(sceneObj.transform.Find("Scene").gameObject, false, true, null, false);
             MyDressUpHelper.dressUpObj.PutOnDressUpData(suitSavedData.dressUpData);
         }
 

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -256,19 +256,19 @@ namespace GFGGame
 
         private void SetPos()
         {
-            GameObject role = _sceneObject.transform.Find("Role").gameObject;
+            GameObject Scene = _sceneObject.transform.Find("Scene").gameObject;
             GameObject Bg = _sceneObject.transform.Find("Bg").gameObject;
             GameObject Bg1 = _sceneObject.transform.Find("Bg1").gameObject;
             if (MainDataManager.Instance.ViewType == 0)
             {
-                role.SetActive(true);
+                Scene.SetActive(true);
                 Bg.SetActive(true);
                 Bg1.SetActive(false);
                 _ui.m_t3.Play(); ;
             }
             else if (MainDataManager.Instance.ViewType == 1)
             {
-                role.SetActive(false);
+                Scene.SetActive(false);
                 Bg.SetActive(false);
                 Bg1.SetActive(true);
                 _ui.m_t4.Play();
@@ -304,7 +304,7 @@ namespace GFGGame
         }
         private void ChangeSceneBg(object param)
         {
-            _sceneObject.transform.Find("Role").gameObject.SetActive(false);
+            _sceneObject.transform.Find("Scene").gameObject.SetActive(false);
             _sceneObject.transform.Find("Bg").gameObject.SetActive(false);
             _sceneObject.transform.Find("Bg1").gameObject.SetActive(true);
         }
@@ -321,7 +321,7 @@ namespace GFGGame
         }
         private void ChangeSceneBg1(object param)
         {
-            _sceneObject.transform.Find("Role").gameObject.SetActive(true);
+            _sceneObject.transform.Find("Scene").gameObject.SetActive(true);
             _sceneObject.transform.Find("Bg").gameObject.SetActive(true);
             _sceneObject.transform.Find("Bg1").gameObject.SetActive(false);
         }

GameClient/Assets/ResIn/Prefab/SceneMain.prefab

@@ -164,6 +164,37 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &8405276316792503526
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2103957189071858077}
+  m_Layer: 0
+  m_Name: Scene
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2103957189071858077
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8405276316792503526}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3768987550495608174}
+  m_Father: {fileID: 8934048990737965464}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8934048990737965465
 GameObject:
   m_ObjectHideFlags: 0
@@ -193,7 +224,7 @@ Transform:
   m_Children:
   - {fileID: 2432797848204161373}
   - {fileID: 2397053893390390833}
-  - {fileID: 3768987550495608174}
+  - {fileID: 2103957189071858077}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -202,11 +233,11 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 8934048990737965464}
+    m_TransformParent: {fileID: 2103957189071858077}
     m_Modifications:
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
       propertyPath: m_LocalPosition.x