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

修复火山的系统

Browse Source
This commit is contained in:
bottlefish
2025-07-09 18:30:14 +08:00
parent 0bcc682c3c
commit cd928081d2
10 changed files with 7518 additions and 7251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Language/Dialog/Test_Huoshan/Test_Huoshan Shared Data.asset
+68 -68
View File
@@ -19,72 +19,72 @@ MonoBehaviour:
m_Key: line:0ef7bff
m_Metadata:
m_Items:
- rid: 7942689805606060901
- rid: 6203036897972322888
- m_Id: 180190609408
m_Key: line:088b598
m_Metadata:
m_Items:
- rid: 7942689805606060902
- rid: 6203036897972322889
- m_Id: 180190609409
m_Key: line:0dac12c
m_Metadata:
m_Items:
- rid: 7942689805606060903
- rid: 6203036897972322890
- m_Id: 180190609410
m_Key: line:0ad2190
m_Metadata:
m_Items:
- rid: 7942689805606060904
- rid: 6203036897972322891
- m_Id: 180194803712
m_Key: line:0466fea
m_Metadata:
m_Items:
- rid: 7942689805606060905
- rid: 6203036897972322892
- m_Id: 385815380393984
m_Key: line:3adc1a6b
m_Metadata:
m_Items:
- rid: 7848877270717431815
- rid: 6203036897972322893
- m_Id: 385815418142720
m_Key: line:88de144d
m_Metadata:
m_Items:
- rid: 7848877270717431816
- rid: 6203036897972322894
- m_Id: 385815418142721
m_Key: line:6e39d94c
m_Metadata:
m_Items:
- rid: 7848877270717431817
- rid: 6203036897972322895
- m_Id: 385815422337024
m_Key: line:10a52b00
m_Metadata:
m_Items:
- rid: 7848877270717431818
- rid: 6203036897972322896
- m_Id: 385815422337025
m_Key: line:bbda6a4d
m_Metadata:
m_Items:
- rid: 7848877270717431819
- rid: 6203036897972322897
- m_Id: 385815422337026
m_Key: line:18803fd4
m_Metadata:
m_Items:
- rid: 7848877270717431820
- rid: 6203036897972322898
- m_Id: 385815422337027
m_Key: line:29e5d4fb
m_Metadata:
m_Items:
- rid: 7848877270717431821
- rid: 6203036897972322899
- m_Id: 385815422337028
m_Key: line:819f5fc5
m_Metadata:
m_Items:
- rid: 7848877270717431822
- rid: 6203036897972322900
- m_Id: 385815422337029
m_Key: line:c51438fd
m_Metadata:
m_Items:
- rid: 7848877270717431823
- rid: 6203036897972322901
- m_Id: 1089753175810048
m_Key: line:0df91b5d
m_Metadata:
@@ -137,80 +137,80 @@ MonoBehaviour:
references:
version: 2
RefIds:
- rid: 7848877248308838402
type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization}
data:
m_CustomEpoch: 1747115029650
- rid: 7848877270717431815
- rid: 6203036897972322888
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: Start
tags: []
- rid: 7848877270717431816
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u63A2\u7D22\u5B8C\u6210"
tags: []
- rid: 7848877270717431817
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u81EA\u5351\u627E\u5230\u4E86"
tags: []
- rid: 7848877270717431818
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u7F9E\u803B\u627E\u5230\u4E86"
tags: []
- rid: 7848877270717431819
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u6050\u60E7\u627E\u5230\u4E86"
tags: []
- rid: 7848877270717431820
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u7ED3\u675F\u60C5\u7EEA\u6A21\u5757\u63A2\u7D22"
tags: []
- rid: 7848877270717431821
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u627E\u5230\u7F9E\u803B\u5BF9\u8BDD"
tags: []
- rid: 7848877270717431822
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u627E\u5230\u6050\u60E7\u5BF9\u8BDD"
tags: []
- rid: 7848877270717431823
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u627E\u5230\u81EA\u5351\u5BF9\u8BDD"
tags: []
- rid: 7942689805606060901
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: Start
tags: []
- rid: 7942689805606060902
- rid: 6203036897972322889
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: Center
tags: []
- rid: 7942689805606060903
- rid: 6203036897972322890
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005"
tags: []
- rid: 7942689805606060904
- rid: 6203036897972322891
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005"
tags: []
- rid: 7942689805606060905
- rid: 6203036897972322892
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "UserA_\u5708\u5C42\u8C61\u5F81\u8005"
tags: []
- rid: 6203036897972322893
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: Start
tags: []
- rid: 6203036897972322894
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u60C5\u7EEA\u63A2\u7D22\u5B8C\u6210"
tags: []
- rid: 6203036897972322895
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u81EA\u5351\u627E\u5230\u4E86"
tags: []
- rid: 6203036897972322896
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u7F9E\u803B\u627E\u5230\u4E86"
tags: []
- rid: 6203036897972322897
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u6050\u60E7\u627E\u5230\u4E86"
tags: []
- rid: 6203036897972322898
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u7ED3\u675F\u60C5\u7EEA\u6A21\u5757\u63A2\u7D22"
tags: []
- rid: 6203036897972322899
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u627E\u5230\u7F9E\u803B\u5BF9\u8BDD"
tags: []
- rid: 6203036897972322900
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u627E\u5230\u6050\u60E7\u5BF9\u8BDD"
tags: []
- rid: 6203036897972322901
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
nodeName: "\u627E\u5230\u81EA\u5351\u5BF9\u8BDD"
tags: []
- rid: 7848877248308838402
type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization}
data:
m_CustomEpoch: 1747115029650
- rid: 7942689805606060906
type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity}
data:
Assets/Render/Renderer2Dtest.asset
+14 -10
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
@@ -1675,7 +1679,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 729a2e952309e2547a3747b2cdd9a36f, type: 3}
m_Name: ShapesRenderFeature
m_EditorClassIdentifier:
m_Active: 0
m_Active: 1
--- !u!114 &5440560837828023301
MonoBehaviour:
m_ObjectHideFlags: 3
Assets/Resources/Yarn/Fiction_Huoshan1/Stage1_开头对话.yarn.meta
+10
View File
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: bb61c11311189b540ba91ef36a7c2bbf
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
Assets/Resources/Yarn/Fiction_Huoshan1/Stage3_中间对话.yarn.meta
+10
View File
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: edfcb7b948d60624d9b03f9bc5405f3c
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
Assets/Resources/Yarn/Fiction_Huoshan1/Stage4_治疗.yarn.meta
+10
View File
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 8134e6bf2a66e4645b2023807a2af55f
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
Assets/Resources/Yarn/Fiction_Huoshan1/Stage5_结束对话.yarn.meta
+10
View File
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 5ccef6348a800aa42ab531e9f824fea1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
Assets/Resources/Yarn/Test_Huoshan/Center.yarn
+2
View File
@@ -3,6 +3,8 @@ tags:
colorID: 8
position: 205,-53
---
<<DropCable>>
<<fade_out 1>>
<<switch_fix_system_to "BodyModule" "Head">>
->深入表达模块 #line:0ef7bff
<<switch_fix_system_to Expression>>
Assets/Scenes/HuoShanFixScene.unity
+7194 -7171
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/Persistence.unity
+198 -1
View File
@@ -10394,6 +10394,202 @@ MonoBehaviour:
references:
version: 2
RefIds: []
--- !u!1 &704370074
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 704370080}
- component: {fileID: 704370079}
- component: {fileID: 704370078}
- component: {fileID: 704370077}
- component: {fileID: 704370076}
- component: {fileID: 704370075}
m_Layer: 0
m_Name: PerspectiveMainCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &704370075
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704370074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3}
m_Name:
m_EditorClassIdentifier:
nonRigidbodyVelocity: 0
attenuationObject: {fileID: 0}
--- !u!114 &704370076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704370074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowDebugText: 0
m_ShowCameraFrustum: 1
m_IgnoreTimeScale: 0
m_WorldUpOverride: {fileID: 0}
m_UpdateMethod: 2
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 1.5
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CustomBlends: {fileID: 11400000, guid: 97ddad596c0b5f94e8bb6e86e444a1cc, type: 2}
m_CameraCutEvent:
m_PersistentCalls:
m_Calls: []
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
--- !u!114 &704370077
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704370074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56666c5a40171f54783dd416a44f42bf, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EventMask:
serializedVersion: 2
m_Bits: 4294967295
m_MaxRayIntersections: 0
--- !u!114 &704370078
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704370074}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras:
- {fileID: 1078778571}
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 64
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 1
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
quality: 3
frameInfluence: 0.1
jitterScale: 1
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
--- !u!20 &704370079
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704370074}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 34
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 0
m_HDR: 1
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &704370080
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704370074}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &719228336
GameObject:
m_ObjectHideFlags: 0
@@ -10452,7 +10648,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
runMode: 0
firstTalkSo: {fileID: 11400000, guid: 2f763a2c04ecafb4981379b7363f9791, type: 2}
firstTalkSo: {fileID: 11400000, guid: 8ce86974047bb404c9096e70a606355a, type: 2}
testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
saveFileName:
--- !u!1 &719273460
@@ -63637,6 +63833,7 @@ SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 519420032}
- {fileID: 704370080}
- {fileID: 1271176892}
- {fileID: 619394802}
- {fileID: 1450136610}
Assets/Scripts/Framework/OtherKit/CameraKit.cs
+2 -1
View File
@@ -47,6 +47,7 @@ namespace AibisDream.Framework
public override void OnSingletonInit()
{
Debug.Log("CameraKit OnSingletonInit");
// 获取正交相机
_orthoMainCamera = Camera.main;
_orthoCameraBrain = _orthoMainCamera?.GetComponent<CinemachineBrain>();
@@ -173,7 +174,7 @@ namespace AibisDream.Framework
// 切换主相机
bool isPerspective = _camInitStateDict[camType].isPerspective;
_orthoMainCamera.gameObject.SetActive(!isPerspective);
// _perspectiveMainCamera.gameObject.SetActive(isPerspective);
_perspectiveMainCamera.gameObject.SetActive(isPerspective);
var activeBrain = isPerspective ? _perspectiveCameraBrain : _orthoCameraBrain;
// 设置虚拟相机优先级