T

dingyuntian 8370b725bc Merge branch 'refs/heads/feature/merge' into feature/conflict

# Conflicts:
#	Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb
#	Assets/Resources/Art/Background/主界面尝试尝试最新导出.psb.meta
#	Assets/Resources/Prefabs/Fix/Bottle.prefab
#	Assets/Scenes/ExpressFixScene.unity
#	Assets/Scenes/Persistence.unity
#	Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs.meta
#	Assets/Scripts/FixSystemNew/CoolingMachine/BottleShelf.cs
#	Assets/Scripts/FixSystemNew/CoolingMachine/BottleSlot.cs
#	Assets/Scripts/FixSystemNew/CoolingMachine/CoolingBottle.cs
#	Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs
#	Assets/Scripts/FixSystemNew/CoolingMachine/PumpController.cs
#	Assets/Scripts/FixSystemNew/CoolingMachine/TubeController.cs
#	Assets/Scripts/FixSystemNew/FixSystemCenter.cs
#	Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs
#	Assets/Scripts/Framework/OtherKit/MonoCenter.cs

2024-12-26 13:30:40 +08:00

.idea/.idea.AIBIS Dream/.idea

音频内容

2024-09-19 01:12:10 +08:00

.vscode

佩佩流程针对yarn的修改

2024-08-12 23:22:29 +08:00

Assets

石头Day1跑通

2024-12-26 03:20:56 +08:00

Packages

引擎部分修改