剧情对话支持茶话会类型

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

@@ -438,8 +438,9 @@ namespace GFGGame
         public void PutOnDefaultDressUpData(bool bgType = false)
         {
             var dressUpData = DressUpData.CreateDefault();
-            if (bgType)
+            if (bgType) {
                 dressUpData.bgId = 180002;
+            }
             PutOnDressUpData(dressUpData);
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryDialogUI.cs

@@ -20,6 +20,7 @@ namespace UI.Main
         public GButton m_btnSpeedUp;
         public GButton m_btnSkip;
         public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kxuzk2i";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryDialogUI";
@@ -80,6 +81,7 @@ namespace UI.Main
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnSkip = (GButton)comp.GetChild("btnSkip");
             m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -99,6 +101,7 @@ namespace UI.Main
             m_btnSpeedUp = null;
             m_btnSkip = null;
             m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -41,12 +41,9 @@ namespace GFGGame
 
         TypingFadeEffect _typingEffect;
 
-
         //屏幕效果中
         private Action<object> _onScreenEffectComplete;
 
-
-
         public override void Dispose()
         {
             base.Dispose();
@@ -82,6 +79,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneStoryDialog"));
+
         }
 
         protected override void OnInit()
@@ -128,7 +126,7 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
-            if ((bool)datas[4])
+            if ((bool)datas[4]) 
                 IsTeaParty = true;
 
             if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
@@ -155,6 +153,10 @@ namespace GFGGame
                 _speedAutoPlay = 1;
                 FightDataManager.Instance.dialogSpeed = _speedAutoPlay;
             }
+
+            if(IsTeaParty)
+                _ui.m_c1.selectedIndex = 2;
+
             _ui.m_btnBack.visible = InstanceZonesDataManager.CheckLevelPass(100001001);
             
         }
@@ -499,8 +501,10 @@ namespace GFGGame
                 if (!lastTextFieldType.Equals("name"))
                 {
                     lastTextFieldType = "name";
-                    _ui.m_t0.Play();
-
+                    if(IsTeaParty)
+                        _ui.m_t1.Play();
+                    else
+                        _ui.m_t0.Play();
                 }
             }
             else
@@ -518,7 +522,6 @@ namespace GFGGame
             ShowNextDialog();
         }
 
-
         private void ShowNextDialog()
         {
             if (_wordList != null && _wordList.Length > _wordIndex)
@@ -612,7 +615,6 @@ namespace GFGGame
             _typingEffect.Cancel();
         }
 
-
         private void UpdateBg(string value)
         {
             if (value.Length > 0)
@@ -635,14 +637,8 @@ namespace GFGGame
 
         private void UpdateRoleObj()
         {
-            var _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpFight"));
-            var _sceneObject = GameObject.Instantiate(_scenePrefab);
-            if (_sceneObject == null)
-            {
-                _sceneObject = GameObject.Instantiate(_scenePrefab);
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
-                //MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData();
-            }
+            MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
+            //MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData(IsTeaParty);
         }
 
         private void UpdateMusic(string value)
@@ -750,9 +746,6 @@ namespace GFGGame
             _autoPlay = false;
             _ui.m_btnAutoPlay.selected = false;
             Timers.inst.Remove(ShowNextWords);
-
         }
-
-
     }
 }

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: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &893629500977733783
 SpriteRenderer:
@@ -193,6 +193,7 @@ Transform:
   m_Children:
   - {fileID: 8934048990313003902}
   - {fileID: 617406097305830421}
+  - {fileID: 6712570806157986695}
   - {fileID: 838069369391452446}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -279,3 +280,77 @@ SpriteRenderer:
   m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1001 &3047808934040316681
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8934048990737965464}
+    m_Modifications:
+    - target: {fileID: 6890174107261882195, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: faxing
+      objectReference: {fileID: 0}
+    - target: {fileID: 8075054435002964044, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: lianyiqun
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_Name
+      value: Role
+      objectReference: {fileID: 0}
+    - target: {fileID: 8605298645749227663, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+--- !u!4 &6712570806157986695 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8605298645749227662, guid: 8c54818580e6de44cbe90f73003c8b25, type: 3}
+  m_PrefabInstance: {fileID: 3047808934040316681}
+  m_PrefabAsset: {fileID: 0}