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

Merge branch 'develop' into 火山表达模块交互优化

Browse Source
This commit is contained in:
bottlefish
2025-05-13 14:00:56 +08:00
parent d9b17441b2 17ad2204dc
commit 82c33b995c
14 changed files with 15 additions and 2937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
-5
View File
@@ -17,11 +17,6 @@ MonoBehaviour:
m_SerializedData: []
m_GUID: 09546aca93a801441859af2a811fe53b
m_SerializeEntries:
- m_GUID: 3cf3a2ecbc3d08f4aa1df20f2c0b2621
m_Address: ClinicScene
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 8c9cfa26abfee488c85f1582747f6a02
m_Address: Persistence
m_ReadOnly: 0
Assets/AddressableAssetsData/link.xml
+5 -5
View File
@@ -88,13 +88,13 @@
<type fullname="UFSystem" preserve="all" />
<type fullname="VehicleSpawner" preserve="all" />
<type fullname="ViewCameraManager" preserve="all" />
<type fullname="AibisDream.Framework.SpriteGroupConfig" preserve="nothing" serialized="true" />
<type fullname="AibisDream.Framework.SpriteGroupData" preserve="nothing" serialized="true" />
<type fullname="AibisDream.UIFormOption" preserve="nothing" serialized="true" />
<type fullname="AibisDream.EngineConfig" preserve="nothing" serialized="true" />
<type fullname="AibisDream.EngineGear" preserve="nothing" serialized="true" />
<type fullname="AibisDream.FixSystem.BodyModuleData" preserve="nothing" serialized="true" />
<type fullname="AibisDream.FixSystem.CableConfig" preserve="nothing" serialized="true" />
<type fullname="AibisDream.Framework.SpriteGroupConfig" preserve="nothing" serialized="true" />
<type fullname="AibisDream.Framework.SpriteGroupData" preserve="nothing" serialized="true" />
<type fullname="PunchTape" preserve="nothing" serialized="true" />
<type fullname="EyeTransitionManager/ViewConfig" preserve="nothing" serialized="true" />
<type fullname="ParallaxLayerConfig" preserve="nothing" serialized="true" />
@@ -147,12 +147,12 @@
<type fullname="Cinemachine.CinemachineBrain" preserve="all" />
<type fullname="Cinemachine.CinemachinePipeline" preserve="all" />
<type fullname="Cinemachine.CinemachineVirtualCamera" preserve="all" />
<type fullname="Cinemachine.CinemachineBrain/VcamActivatedEvent" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineVirtualCameraBase/TransitionParams" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.LensSettings" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineBlendDefinition" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineBlenderSettings/CustomBlend" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineBrain/BrainEvent" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineBrain/VcamActivatedEvent" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.CinemachineVirtualCameraBase/TransitionParams" preserve="nothing" serialized="true" />
<type fullname="Cinemachine.LensSettings" preserve="nothing" serialized="true" />
</assembly>
<assembly fullname="Febucci.TextAnimator.Runtime, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="Febucci.UI.Actions.ActionDatabase" preserve="all" />
Assets/AddressableAssetsData/link.xml.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8d89df90342601c4aa6e842493d9766c
guid: f6238544cb9a01e488fde87d71174ef7
TextScriptImporter:
externalObjects: {}
userData:
Assets/Prefabs/UIprefab/Task Item.prefab
+2 -2
View File
@@ -38,7 +38,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 320, y: 35}
m_SizeDelta: {x: 320, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8451937555351605602
CanvasRenderer:
@@ -68,7 +68,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: New Text
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2}
Assets/Resources/Prefabs/UI/Bubble/Aside Text.prefab
+1 -1
View File
@@ -242,7 +242,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57\u793A\u4F8B\u6587"
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
Assets/Resources/Prefabs/UI/Bubble/Bubble Left Bottom.prefab
+1 -1
View File
@@ -242,7 +242,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
Assets/Resources/Prefabs/UI/Bubble/Bubble Left.prefab
+1 -1
View File
@@ -242,7 +242,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
Assets/Resources/Prefabs/UI/Bubble/Bubble Right.prefab
+1 -1
View File
@@ -67,7 +67,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u793A\u4F8B\u6587\u5B57"
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
m_sharedMaterial: {fileID: 4353094232518616245, guid: d8dda148dfd9e5745807a2cbecd1f95f, type: 2}
Assets/Scenes/ClinicOut.unity
-32
View File
@@ -615,14 +615,6 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 6b054c2700ea05541a8a6e6088636183, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -9538,14 +9530,6 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3600946623263556837, guid: 69ad0ddb052b20c4a9d8df6bb524f2d4, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -9788,14 +9772,6 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5946440465696624735, guid: 2eb6486cf0eb58e4fa958cc9ef6aeab3, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
@@ -9834,14 +9810,6 @@ PrefabInstance:
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5427574618981766466, guid: f2461bca3b627ae4a88d010a5d86786a, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
Assets/Scenes/ClinicScene.unity
-2879
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/ClinicScene.unity.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3cf3a2ecbc3d08f4aa1df20f2c0b2621
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/Panel/TaskPanel.cs
+1
View File
@@ -37,6 +37,7 @@ namespace AibisDream
_rectTransform = GetComponent<RectTransform>();
_taskListParent = transform.Find("Record");
EnumEventSystem.Global.Register(GameLoopEnum.GameQuit, ClearTasks);
EnumEventSystem.Global.Register(EventEnum.NextYarn, ClearTasks);
}
#region 诊疗单功能
Assets/StreamingAssets/Config/setting.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"Volume": "0.73",
"Language": "en",
"Language": "zh-Hans",
"WindowMode": "Windowed"
}
ProjectSettings/ProjectSettings.asset
+1 -1
View File
@@ -133,7 +133,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.2.2.4-20250509-185054
bundleVersion: 0.2.2.7-20250512-182256
preloadedAssets:
- {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2}
metroInputSource: 0