tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/dialogUI

Browse Source
This commit is contained in:
dingyuntian
2025-05-21 17:49:50 +08:00
parent aec424fcd5 386bb2f2f1
commit cae274f271
11 changed files with 1151 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Font/Assets/ChillBitmap_16px SDF.asset
LFS
BIN
View File
Binary file not shown.
Assets/Font/Assets/ChillBitmap_16px SDF.asset.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6ec37e37f7805e84bab296df89e6cf74
guid: c7fc4cbba4b38a04c8985d4dbce12a73
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
Assets/Resources/Prefabs/UI/Bubble/Aside Text.prefab
+2 -2
View File
@@ -244,8 +244,8 @@ MonoBehaviour:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_sharedMaterial: {fileID: -4590932807722055427, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble/Box.prefab
+2 -2
View File
@@ -499,7 +499,7 @@ MonoBehaviour:
m_Calls: []
m_text: "\u6211\u4EEC\u90FD\u662F\u6309\u7167\u6307\u4EE4\u5DE5\u4F5C\u7684\u673A\u4F53~\u4F46\u533B\u751F\uFF01\u4F60\u7684\u8FD9\u6B21\u5DE5\u4F5C~<br>\u5DF2\u7ECF\u53D8\u6210\u6211\u6C38\u8FDC\u7684\u56DE\u5FC6\u5566\uFF01"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: 5406778561550118075, guid: 6ec37e37f7805e84bab296df89e6cf74, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
@@ -709,7 +709,7 @@ MonoBehaviour:
m_Calls: []
m_text: "\u82F1\u7406"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: 5406778561550118075, guid: 6ec37e37f7805e84bab296df89e6cf74, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
Assets/Resources/Prefabs/UI/Bubble/Bubble Left Bottom.prefab
+2 -2
View File
@@ -244,8 +244,8 @@ MonoBehaviour:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_sharedMaterial: {fileID: -4590932807722055427, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble/Bubble Left.prefab
+2 -2
View File
@@ -244,8 +244,8 @@ MonoBehaviour:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_sharedMaterial: {fileID: -4590932807722055427, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble/Bubble Right Bottom.prefab
+2 -2
View File
@@ -69,8 +69,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_sharedMaterial: {fileID: -4590932807722055427, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble/Bubble Right.prefab
+2 -2
View File
@@ -69,8 +69,8 @@ MonoBehaviour:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_sharedMaterial: {fileID: -4590932807722055427, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble/Center Choice Button.prefab
+2 -2
View File
@@ -188,8 +188,8 @@ MonoBehaviour:
m_Calls: []
m_text: Button
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_sharedMaterial: {fileID: -4590932807722055427, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Resources/Prefabs/UI/Bubble/Choice Button.prefab
+2 -2
View File
@@ -234,8 +234,8 @@ MonoBehaviour:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_sharedMaterial: {fileID: -4590932807722055427, guid: 35e5d070d35ad1a45b327e25932d103c, type: 2}
m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
Assets/Scenes/Persistence.unity
+1133 -344
View File
File diff suppressed because it is too large Load Diff