Merge branch 'develop' into feature/海浪

2025-06-10 22:20:49 +08:00
parent 83d606cf1f 47ca2dcebb
commit d00c668681
20 changed files with 3140 additions and 3772 deletions
@@ -0,0 +1,21 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 758f8de9462d3a54295cb2c1fc8ed407, type: 3}
+  m_Name: Dream Style
+  m_EditorClassIdentifier: 
+  bubblePadding: {x: 20, y: 30, z: 20, w: 20}
+  linePadding: {x: 30, y: 10, z: 20, w: 10}
+  lineFontSize: 40
+  actorPadding: {x: 0, y: 0, z: 0, w: 0}
+  actorFontSize: 42
+  hasActorName: 0
+  bubbleSpriteAddress: "BubbleSprite/\u7EAF\u9ED1\u6846"
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5e5761693b62ef4891f7f08ec8bcbd8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: