Merge branch '地铁test' into 'develop'

提交地铁测试以及佩佩bug修改,和记忆参数调整

See merge request aibis-dream/aibis-dream!151
This commit is contained in:
2024-12-29 19:29:59 +00:00
9 changed files with 986 additions and 24 deletions
@@ -27,7 +27,7 @@ public class MemoryProcess : MonoBehaviour
public float targetFrequency = 1.25f; // 目标频率
public float targetClarity = 5.7f; // 目标频率
private float lockThreshold = 0.2f; // 锁定阈值
private float lockThreshold = 0.06f; // 锁定阈值
private bool isProcessing = false; // 新增变量来追踪是否正在处理记忆
@@ -115,6 +115,18 @@ public class MemoryProcess : MonoBehaviour
// 初始化UI状态
Init();
}
float GetRandomNumber()
{
// 随机决定选择哪个区间
if (Random.value < 0.5f) // 50% 概率选择第一个区间
{
return Random.Range(0.5f, 2f);
}
else // 50% 概率选择第二个区间
{
return Random.Range(4f, 5.5f);
}
}
void OnFrequencyChanged(float value)
{
float distance = Mathf.Abs(value - targetFrequency);
@@ -334,6 +346,8 @@ public IEnumerator PlayMemory(bool useYarn=false,string memName="")
[YarnCommand("search_memory")]
public IEnumerator SearchMemory(PunchTape punchTape, bool isSkipDialogue=false)
{
targetClarity=GetRandomNumber();
targetFrequency=GetRandomNumber();
FavoritesManager.Instance.CloseFavorites();
//FavoritesManager.Instance.CloseFavorites();
if(punchTape==null)
@@ -106,7 +106,7 @@ position: 43,-97
<<ConnectionCantBreak CanvasClueBoard>>
<<wait 1.2>>
我: 是了,就是这个记忆。
<<ScrollToNode CanvasClueBoard EyeSky>>
<<ScrollToNode CanvasClueBoard EyePoster>>
// 我: 佩佩在看天空时,回想起了小时候在病床前的记忆。
我: 佩佩在看海报时,回想起了被主管骂的场景。
<<wait 1.2>>
@@ -114,7 +114,7 @@ position: 43,-97
<<wait 1.2>>
// <<ChangeConnectionVisual CanvasClueBoard Memory病床 30 Blue>>
<<wait 1.2>>
<<ScrollToNode CanvasClueBoard EyeSky>>
<<ScrollToNode CanvasClueBoard EyePoster>>
<<wait 1.2>>
// 我: 病床前的记忆顺着线路来到了视觉,色彩融入了色觉模块。
// 我: 这让佩佩看到了蓝天,她记忆中的蓝天。
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 53bc4b1303841cc41ae24dd11b18258c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -0,0 +1,32 @@
title: Start
tags:
colorID: 8
position: 253,-2041
---
<<load_scene PeipeiFixScene>>
<<indoor_new 1>>
->去地铁
<<fade_in 1>>
<<pause_loop_audio>>
<<load_scene SubWay>>
<<fade_out 1>>
<<jump Choice>>
===
title: Choice
tags:
---
->进入隧道
<<EnterTunnel SubWayManager>>
进入隧道了
->离开隧道
<<ExitTunnel SubWayManager>>
<<jump Choice>>
->离开地铁
<<fade_in 1>>
<<load_scene PeipeiFixScene>>
<<fade_out 1>>
===
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 1166e18a908a84e4f87675d3bf5d43d5
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3}
@@ -0,0 +1,12 @@
{
"projectFileVersion": 2,
"sourceFiles": [
"**/*.yarn"
],
"excludeFiles": [
"**/*~/*"
],
"localisation": {},
"baseLanguage": "zh-CHS",
"compilerOptions": {}
}
@@ -0,0 +1,13 @@
fileFormatVersion: 2
guid: 10f14bae5f32a5f4fab980cfaa8fc41e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3}
useAddressableAssets: 0
UseUnityLocalisationSystem: 0
unityLocalisationStringTableCollection: {instanceID: 0}
+7 -7
View File
@@ -7561,7 +7561,7 @@ MonoBehaviour:
m_Intensity: 1
m_LightVolumeIntensity: 1
m_LightVolumeIntensityEnabled: 0
m_ApplyToSortingLayers: 00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d021d98fe13394c912c7af7730
m_ApplyToSortingLayers: f3a9fe5c00000000bbbb5032670b9971b7e66ab5d3878c191da0cc5f7740d514351d35393d533d9a7dc3a93dad9d9e43a55d9d3c8db9e11bb33d1a38cd4376e253b7f3d021d98fe13394c912c7af7730
m_LightCookieSprite: {fileID: 0}
m_DeprecatedPointLightCookieSprite: {fileID: 0}
m_LightOrder: 0
@@ -8638,7 +8638,7 @@ MonoBehaviour:
runMode: 0
firstTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2}
clinicScene: ClinicScene
testYarnProject: MemoryTest
testYarnProject: Re_LTS_Peipeiday1
--- !u!4 &719228339
Transform:
m_ObjectHideFlags: 0
@@ -19367,7 +19367,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 361, y: -21}
m_AnchoredPosition: {x: 0, y: 34}
m_SizeDelta: {x: 250, y: 51.259995}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1804770169
@@ -20230,10 +20230,10 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
_id: Port All
_sID: 854b69f9-32c7-409d-8e13-2b668b0b9b30
_sID: 56cb42b0-00c3-41c3-93bd-b51dc5445ab1
rectTransform: {fileID: 1955814204}
graphManager: {fileID: 3728315362672514892}
node: {fileID: 1282326177}
node: {fileID: 1337853809}
_polarity: 1
maxConnections: 0
iconUnconnected: {fileID: 5762495268120750890, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3}
@@ -21345,7 +21345,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 309, y: 100}
m_AnchoredPosition: {x: 271, y: 27}
m_SizeDelta: {x: 250, y: 250}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2019424941
@@ -36088,7 +36088,7 @@ MonoBehaviour:
iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3}
exclusiveOnDragCanvas: {fileID: 0}
useLegacyDragMethod: 0
position: {x: 1250.7692, y: 1199.4816, z: 0}
position: {x: -1014.7264, y: 526.6768, z: 0}
dragSelection:
customRenderer: {fileID: 0}
line:
+887 -14
View File
@@ -123,6 +123,258 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &1938438
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1938439}
- component: {fileID: 1938440}
m_Layer: 0
m_Name: "\u6276\u624Ba (4)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1938439
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1938438}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: 0.039755434, w: 0.99920946}
m_LocalPosition: {x: -4.650001, y: 11.028431, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4.557}
--- !u!212 &1938440
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1938438}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 29
m_Sprite: {fileID: 7318358520621558824, guid: 3ef71b42553122d4b9fb9211680d703e, 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.74, y: 1.95}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &89414780
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 89414781}
- component: {fileID: 89414782}
m_Layer: 0
m_Name: "\u6276\u624Ba (1)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &89414781
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 89414780}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0.033139303, w: 0.99945074}
m_LocalPosition: {x: -1.2635186, y: 11.028431, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -3.798}
--- !u!212 &89414782
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 89414780}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 29
m_Sprite: {fileID: 7318358520621558824, guid: 3ef71b42553122d4b9fb9211680d703e, 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.74, y: 1.95}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &111487553
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 111487554}
- component: {fileID: 111487555}
m_Layer: 0
m_Name: "\u6276\u624Ba (2)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &111487554
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 111487553}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 5.72, y: 11.025, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &111487555
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 111487553}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 29
m_Sprite: {fileID: 7318358520621558824, guid: 3ef71b42553122d4b9fb9211680d703e, 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.74, y: 1.95}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &157917237
GameObject:
m_ObjectHideFlags: 0
@@ -432,6 +684,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &355878508
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 355878509}
- component: {fileID: 355878510}
m_Layer: 0
m_Name: "\u6276\u624Bb (3)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &355878509
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 355878508}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 9.2, y: 8.925, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &355878510
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 355878508}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 28
m_Sprite: {fileID: 6666527148891329690, guid: 3ef71b42553122d4b9fb9211680d703e, 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.03, y: 1.15}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &408274514
GameObject:
m_ObjectHideFlags: 0
@@ -773,6 +1109,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &578187164
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 578187165}
- component: {fileID: 578187166}
m_Layer: 0
m_Name: "\u6276\u624Ba (3)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &578187165
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578187164}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 9.58, y: 11.025, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &578187166
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578187164}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 29
m_Sprite: {fileID: 7318358520621558824, guid: 3ef71b42553122d4b9fb9211680d703e, 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.74, y: 1.95}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &625299933
GameObject:
m_ObjectHideFlags: 0
@@ -1064,6 +1484,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &758358928
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 758358929}
- component: {fileID: 758358930}
m_Layer: 0
m_Name: "\u6276\u624Bb (4)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &758358929
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 758358928}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: 0.01579061, w: 0.9998753}
m_LocalPosition: {x: -4.2752414, y: 8.898932, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.81}
--- !u!212 &758358930
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 758358928}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 28
m_Sprite: {fileID: 6666527148891329690, guid: 3ef71b42553122d4b9fb9211680d703e, 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.03, y: 1.15}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &779629287
GameObject:
m_ObjectHideFlags: 0
@@ -1097,6 +1601,90 @@ Transform:
- {fileID: 1721955123}
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &805473973
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 805473974}
- component: {fileID: 805473975}
m_Layer: 0
m_Name: "\u6276\u624Bb (2)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &805473974
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 805473973}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 5.94, y: 8.925, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &805473975
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 805473973}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 28
m_Sprite: {fileID: 6666527148891329690, guid: 3ef71b42553122d4b9fb9211680d703e, 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.03, y: 1.15}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &896790803 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 325204245247115116, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
@@ -1661,6 +2249,10 @@ PrefabInstance:
propertyPath: m_SortingLayerID
value: 1560193523
objectReference: {fileID: 0}
- target: {fileID: 11076785875630684, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
propertyPath: m_Color.a
value: 0.7176471
objectReference: {fileID: 0}
- target: {fileID: 44416471842246233, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
propertyPath: m_SortingLayer
value: -1
@@ -1783,38 +2375,62 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 0
addedObject: {fileID: 201159297}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 6
addedObject: {fileID: 111487554}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 7
addedObject: {fileID: 578187165}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 8
addedObject: {fileID: 89414781}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 9
addedObject: {fileID: 1938439}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 11
addedObject: {fileID: 157917238}
addedObject: {fileID: 805473974}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 12
addedObject: {fileID: 1759782837}
addedObject: {fileID: 355878509}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 13
addedObject: {fileID: 2131325287}
addedObject: {fileID: 1521220846}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 18
addedObject: {fileID: 719146788}
insertIndex: 14
addedObject: {fileID: 758358929}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 19
addedObject: {fileID: 522985922}
addedObject: {fileID: 157917238}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 20
addedObject: {fileID: 1773696866}
addedObject: {fileID: 1759782837}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 21
addedObject: {fileID: 779629288}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 24
addedObject: {fileID: 1302373981}
addedObject: {fileID: 2131325287}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 26
addedObject: {fileID: 633879431}
addedObject: {fileID: 719146788}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 27
addedObject: {fileID: 522985922}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 28
addedObject: {fileID: 1773696866}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 29
addedObject: {fileID: 779629288}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 32
addedObject: {fileID: 1302373981}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 34
addedObject: {fileID: 633879431}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 37
addedObject: {fileID: 2057142334}
- targetCorrespondingSourceObject: {fileID: -7552582706839291426, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
insertIndex: 31
insertIndex: 39
addedObject: {fileID: 1955111545}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: -8653719598885068355, guid: 3ef71b42553122d4b9fb9211680d703e, type: 3}
@@ -1833,7 +2449,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1444344158}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 394cd5dc2104b444d89d10e6440161fd, type: 3}
m_Name:
@@ -2087,6 +2703,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1521220845
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1521220846}
- component: {fileID: 1521220847}
m_Layer: 0
m_Name: "\u6276\u624Bb (1)"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1521220846
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1521220845}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: 0.01579061, w: 0.9998753}
m_LocalPosition: {x: -0.88875973, y: 8.898932, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1444344160}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.81}
--- !u!212 &1521220847
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1521220845}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 28
m_Sprite: {fileID: 6666527148891329690, guid: 3ef71b42553122d4b9fb9211680d703e, 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.03, y: 1.15}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1632768997
GameObject:
m_ObjectHideFlags: 0
@@ -2974,6 +3674,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2131382685}
- component: {fileID: 2131382686}
m_Layer: 0
m_Name: SubWayManager
m_TagString: Untagged
@@ -2996,6 +3697,178 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2131382686
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2131382684}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 394cd5dc2104b444d89d10e6440161fd, type: 3}
m_Name:
m_EditorClassIdentifier:
speedMultiplier: 1
layerConfigs:
- layer: {fileID: 633879430}
scrollSpeed: 0.02
scrollOffset: 39.69
- layer: {fileID: 2057142333}
scrollSpeed: 0.02
scrollOffset: 39.69
categoryConfigs:
- categoryName: CloudFar
isEnabled: 1
objects:
- {fileID: 481930317}
- {fileID: 481930317}
speed: 0.02
xSpawnRange: 20
generationThreshold: 14
useIntervalGeneration: 0
spawnInterval: 5
batchSize: 3
batchInterval: 0.2
delayAfterBatch: 2
- categoryName: CloudMid
isEnabled: 1
objects:
- {fileID: 627225183}
- {fileID: 627225183}
speed: 0.03
xSpawnRange: 24
generationThreshold: 16
useIntervalGeneration: 0
spawnInterval: 0
batchSize: 3
batchInterval: 0.2
delayAfterBatch: 2
- categoryName: CloudNear
isEnabled: 1
objects:
- {fileID: 264393910}
- {fileID: 264393910}
speed: 0.4
xSpawnRange: 24
generationThreshold: 13
useIntervalGeneration: 0
spawnInterval: 0
batchSize: 3
batchInterval: 0.2
delayAfterBatch: 2
- categoryName: BuildingMid
isEnabled: 1
objects:
- {fileID: 1302373980}
- {fileID: 1302373980}
- {fileID: 1302373980}
- {fileID: 1302373980}
- {fileID: 1302373980}
- {fileID: 1302373980}
speed: 1.3
xSpawnRange: 24
generationThreshold: 16
useIntervalGeneration: 1
spawnInterval: 0
batchSize: 3
batchInterval: 10
delayAfterBatch: 6
- categoryName: BuildingNear
isEnabled: 1
objects:
- {fileID: 779629287}
- {fileID: 779629287}
- {fileID: 779629287}
speed: 50
xSpawnRange: 24
generationThreshold: 16
useIntervalGeneration: 1
spawnInterval: 12
batchSize: 3
batchInterval: 3
delayAfterBatch: 15
- categoryName: Bird
isEnabled: 1
objects:
- {fileID: 896790803}
- {fileID: 896790803}
- {fileID: 896790803}
speed: 0.3
xSpawnRange: 24
generationThreshold: 16
useIntervalGeneration: 1
spawnInterval: 30
batchSize: 1
batchInterval: 0
delayAfterBatch: 10
- categoryName: "\u94C1\u8DEF\u680F\u6746"
isEnabled: 1
objects:
- {fileID: 1773696865}
- {fileID: 1773696865}
speed: 70
xSpawnRange: 21
generationThreshold: 20
useIntervalGeneration: 1
spawnInterval: 30
batchSize: 1
batchInterval: 1
delayAfterBatch: 1
- categoryName: "\u96A7\u6D1E\u706F"
isEnabled: 0
objects:
- {fileID: 1759782836}
speed: 60
xSpawnRange: 21
generationThreshold: 20
useIntervalGeneration: 0
spawnInterval: 30
batchSize: 1
batchInterval: 0
delayAfterBatch: 2
- categoryName: "\u5E7F\u544A\u724C"
isEnabled: 1
objects:
- {fileID: 719146787}
speed: 70
xSpawnRange: 21
generationThreshold: 20
useIntervalGeneration: 1
spawnInterval: 30
batchSize: 1
batchInterval: 1
delayAfterBatch: 80
- categoryName: "\u5217\u8F66"
isEnabled: 1
objects:
- {fileID: 201159295}
speed: 100
xSpawnRange: 180
generationThreshold: 20
useIntervalGeneration: 1
spawnInterval: 30
batchSize: 1
batchInterval: 1
delayAfterBatch: 20
- categoryName: "\u7535\u7EBF\u6746"
isEnabled: 1
objects:
- {fileID: 522985921}
speed: 70
xSpawnRange: 21
generationThreshold: 20
useIntervalGeneration: 1
spawnInterval: 30
batchSize: 1
batchInterval: 1
delayAfterBatch: 50
tunnelSprite: {fileID: 157917237}
sisterSpriteRender: {fileID: 2131325288}
tunnelEnterPosition: {x: 32, y: 0, z: 0}
tunnelExitPosition: {x: -27, y: 0, z: 0}
tunnelKeepPosition: {x: 0, y: 0, z: 0}
tunnelDuration: 0.7
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0