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

Merge branch 'feature/海浪' into 'develop'

Browse Source 
复原

See merge request aibis-dream/aibis-dream!421
This commit is contained in:
dingyuntian
2025-06-10 08:03:07 +00:00
parent a344d8c701 040ffdc497
commit c047a6132b
15 changed files with 3298 additions and 1752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Language/Dialog/FP_Day1_begin/FP_Day1_begin Shared Data.asset
+888 -888
View File
File diff suppressed because it is too large Load Diff
Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: fb01be13d6e88ca488dda82150319bfc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 117dcc671050f5247bd8743b91ecaab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/RawResources/Art/主场景.psd
LFS
BIN
View File
Binary file not shown.
Assets/RawResources/Art/主场景.psd.meta
+1564
View File
File diff suppressed because it is too large Load Diff
Assets/Render/Renderer2Dtest.asset
+13 -9
View File
@@ -477,15 +477,19 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
_filter:
- 0.007228916
- 0.043749984
- 0.12409639
- 0.20444278
- 0.24096388
- 0.20444278
- 0.12409639
- 0.043749984
- 0.007228916
- 0.0048309183
- 0.016401261
- 0.04532712
- 0.08293076
- 0.12053438
- 0.14946026
- 0.1610306
- 0.14946026
- 0.12053438
- 0.08293076
- 0.04532712
- 0.016401261
- 0.0048309183
--- !u!114 &-6101378415725230565
MonoBehaviour:
m_ObjectHideFlags: 3
Assets/Resources/Prefabs/Basic Function/Clinic System.prefab
+21 -24
View File
@@ -48,7 +48,6 @@ MonoBehaviour:
slotPosition: {x: 0, y: 0, z: 0}
actorRole: 2
idx: 0
hasActorName: 1
maxWidth: 800
minWidth: 300
bubbleStyle: {fileID: 11400000, guid: d5f9b20222601bb448b699d56806e310, type: 2}
@@ -248,7 +247,6 @@ MonoBehaviour:
slotPosition: {x: 0, y: 0, z: 0}
actorRole: 0
idx: 0
hasActorName: 1
maxWidth: 300
minWidth: 100
bubbleStyle: {fileID: 11400000, guid: 25654f7ad2ed25b4e90b9c93da50b9b9, type: 2}
@@ -381,7 +379,7 @@ SpriteRenderer:
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingOrder: 16
m_Sprite: {fileID: -1786168098620937643, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
m_Sprite: {fileID: -1612899159409639466, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -407,13 +405,13 @@ MonoBehaviour:
spritePartAssets:
- time: 1
weather: 0
sprite: {fileID: 4087609174352685586, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -487663205194836239, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 2
weather: 0
sprite: {fileID: 2995219312665372925, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -8598483147311912478, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 0
weather: 0
sprite: {fileID: -1786168098620937643, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -1612899159409639466, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
--- !u!1 &1855207041374924432
GameObject:
m_ObjectHideFlags: 0
@@ -488,7 +486,7 @@ SpriteRenderer:
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingOrder: 50
m_Sprite: {fileID: 9002312518455049841, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
m_Sprite: {fileID: -8709910151141876178, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -569,7 +567,6 @@ MonoBehaviour:
slotPosition: {x: 0, y: 0, z: 0}
actorRole: 1
idx: 0
hasActorName: 1
maxWidth: 800
minWidth: 300
bubbleStyle: {fileID: 11400000, guid: d5f9b20222601bb448b699d56806e310, type: 2}
@@ -694,7 +691,7 @@ SpriteRenderer:
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingOrder: 200
m_Sprite: {fileID: -1349800619873737171, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
m_Sprite: {fileID: -7694110997164362583, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -779,7 +776,7 @@ SpriteRenderer:
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingOrder: 14
m_Sprite: {fileID: -3564830728221127634, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
m_Sprite: {fileID: 7746705156463960888, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -805,13 +802,13 @@ MonoBehaviour:
spritePartAssets:
- time: 1
weather: 0
sprite: {fileID: -3165927829672387882, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: 5352475011252071616, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 2
weather: 0
sprite: {fileID: 2335886645778264477, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -6621882986076053501, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 0
weather: 0
sprite: {fileID: -3564830728221127634, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: 7746705156463960888, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
--- !u!1 &3439365558513550950
GameObject:
m_ObjectHideFlags: 0
@@ -957,7 +954,6 @@ MonoBehaviour:
slotPosition: {x: 0, y: 0, z: 0}
actorRole: 0
idx: 1
hasActorName: 1
maxWidth: 250
minWidth: 100
bubbleStyle: {fileID: 11400000, guid: 25654f7ad2ed25b4e90b9c93da50b9b9, type: 2}
@@ -1080,7 +1076,7 @@ SpriteRenderer:
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingOrder: 13
m_Sprite: {fileID: 4729439393831370697, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
m_Sprite: {fileID: -1988038007918108968, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -1106,13 +1102,13 @@ MonoBehaviour:
spritePartAssets:
- time: 0
weather: 0
sprite: {fileID: 4729439393831370697, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -1988038007918108968, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 1
weather: 0
sprite: {fileID: -8568868115635754723, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -6085909620650822153, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 2
weather: 0
sprite: {fileID: -8937354923878351069, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -8619082023303832335, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
--- !u!1 &5321307203511402235
GameObject:
m_ObjectHideFlags: 0
@@ -1274,7 +1270,7 @@ SpriteRenderer:
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingOrder: 15
m_Sprite: {fileID: 4424489868683592391, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
m_Sprite: {fileID: 2666721193800013233, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -1300,13 +1296,13 @@ MonoBehaviour:
spritePartAssets:
- time: 1
weather: 0
sprite: {fileID: 6825254253743624110, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: 3253469916238562134, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 2
weather: 0
sprite: {fileID: -4461566618245044025, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: -2737568857656138090, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
- time: 0
weather: 0
sprite: {fileID: 4424489868683592391, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
sprite: {fileID: 2666721193800013233, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
--- !u!1 &5758239449941812692
GameObject:
m_ObjectHideFlags: 0
@@ -1503,6 +1499,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7ce5564f908241b58f1376a5a6eae55e, type: 3}
m_Name:
m_EditorClassIdentifier:
initOnAwake: 1
defaultTime: 0
defaultWeather: 0
--- !u!1 &7640562354936030701
@@ -1792,12 +1789,12 @@ SpriteRenderer:
m_SortingLayerID: 941243827
m_SortingLayer: 13
m_SortingOrder: 52
m_Sprite: {fileID: 8957760651566985215, guid: 1b479ae7145c9aa44ba8a3c5ec44b072, type: 3}
m_Sprite: {fileID: -7887151042877035774, guid: ccf21927b7ddd1648b8133d790ef636e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.4883721, y: 1.4883721}
m_Size: {x: 14.883721, y: 14.883721}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarnproject → Assets/Resources/Yarn/FP_Day1_begin/FP_Day1_begin.yarnproject
+1 -1
View File
@@ -13,4 +13,4 @@
},
"baseLanguage": "zh-Hans",
"compilerOptions": {}
}
}
Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarnproject.meta → Assets/Resources/Yarn/FP_Day1_begin/FP_Day1_begin.yarnproject.meta
View File
Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta → Assets/Resources/Yarn/Fiction_Prologue_begin.meta
+2 -1
View File
@@ -1,5 +1,6 @@
fileFormatVersion: 2
guid: 560a88da2bbc70140bed167f0ba7fe37
guid: d1126f3bdfa5ce24eaa11d38f246ac9b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
Assets/Resources/Yarn/Fiction_Prologue_begin/Fiction_Prologue_begin.yarn.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c6c76451286ec4f46ba09dfe6a4ca82f
guid: f755e9986d84f924ba5c769b0c59f3df
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
Assets/Resources/Yarn/Fiction_Prologue_begin/Fiction_Prologue_begin.yarnproject.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 92498fd024a83554e9a872495731cbe9
guid: ab71ff7b298372f48a262ad5b949c395
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
Assets/Scenes/PeipeiFixScene.unity
+803 -810
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Persistence.unity
+1 -1
View File
@@ -8092,7 +8092,7 @@ Transform:
m_GameObject: {fileID: 519420028}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalPosition: {x: -0.009999275, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Assets/StreamingAssets/Config/character.csv
-2
View File
@@ -36,5 +36,3 @@ CenterText,,,CenterText,Aside,,,
CenterOption,,,CenterOption,Aside,,,
Task,,,Task,Aside,,,
TempText,,,Default,Aside,,,
yl,英理,,Default,MainActor,,,
hs,火山,,Default,MainActor,,,
1 通过key索引配置 中文名 显示位置，Default使用默认，Screen插线屏幕，OldBox基本对话框 人物角色（Player/MainActor/Aside） 名称显示时的颜色 头像Pic路径 语音资源路径
36 CenterOption CenterOption Aside
37 Task Task Aside
38 TempText Default Aside
yl 英理 Default MainActor
hs 火山 Default MainActor