Merge branch 'develop' into 优化6.10.21

Assets/Resources/Prefabs/Basic Function/Clinic System.prefab

@@ -50,7 +50,7 @@ MonoBehaviour:
     idx: 0
     maxWidth: 800
     minWidth: 300
-    bubbleStyle: {fileID: 11400000, guid: d5f9b20222601bb448b699d56806e310, type: 2}
+    bubbleStyle: {fileID: 11400000, guid: e3f425b45fd35cc4caf1939eaea2f7bc, type: 2}
     pivotType: 0
 --- !u!1 &370965206930387002
 GameObject:
@@ -512,13 +512,13 @@ MonoBehaviour:
   spritePartAssets:
   - time: 1
     weather: 0
-    sprite: {fileID: 5712437488912585778, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
+    sprite: {fileID: 2539331036435114140, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
   - time: 2
     weather: 0
-    sprite: {fileID: 4938109799727607429, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
+    sprite: {fileID: 4326782275659865998, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
   - time: 0
     weather: 0
-    sprite: {fileID: 9002312518455049841, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
+    sprite: {fileID: -8709910151141876178, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
 --- !u!1 &2615926060114227568
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/SubWay.unity

@@ -494,7 +494,7 @@ MonoBehaviour:
   mobileObjectDatas:
   - itemName: "\u5E7F\u544A\u724C"
     direction: {x: -1, y: 0}
-    speed: {x: 60, y: 60}
+    speed: {x: 40, y: 40}
     mobileType: 1
     assetAddressArray:
     - "Subway/\u767D\u5929\u7A97\u5916[\u5E7F\u544A\u724C]"
@@ -512,7 +512,7 @@ MonoBehaviour:
   isDistanceMode: 1
   existTime: 0
   existDistance: 50
-  intervalRange: {x: 79, y: 81}
+  intervalRange: {x: 5, y: 10}
 --- !u!114 &380972590
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1219,7 +1219,7 @@ MonoBehaviour:
   isDistanceMode: 1
   existTime: 0
   existDistance: 50
-  intervalRange: {x: 3, y: 10}
+  intervalRange: {x: 1, y: 4}
 --- !u!114 &1254024541
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/ScriptableObjects/BubbleStyle/Mini Left Style.asset

@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
   m_Name: Mini Left Style
   m_EditorClassIdentifier: 
-  bubblePadding: {x: 20, y: 5, z: 15, w: 20}
+  bubblePadding: {x: 30, y: 5, z: 15, w: 20}
   linePadding: {x: 10, y: 5, z: 10, w: 0}
-  lineFontSize: 18
+  lineFontSize: 24
   actorPadding: {x: 0, y: 0, z: 0, w: 0}
-  actorFontSize: 20
+  actorFontSize: 26
   hasActorName: 1
-  bubbleSpriteAddress: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846 "
+  bubbleSpriteAddress: "BubbleSprite/\u5916\u51FA\u5BF9\u8BDD\u6846"

Assets/Scripts/FixSystem/Memory/MemoryProcess.cs

@@ -9,10 +9,7 @@ using AibisDream.FixSystem;
 using AibisDream.Framework;
 using Cinemachine;
 using UnityEngine.Rendering;
-
-using System;
 using AibisDream.Kit;
-using FMODUnity;
 
 public class MemoryProcess : MonoBehaviour
 {

Assets/Scripts/Framework/Config/Character.cs

@@ -1,5 +1,5 @@
 using AibisDream.Framework;
-using UnityEngine.Localization.Settings;
+using UnityEngine;
 
 namespace AibisDream.Kit
 {
@@ -29,6 +29,7 @@ namespace AibisDream.Kit
             vo.bubbleIdx = BubbleIdx;
             vo.role = Role;
             vo.dialogViewType = DialogViewType;
+            
             return vo;
         }
     }

Assets/Scripts/Framework/Config/ConfigUtil.cs

@@ -4,6 +4,9 @@ using System.IO;
 using System.Linq;
 using AibisDream.Framework;
 using AibisDream.Utility;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 using UnityEngine;
 
 namespace AibisDream.Kit
@@ -21,8 +24,18 @@ namespace AibisDream.Kit
         /// </summary>
         private ConfigUtil()
         {
+#if UNITY_EDITOR
+            EditorApplication.playModeStateChanged  += OnPlayModeStateChanged;
+#endif
         }
-
+        
+#if UNITY_EDITOR
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            OnSingletonInit();
+        }
+#endif
+        
         /// <summary>
         /// 调用时初始化
         /// </summary>

Assets/Scripts/Framework/OtherKit/CameraKit.cs

@@ -232,8 +232,7 @@ namespace AibisDream.Framework
         public static Vector3 GetMouseWorldPos(Vector3 mousePoint)
         {
             if (!_mainCam) _mainCam = Camera.main;
-
-            mousePoint.z = 0;
+            
             return _mainCam.ScreenToWorldPoint(mousePoint);
         }
 

Assets/Scripts/UI/DialogUI/Bubbles/Bubble.cs

@@ -30,14 +30,14 @@ namespace AibisDream
 
         #endregion
 
-        public event Action<Bubble> OnDisposed; 
+        public event Action<Bubble> OnDisposed;
 
         public bool IsShowingText => _typewriter.isShowingText;
 
         public void LoadConfig(BubbleSlotData data)
         {
             InitRefs();
-            
+
             role = data.actorRole;
             idx = data.idx;
             maxWidth = data.maxWidth;
@@ -57,7 +57,7 @@ namespace AibisDream
             _actorName.fontSize = bubbleStyle.actorFontSize;
             // 是否展示名称
             _actorName.gameObject.SetActive(bubbleStyle.hasActorName);
-            
+
             // 锚点相关
             _rect.pivot = CommonUtil.GetPivotByType(pivotType);
             var spritePath = $"{bubbleStyle.bubbleSpriteAddress}[{pivotType.ToString()}]";
@@ -68,6 +68,7 @@ namespace AibisDream
         {
             _typewriter = GetComponentInChildren<TypewriterCore>();
             _actorName = transform.Find("名称").GetComponent<TMP_Text>();
+            _typewriter.onTextShowed.RemoveAllListeners();
             _typewriter.onTextShowed.AddListener(() => EnumEventSystem.Global.Send(DialogEventEnum.LineShown));
             // 获取内容文字
             _lineText = _typewriter.GetComponent<TMP_Text>();
@@ -128,13 +129,12 @@ namespace AibisDream
             }
 
             _layoutElement.minWidth = minWidth;
-            
+
             LayoutRebuilder.ForceRebuildLayoutImmediate(_rect);
         }
 
 #if UNITY_EDITOR
-        [Header("测试参数")]
-        public int testMinWidth;
+        [Header("测试参数")] public int testMinWidth;
         public int testMaxWidth;
         public BubbleStyle testBubbleStyle;
         public PivotType testPivotType;
@@ -150,7 +150,7 @@ namespace AibisDream
         public void SaveStyle()
         {
             if (!testBubbleStyle) return;
-            
+
             InitRefs();
 
             testBubbleStyle.linePadding = _lineText.margin;
@@ -159,7 +159,7 @@ namespace AibisDream
             testBubbleStyle.actorFontSize = _actorName.fontSize;
 
             testBubbleStyle.BubblePadding = _layoutGroup.padding;
-            
+
             testBubbleStyle.hasActorName = _actorName.gameObject.activeSelf;
         }
 #endif

Assets/Scripts/UI/Panel/DialogPanel.cs

@@ -0,0 +1,24 @@
+using UnityEngine;
+
+namespace AibisDream
+{
+    public class DialogPanel : MonoBehaviour, IUIPanel
+    {
+        #region UI面板功能
+
+        public bool IsOpen => gameObject.activeSelf;
+        public bool IsCloseable => false;
+        
+        public void Show()
+        {
+            gameObject.SetActive(true);
+        }
+
+        public void Hide()
+        {
+            gameObject.SetActive(false);
+        }
+
+        #endregion
+    }
+}

Assets/Scripts/UI/Panel/DialogPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2ecd4df87fde33d4a8944917a863a6af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Config/character.csv

@@ -1,38 +1,38 @@
-通过key索引配置,中文名,,"显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框",人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径
-Key,Cn,,DialogViewType,Role,NameColor,HeadPicPath,VoicePath
-peipei,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP
-pp,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP
-me,我,Me,Default,Player,,me_head,VO/voice_ME
-jj,姐姐,Sister,Default,Player,,me_head,VO/voice_JJ
-jj?,柔和女声,???,Default,Player,,me_head,VO/voice_JJ
-hs,火山,Huoshan,Default,MainActor,#FFA800,peipei_head,VO/voice_HS
-hs?,沙哑男声,???,Default,MainActor,#FFA800,peipei_head,VO/voice_HS
-yl,英理,Yingli,Default,MainActor,#4000FF,peipei_head,VO/voice_YL
-peipei_novoice,胆怯女声,Timid female voice,Default,Aside,#00FFFF,,VO/voice_PP
-yingli_novoice,严厉女声,Stern female voice,Default,Aside,#FFCC00,,
-tutorial,教学,Teaching,Default,Aside,,,
-docter,儿科医生,Pediatrician,Default,Aside,#FFCC00,,
-peipei_child,童年佩佩,Childhood Peipei,Default,Aside,#00FFFF,,VO/voice_PP
-unknown,？？？,???,Default,Aside,#FFCC00,,
-shitou,石头,Stone,Default,MainActor,,,VO/voice_shitou
-Descent,Descent,Descent,Default,Aside,#FFCC00,,VO/voice_me
-e-assistant,电子助手,Electronic assistant,Default,Aside,#FFCC00,,VO/voice_me
-Gotashi_unknow,戴纯金雕塑头的男人,Man with a pure gold sculpture head,Default,Aside,#FFCC00,,
-Linking,连接中……,Connecting...,Screen,Aside,#E6A23C,,
-Analysing,分析中,Analyzing...,Screen,Aside,#E6A23C,,
-Error,错误警告,Error warning,Screen,Aside,#E6A23C,,
-UfModule,UnstableFusion<br>图像生成模块,UnstableFusion image generation module,Screen,Aside,#F56C6C,,
-EyeModule,HS9型<br>视觉模块,HS9 type visual module,Screen,Aside,#F56C6C,,
-EmoModule,通用型<br>情绪发生模块,Universal emotion generation module,Screen,Aside,#F56C6C,,
-MemModule,通用型<br>记忆模块,Universal memory module,Screen,Aside,#F56C6C,,
-LogicModule,MK1型<br>逻辑处理模块,MK1 type logic processing module,Screen,Aside,#F56C6C,,
-SpeakerModule,MK1型<br>表达模块,MK1 type expression module,Screen,Aside,#F56C6C,,
-ChipModule,4R7型<br>色觉晶圆训练槽,4R7 type color perception wafer training slot,Screen,Aside,#F56C6C,,
-HeartModule,C03UR型特配<br>涡轮增压动力模块,C03UR special turbocharged power module,Screen,Aside,#E6A23C,,
-LungModule,MK1型<br>气体处理模块,MK1 type gas processing module,Screen,Aside,#E6A23C,,
-LiverModule,MK1型<br>冷却液循环模块,MK1 type coolant circulation module,Screen,Aside,#E6A23C,,
-DigestModule,MK1型<br>物料处理模块,MK1 type material processing module,Screen,Aside,#E6A23C,,
-CenterText,,,CenterText,Aside,,,
-CenterOption,,,CenterOption,Aside,,,
-Task,,,Task,Aside,,,
-TempText,,,Default,Aside,,,
+通过key索引配置,中文名,,"显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框",人物角色（Player/MainActor/Aside）,名称显示时的颜色,头像Pic路径,语音资源路径,气泡序号（默认0）
+Key,Cn,,DialogViewType,Role,NameColor,HeadPicPath,VoicePath,BubbleIdx
+peipei,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP,
+pp,佩佩,Peipei,Default,MainActor,#00FFFF,peipei_head,VO/voice_PP,
+me,我,Me,Default,Player,,me_head,VO/voice_ME,
+jj,姐姐,Sister,Default,Player,,me_head,VO/voice_JJ,
+jj?,柔和女声,???,Default,Player,,me_head,VO/voice_JJ,
+hs,火山,Huoshan,Default,MainActor,#FFA800,peipei_head,VO/voice_HS,
+hs?,沙哑男声,???,Default,MainActor,#FFA800,peipei_head,VO/voice_HS,
+yl,英理,Yingli,Default,MainActor,#4000FF,peipei_head,VO/voice_YL,
+peipei_novoice,胆怯女声,Timid female voice,Default,Aside,#00FFFF,,VO/voice_PP,1
+yingli_novoice,严厉女声,Stern female voice,Default,Aside,#FFCC00,,,
+tutorial,教学,Teaching,Default,Aside,,,,
+docter,儿科医生,Pediatrician,Default,Aside,#FFCC00,,,
+peipei_child,童年佩佩,Childhood Peipei,Default,Aside,#00FFFF,,VO/voice_PP,
+unknown,？？？,???,Default,Aside,#FFCC00,,,
+shitou,石头,Stone,Default,MainActor,,,VO/voice_shitou,
+Descent,Descent,Descent,Default,Aside,#FFCC00,,VO/voice_me,
+e-assistant,电子助手,Electronic assistant,Default,Aside,#FFCC00,,VO/voice_me,
+Gotashi_unknow,戴纯金雕塑头的男人,Man with a pure gold sculpture head,Default,Aside,#FFCC00,,,
+Linking,连接中……,Connecting...,Screen,Aside,#E6A23C,,,
+Analysing,分析中,Analyzing...,Screen,Aside,#E6A23C,,,
+Error,错误警告,Error warning,Screen,Aside,#E6A23C,,,
+UfModule,UnstableFusion<br>图像生成模块,UnstableFusion image generation module,Screen,Aside,#F56C6C,,,
+EyeModule,HS9型<br>视觉模块,HS9 type visual module,Screen,Aside,#F56C6C,,,
+EmoModule,通用型<br>情绪发生模块,Universal emotion generation module,Screen,Aside,#F56C6C,,,
+MemModule,通用型<br>记忆模块,Universal memory module,Screen,Aside,#F56C6C,,,
+LogicModule,MK1型<br>逻辑处理模块,MK1 type logic processing module,Screen,Aside,#F56C6C,,,
+SpeakerModule,MK1型<br>表达模块,MK1 type expression module,Screen,Aside,#F56C6C,,,
+ChipModule,4R7型<br>色觉晶圆训练槽,4R7 type color perception wafer training slot,Screen,Aside,#F56C6C,,,
+HeartModule,C03UR型特配<br>涡轮增压动力模块,C03UR special turbocharged power module,Screen,Aside,#E6A23C,,,
+LungModule,MK1型<br>气体处理模块,MK1 type gas processing module,Screen,Aside,#E6A23C,,,
+LiverModule,MK1型<br>冷却液循环模块,MK1 type coolant circulation module,Screen,Aside,#E6A23C,,,
+DigestModule,MK1型<br>物料处理模块,MK1 type material processing module,Screen,Aside,#E6A23C,,,
+CenterText,,,CenterText,Aside,,,,
+CenterOption,,,CenterOption,Aside,,,,
+Task,,,Task,Aside,,,,
+TempText,,,Default,Aside,,,,