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

Merge branch '修复佩佩场景问题' into 'develop'

Browse Source 
提交

See merge request aibis-dream/aibis-dream!390
This commit is contained in:
bottlefish
2025-05-16 13:08:13 +00:00
parent 1a1531f9d9 2e55a45829
commit 13e4b4603b
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Render/Renderer2Dtest.asset
+2 -2
View File
@@ -616,7 +616,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
m_Name: VolFx
m_EditorClassIdentifier:
m_Active: 0
m_Active: 1
_event: 550
_format:
enabled: 1
@@ -1444,7 +1444,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c53165b379c3d94ca34b12cb8eb10f1, type: 3}
m_Name: VolFx
m_EditorClassIdentifier:
m_Active: 1
m_Active: 0
_event: 550
_format:
enabled: 1
Assets/Scenes/PeipeiFixScene.unity
+18 -4
View File
@@ -2020,6 +2020,8 @@ MonoBehaviour:
socketPos: {fileID: 0}
data:
moduleName: Color
clickRadius: 0.2
available: 1
--- !u!114 &162810236
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3627,6 +3629,8 @@ MonoBehaviour:
socketPos: {fileID: 0}
data:
moduleName: Eye
clickRadius: 0.2
available: 1
--- !u!1 &236862861
GameObject:
m_ObjectHideFlags: 0
@@ -8042,6 +8046,8 @@ MonoBehaviour:
socketPos: {fileID: 0}
data:
moduleName: Logic
clickRadius: 0.2
available: 1
--- !u!1 &693974688
GameObject:
m_ObjectHideFlags: 0
@@ -8058,7 +8064,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &693974689
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -9017,7 +9023,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &818458646
Transform:
m_ObjectHideFlags: 0
@@ -9135,6 +9141,8 @@ MonoBehaviour:
socketPos: {fileID: 0}
data:
moduleName: Memory
clickRadius: 0.2
available: 1
--- !u!1 &905842940
GameObject:
m_ObjectHideFlags: 0
@@ -13466,7 +13474,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1274771461
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -13630,7 +13638,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1372381514
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -17645,6 +17653,8 @@ MonoBehaviour:
socketPos: {fileID: 0}
data:
moduleName: UF
clickRadius: 0.2
available: 1
--- !u!114 &1822610252
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -18169,6 +18179,8 @@ MonoBehaviour:
socketPos: {fileID: 0}
data:
moduleName: Emo
clickRadius: 0.2
available: 1
--- !u!1 &1952854102
GameObject:
m_ObjectHideFlags: 0
@@ -19328,6 +19340,8 @@ MonoBehaviour:
socketPos: {fileID: 0}
data:
moduleName: Speak
clickRadius: 0.2
available: 1
--- !u!21 &2091261678
Material:
serializedVersion: 8