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

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

@@ -43,18 +43,59 @@ namespace GFGGame
 
         public static void UpdateDialogBg(string value, GameObject sceneObj)
         {
-            Transform tf = sceneObj.transform.Find("Bg");
-            SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+            Transform bg = sceneObj.transform.Find("Bg");
+            Transform bgNext = sceneObj.transform.Find("BgNext");
+            SpriteRenderer bgSpr = bg.GetComponent<SpriteRenderer>();
+            SpriteRenderer bgNextSpr = bgNext.GetComponent<SpriteRenderer>();
+
             if (value == "0")
             {
-                spr.sprite = null;
+                bgSpr.sprite = null;
             }
             else
             {
                 var resPath = ResPathUtil.GetDressUpPath(value, "jpg");
                 Sprite sp = GFGAsset.Load<Sprite>(resPath);
-                DressUpUtil.AddAssetReleaser(tf.gameObject, resPath);
-                spr.sprite = sp;
+                DressUpUtil.AddAssetReleaser(bg.gameObject, resPath);
+
+                if (bgSpr.sprite == null)
+                {
+                    bgSpr.sprite = sp;
+                }
+                else
+                {
+                    SetSpriteRendererAlpha(bgSpr, 1f);
+                    bgNextSpr.sprite = sp;
+                    FairyGUI.Timers.inst.StartCoroutine(LastBgFadeOut());
+                    
+                    IEnumerator LastBgFadeOut()
+                    {
+                        while (true)
+                        {
+                            if (bgSpr != null)
+                            {
+                                if (bgSpr.enabled && bgSpr.color.a > 0f)
+                                {
+                                    SetSpriteRendererAlpha(bgSpr, bgSpr.color.a - 0.033f);
+                                }
+                                else
+                                {
+                                    bgSpr.sprite = sp;
+                                    SetSpriteRendererAlpha(bgSpr, 1f);
+                                    bgNextSpr.sprite = null;
+                                    break;
+                                }
+                            }
+                            else
+                            {
+                                break;
+                            }
+                            yield return new WaitForEndOfFrame();
+                        }
+                    }
+                }
+
+
             }
         }
 
@@ -74,11 +115,9 @@ namespace GFGGame
                     {
                         if (spr != null)
                         {
-                            Color c = spr.color;
-                            if (spr.enabled && c.a < 1f)
+                            if (spr.enabled && spr.color.a < 1f)
                             {
-                                c.a += 0.055f;
-                                spr.color = c;
+                                SetSpriteRendererAlpha(spr, spr.color.a + 0.055f);
                             }
                             else
                             {
@@ -91,22 +130,23 @@ namespace GFGGame
                         }
                         yield return new WaitForEndOfFrame();
                     }
-                    
                 }
 
                 var resPath = ResPathUtil.GetNpcPicSPath(value);
                 Sprite sp = GFGAsset.Load<Sprite>(resPath);
                 DressUpUtil.AddAssetReleaser(tf.gameObject, resPath);
                 spr.sprite = sp;
-                Color c = spr.color;
-                c.a = 0f;
-                spr.color = c;
+                SetSpriteRendererAlpha(spr, 0f);
                 FairyGUI.Timers.inst.StartCoroutine(UpdateDialogPicAlpha());
-                //FairyGUI.Timers.inst.AddUpdate(UpdateDialogPicAlpha);
             }
         }
 
-
+        public static void SetSpriteRendererAlpha(SpriteRenderer spr, float a)
+        {
+            Color c = spr.color;
+            c.a = a;
+            spr.color = c;
+        }
 
         public static void UpdateFightTarget(string value, GameObject sceneObj)
         {

GameClient/Assets/Game/HotUpdate/Views/CreateRole/CreateRoleView.cs

@@ -104,7 +104,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            RandomRoleName().Coroutine();
+            _ui.m_envelopeModel.m_inputName.text = "";
             LogServerHelper.SendNodeLog((int)LogNode.ShowCreateRole);
 
             ChangeAnimationState(State.IN);

GameClient/Assets/ResIn/Prefab/SceneStoryDialog.prefab

@@ -29,7 +29,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8934048990737965464}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &893629500977733783
 SpriteRenderer:
@@ -192,7 +192,90 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 8934048990313003902}
+  - {fileID: 617406097305830421}
   - {fileID: 838069369391452446}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &9040093789670821962
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 617406097305830421}
+  - component: {fileID: 6005408906933267637}
+  m_Layer: 0
+  m_Name: BgNext
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &617406097305830421
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9040093789670821962}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8934048990737965464}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &6005408906933267637
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9040093789670821962}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -1000
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 10.8046875, y: 24}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0