演出功能整合

main
yurui 2024-03-18 14:29:03 +08:00
parent a772fdee5a
commit e6abf86a6f
83 changed files with 14460 additions and 14723 deletions

View File

@ -349,121 +349,6 @@ MonoBehaviour:
_size: 0 _size: 0
_fov: 0 _fov: 0
_cameraOperationType: 0 _cameraOperationType: 0
--- !u!1 &187353672
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 187353673}
- component: {fileID: 187353675}
- component: {fileID: 187353674}
m_Layer: 0
m_Name: NLD_URP_NLD_Scene_Lambert
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &187353673
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 187353672}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 220032865}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &187353674
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 187353672}
m_Mesh: {fileID: 4300000, guid: ce0821acce4e0a44e800c124d2bb9f7a, type: 2}
--- !u!23 &187353675
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 187353672}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: d23dffc3cb2a50141bdcacdf605eba61, 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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &220032864
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 220032865}
m_Layer: 0
m_Name: CombinedRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &220032865
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 220032864}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 187353673}
m_Father: {fileID: 669837091}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &295363565 --- !u!1001 &295363565
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1027,7 +912,7 @@ Transform:
- {fileID: 3336876277925082991} - {fileID: 3336876277925082991}
- {fileID: 5224727447850396276} - {fileID: 5224727447850396276}
- {fileID: 3344988213988812322} - {fileID: 3344988213988812322}
- {fileID: 220032865} - {fileID: 1932379317}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &679372993 --- !u!1 &679372993
@ -2272,7 +2157,7 @@ GameObject:
- component: {fileID: 1257681355} - component: {fileID: 1257681355}
- component: {fileID: 1257681356} - component: {fileID: 1257681356}
m_Layer: 0 m_Layer: 0
m_Name: CampSceneManager m_Name: ShowManager
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -2302,32 +2187,14 @@ MonoBehaviour:
m_GameObject: {fileID: 1257681354} m_GameObject: {fileID: 1257681354}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 20df75fffc984b44ca1450867e104ba8, type: 3} m_Script: {fileID: 11500000, guid: 57012a906036c894f89473379533acf7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
characterMaxCount: 20 ShowSceneType: 0
tsCharacterRoot: {fileID: 2008262905} tsCharacterRoot: {fileID: 2008262905}
listShowPoint: tsShowPointRoot: {fileID: 1608561687}
- {fileID: 1164814443} characterMaxCount: 20
- {fileID: 456131875} IsIgnoreKanbanban: 0
- {fileID: 1096319117}
- {fileID: 1310482103}
- {fileID: 1179187162}
- {fileID: 1682806771}
- {fileID: 400991213}
- {fileID: 1560976400}
- {fileID: 1068680023}
- {fileID: 397188764}
- {fileID: 1227911902}
- {fileID: 1049332259}
- {fileID: 1245462855}
- {fileID: 465088339}
- {fileID: 1964002207}
- {fileID: 72221106}
- {fileID: 1784115275}
- {fileID: 1805696194}
- {fileID: 1514503505}
- {fileID: 1017797544}
listExtractRecord: [] listExtractRecord: []
--- !u!1 &1310482103 --- !u!1 &1310482103
GameObject: GameObject:
@ -2833,6 +2700,89 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 1608561687} m_Father: {fileID: 1608561687}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1683009976
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1683009977}
- component: {fileID: 1683009979}
- component: {fileID: 1683009978}
m_Layer: 0
m_Name: NLD_URP_NLD_Scene_Lambert
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1683009977
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1683009976}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1932379317}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1683009978
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1683009976}
m_Mesh: {fileID: 4300000, guid: ce0821acce4e0a44e800c124d2bb9f7a, type: 2}
--- !u!23 &1683009979
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1683009976}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: d23dffc3cb2a50141bdcacdf605eba61, 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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1748559088 --- !u!1 &1748559088
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2998,6 +2948,38 @@ MonoBehaviour:
_size: 0 _size: 0
_fov: 0 _fov: 0
_cameraOperationType: 0 _cameraOperationType: 0
--- !u!1 &1932379316
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1932379317}
m_Layer: 0
m_Name: CombinedRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1932379317
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1932379316}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1683009977}
m_Father: {fileID: 669837091}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1947013275 --- !u!1001 &1947013275
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 71804b6e47df1f14c994a2ce160798bf guid: e1e3b777939dec2419611b4a8f332e71
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1648748698505249304
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &26413683965813413
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3704420424133722189
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &1256770737750343857
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &5187232961839603367 --- !u!114 &950928006585024517
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &6831223755210831216 --- !u!114 &4439052752934559876
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1695324710146491565
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &5091282668121367371
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8158759851920483780
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &975756847010986238
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2135807728483665191 --- !u!114 &-4107797715285803485
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &7433238117460583934 --- !u!114 &6730783258209063696
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &709593832395475925 --- !u!114 &7678194769819594693
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7162122792706850410
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &6530288727338446049
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1597816848389130098
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &6301177371315035947
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &113793678481327764 --- !u!114 &3304299850571901221
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5598822217261450437
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &3290970234470493742
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-17261812454807328
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &8629301216438722103
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &3637120515011757732 --- !u!114 &7554769394070186309
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5714207034815725445
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &2187516015189614373
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-14794698722999155
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &6736135765078973680
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5416833357928428535
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -137,3 +124,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &7867798311052232860
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &1136649373744899180 --- !u!114 &4824918817792874369
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1302174303036336859
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &1564651298652209106
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &154244081891556198 --- !u!114 &7292263247749834825
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7257912322220117262 --- !u!114 &-7111915196170104405
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &37588047008451327 --- !u!114 &3190029596000563758
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3720516613787892767
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &7610156361740953713
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8696387987104513998
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &1479549859784594943
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-65308187420933930
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &7149229201368583184
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -124,7 +124,7 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &6354110962478181224 --- !u!114 &1648302508044701941
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5146960408312348057 --- !u!114 &-3970506764811163787
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2856558594607225300 --- !u!114 &-3715830062966656852
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3435653610082534502
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &5739633650206351684
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4541361153065751259 --- !u!114 &-626675271735444909
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@ -1,5 +1,18 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2011180584467418481
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 8
@ -124,16 +137,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &5203030559397967935
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6b0ae51d6018d52448832cd7698a8269 guid: 855a5466a5a200e499c8f2c38e5f9f07
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,21 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b7c3aa9251a69b94c98c2c3fe81c01a2, type: 3}
m_Name: CampTimeLineCollector
m_EditorClassIdentifier:
_allTimelineAssetPaths:
- Assets/Art/Camp/Timeline/chairfire/camp_timeline_temp.playable
- Assets/Art/Camp/Timeline/dance/camp_timeline_4.playable
- Assets/Art/Camp/Timeline/dance/camp_timeline_5.playable
- Assets/Art/Camp/Timeline/toilet/camp_timeline_1.playable
- Assets/Art/Camp/Timeline/toilet/camp_timeline_2.playable
- Assets/Art/Camp/Timeline/toilet/camp_timeline_3.playable

View File

@ -1,137 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: camptime_test
m_EditorClassIdentifier:
m_Version: 0
m_Tracks: []
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 0}
--- !u!114 &263672459991114372
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3}
m_Name: Control Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 2080469805009541133}
m_Duration: 5
m_TimeScale: 1
m_ParentTrack: {fileID: 263672459991114372}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: P_S_A00005
m_Markers:
m_Objects: []
--- !u!114 &2080469805009541133
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48853ae485fa386428341ac1ea122570, type: 3}
m_Name: ControlPlayableAsset
m_EditorClassIdentifier:
sourceGameObject:
exposedName: c7980810aaa6d0a4b81cfd0924049bae
defaultValue: {fileID: 0}
prefabGameObject: {fileID: 0}
updateParticle: 1
particleRandomSeed: 9201
updateDirector: 1
updateITimeControl: 1
searchHierarchy: 0
active: 1
postPlayback: 2

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2a278567be96c2545823c52145513722 guid: 8f81ca3901fabf34f93e19c352691a24
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

View File

@ -120,7 +120,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: camp_timeline_1 m_Name: show_camp_1
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Version: 0 m_Version: 0
m_Tracks: m_Tracks:

View File

@ -1284,7 +1284,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: camp_timeline_2 m_Name: show_camp_2
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Version: 0 m_Version: 0
m_Tracks: m_Tracks:

View File

@ -957,7 +957,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: camp_timeline_3 m_Name: show_camp_3
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Version: 0 m_Version: 0
m_Tracks: m_Tracks:

View File

@ -942,7 +942,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: camp_timeline_4 m_Name: show_camp_4
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Version: 0 m_Version: 0
m_Tracks: m_Tracks:

View File

@ -1043,7 +1043,7 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3} m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: camp_timeline_5 m_Name: show_camp_5
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Version: 0 m_Version: 0
m_Tracks: m_Tracks:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a9ebbbe04796c744fadcedfc14e8069b guid: eae4fa8507cf2f44a99342cfb3c8388a
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 7f0a0184cda76ee47a12f24d773dcdc2 guid: ba1cce595da43f645870490b349ca0e3
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 913e5375d826c4f4c8cf4d74b38edaf2 guid: 7c7b38f4212a24e458786f2015533d68
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000

View File

@ -0,0 +1,668 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8167784043181607141
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-7428685438116357672
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-3227330241980127412
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-2146233614790500777
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3}
m_Name: Animation Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -3227330241980127412}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: 0.33333333333333126
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 5.833333333333336
m_ClipIn: 0
m_Asset: {fileID: 7760006191662008137}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0.33333333333333126
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 12
m_ClipIn: 0
m_Asset: {fileID: 4647887568012060173}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0.3333333333333215
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 17.833333333333346
m_ClipIn: 0
m_Asset: {fileID: 7685483706063963616}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0.3333333333333215
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 24.000000000000014
m_ClipIn: 0
m_Asset: {fileID: 8255932673281005732}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: 0.3333333333333286
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 29.833333333333353
m_ClipIn: 0
m_Asset: {fileID: -147943125549348379}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0.3333333333333286
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 36.000000000000014
m_ClipIn: 0
m_Asset: {fileID: -732373543025971121}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0.3333333333333286
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 41.83333333333335
m_ClipIn: 0
m_Asset: {fileID: 7222357771163648985}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0.3333333333333286
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 48.000000000000014
m_ClipIn: 0
m_Asset: {fileID: -7428685438116357672}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: 0.3333333333333286
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
- m_Version: 1
m_Start: 53.83333333333335
m_ClipIn: 0
m_Asset: {fileID: -8167784043181607141}
m_Duration: 6.166666666666667
m_TimeScale: 1
m_ParentTrack: {fileID: -2146233614790500777}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0.3333333333333286
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 1
m_PreExtrapolationMode: 1
m_PostExtrapolationTime: Infinity
m_PreExtrapolationTime: 0
m_DisplayName: ani_s_discuss02_a001_loop
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 0
m_InfiniteClipPostExtrapolation: 0
m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
m_InfiniteClipTimeOffset: 0
m_InfiniteClipRemoveOffset: 0
m_InfiniteClipApplyFootIK: 1
mInfiniteClipLoop: 0
m_MatchTargetFields: 63
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
m_InfiniteClip: {fileID: 0}
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &-732373543025971121
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-147943125549348379
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
m_Name: show_main_3
m_EditorClassIdentifier:
m_Version: 0
m_Tracks:
- {fileID: -2146233614790500777}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 0}
--- !u!114 &4647887568012060173
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &7222357771163648985
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &7685483706063963616
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &7760006191662008137
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &8255932673281005732
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
m_Name: AnimationPlayableAsset(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
m_Clip: {fileID: -6004787696405322892, guid: c60902b974f1bd542a89f3d480828d6a, type: 3}
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_UseTrackMatchFields: 1
m_MatchTargetFields: 63
m_RemoveStartOffset: 1
m_ApplyFootIK: 1
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f66ccad9c37abd04fbb71535019660d6 guid: 97a8a8d6bc36041418f862e66ee9134e
folderAsset: yes NativeFormatImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: dc424db43cc23734eb2b1dd10c3aaae9 guid: 902de9db4a6946b4aa7a9e61d1b10fa5
folderAsset: yes NativeFormatImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b1c023fac658fd14a836e0fd028bab9b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 282c6804c526ac44a93d4811addf13b8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,26 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b7c3aa9251a69b94c98c2c3fe81c01a2, type: 3}
m_Name: ShowTimelineCollector
m_EditorClassIdentifier:
listAllTimelineAssetPath:
- Assets/Art/Show/Camp/show_camp_1.playable
- Assets/Art/Show/Camp/show_camp_2.playable
- Assets/Art/Show/Camp/show_camp_3.playable
- Assets/Art/Show/Camp/show_camp_4.playable
- Assets/Art/Show/Camp/show_camp_5.playable
- Assets/Art/Show/Main/show_main_1.playable
- Assets/Art/Show/Main/show_main_2.playable
- Assets/Art/Show/Main/show_main_3.playable
- Assets/Art/Show/Main/show_main_4.playable
- Assets/Art/Show/Main/show_main_5.playable
- Assets/Art/Show/Main/show_main_6.playable

View File

@ -484,12 +484,12 @@ MonoBehaviour:
FilterRuleName: CollectPrefab FilterRuleName: CollectPrefab
AssetTags: AssetTags:
UserData: UserData:
- GroupName: Camp - GroupName: Show
GroupDesc: GroupDesc:
AssetTags: AssetTags:
ActiveRuleName: EnableGroup ActiveRuleName: EnableGroup
Collectors: Collectors:
- CollectPath: Assets/Art/Camp - CollectPath: Assets/Art/Show
CollectorGUID: c072f7dfa8197734fa36f3e8dbeff83f CollectorGUID: c072f7dfa8197734fa36f3e8dbeff83f
CollectorType: 0 CollectorType: 0
AddressRuleName: AddressByFileName AddressRuleName: AddressByFileName

View File

@ -34,9 +34,9 @@ public partial class CampManager
private EProcess curProcess = EProcess.None; private EProcess curProcess = EProcess.None;
/// <summary> /// <summary>
/// 营地演出管理器 /// 演出管理器
/// </summary> /// </summary>
private CampShowManager campShowManager; private ShowManager showManager;
public async void EnterCamp() public async void EnterCamp()
{ {
@ -51,8 +51,8 @@ public partial class CampManager
UISceneResult uiSceneResult = await OpenUIWithScene(UINameConst.UI_Camp, Framework.Constants.CAMP_SCENE_PATH, null, false); UISceneResult uiSceneResult = await OpenUIWithScene(UINameConst.UI_Camp, Framework.Constants.CAMP_SCENE_PATH, null, false);
curProcess = EProcess.RefreshCamp; curProcess = EProcess.RefreshCamp;
campShowManager = GetSceneRootComponent<CampShowManager>(uiSceneResult.sceneHandle.Scene); showManager = GetSceneRootComponent<ShowManager>(uiSceneResult.sceneHandle.Scene);
if (campShowManager == null) if (showManager == null)
{ {
DebugUtil.LogError($"无法进入营地场景campSceneManager不存在,scene path:{Framework.Constants.CAMP_SCENE_PATH}"); DebugUtil.LogError($"无法进入营地场景campSceneManager不存在,scene path:{Framework.Constants.CAMP_SCENE_PATH}");
curProcess = EProcess.None; curProcess = EProcess.None;
@ -60,7 +60,7 @@ public partial class CampManager
return; return;
} }
await campShowManager.RefreshShow(); await showManager.RefreshShow();
curProcess = EProcess.Present; curProcess = EProcess.Present;
} }
@ -84,7 +84,7 @@ public partial class CampManager
EProcess.None => 0f, EProcess.None => 0f,
EProcess.LoadingScene => GameSceneManager.Instance.GetSceneLoadingProgress(Framework.Constants.CAMP_SCENE_PATH) * 0.5f, EProcess.LoadingScene => GameSceneManager.Instance.GetSceneLoadingProgress(Framework.Constants.CAMP_SCENE_PATH) * 0.5f,
EProcess.LoadingUI => 60f, EProcess.LoadingUI => 60f,
EProcess.RefreshCamp => 60f + campShowManager.GetRefreshProcess() * 40f, EProcess.RefreshCamp => 60f + showManager.GetRefreshProcess() * 40f,
EProcess.Present => 100f, EProcess.Present => 100f,
_ => 0f, _ => 0f,
}; };

View File

@ -1,77 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using PhxhSDK;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Timeline;
#if UNITY_EDITOR
using UnityEditor;
#endif
//[CreateAssetMenu(menuName = "营地TimeLine收集")]
public class CampTimeLineCollector : ScriptableObject
{
private const string PATH = "Assets/Art/Camp/CampTimeLineCollector.asset";
private static CampTimeLineCollector _instance;
public static CampTimeLineCollector Instance =>
_instance ??= AssetManager.Instance.LoadAsset<CampTimeLineCollector>(PATH);
[ReadOnly]
[SerializeField]
private List<string> _allTimelineAssetPaths = new();
private Dictionary<int, string> _timelineID2Path = new();
private void Awake()
{
_timelineID2Path.Clear();
foreach (var path in _allTimelineAssetPaths)
{
var timeLineName = Path.GetFileNameWithoutExtension(path);
var index = timeLineName.LastIndexOf("_", StringComparison.Ordinal);
if (index < 0)
{
DebugUtil.LogError($"timeline名字中找不到_path:{path}");
continue;
}
var idStr = timeLineName[(index + 1)..];
if (!int.TryParse(idStr, out var id))
{
DebugUtil.LogError($"timeline名字中找不到idpath:{path}");
continue;
}
_timelineID2Path.Add(id, path);
}
}
public string this[int id] => _timelineID2Path.GetValueOrDefault(id);
#if UNITY_EDITOR
[MenuItem("Tools/营地/收集所有TimeLine")]
private static void CollectAllTimeLineInMenu()
{
Instance.CollectAllTimeLine();
}
public void CollectAllTimeLine()
{
EditorUtility.SetDirty(this);
_allTimelineAssetPaths.Clear();
var guids = AssetDatabase.FindAssets("t:TimelineAsset", new[] { "Assets/Art/Camp/Timeline" });
foreach (var guid in guids)
{
var path = AssetDatabase.GUIDToAssetPath(guid);
_allTimelineAssetPaths.Add(path);
}
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}
#endif
}

View File

@ -24,15 +24,15 @@ namespace Gameplay
UISceneResult uiSceneResult = await OpenUIWithScene(UINameConst.UI_MainPanel, scenePath, null, false, UISceneResult uiSceneResult = await OpenUIWithScene(UINameConst.UI_MainPanel, scenePath, null, false,
LoadSceneMode.Single); LoadSceneMode.Single);
MainShowManager mainShowManager = GetSceneRootComponent<MainShowManager>(uiSceneResult.sceneHandle.Scene); ShowManager showManager = GetSceneRootComponent<ShowManager>(uiSceneResult.sceneHandle.Scene);
if (mainShowManager == null) if (showManager == null)
{ {
DebugUtil.LogError($"无法进入主场景,mainShowManager不存在,scene path:{scenePath}"); DebugUtil.LogError($"无法进入主场景,{typeof(ShowManager).Name}不存在,scene path:{scenePath}");
return LoadingResult.ErrorTest; return LoadingResult.ErrorTest;
} }
await mainShowManager.RefreshShow(); await showManager.RefreshShow();
_destProgress = 100f; _destProgress = 100f;
EventManager.Instance.Send(EventManager.EventName.CheckNeedShowSignUp); EventManager.Instance.Send(EventManager.EventName.CheckNeedShowSignUp);

View File

@ -1,15 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using cfg.ShowCfg;
/// <summary>
/// 营地演出管理
/// </summary>
public class CampShowManager : ShowManager
{
protected override E_ShowSceneType ShowSceneType
{
get { return E_ShowSceneType.Camp; }
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 20df75fffc984b44ca1450867e104ba8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,12 +0,0 @@
using cfg.PlayerSkillCfg;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// 演出接口
/// </summary>
public interface IShow
{
PlayerSkillType skillType { get; }
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 3d31afa5cc3a88d4096ad2bf7aab2738
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,142 +0,0 @@
using cfg.PlayerSkillCfg;
using cfg.ShowCfg;
using Cysharp.Threading.Tasks;
using Gameplay;
using Sirenix.OdinInspector;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Playables;
using UnityEngine.Timeline;
/// <summary>
/// 主场景演出管理
/// </summary>
public class MainShowManager : ShowManager
{
/// <summary>
/// 主场景演出点结果
/// </summary>
public class MainShowPointResult
{
/// <summary>
/// 演出点索引
/// </summary>
public int showPointIndex;
/// <summary>
/// 角色数据
/// </summary>
public CharacterDataInfo characterDataInfo;
}
/// <summary>
/// Timeline
/// </summary>
[LabelText("Timeline")]
[SerializeField]
private PlayableDirector playableDirector;
/// <summary>
/// 最终的主场景演出点数据
/// </summary>
private readonly List<MainShowPointResult> listMainShowPointResult = new();
/// <summary>
/// Timeline绑定
/// </summary>
private readonly Dictionary<int, Object> dicTimelineBinding = new();
protected override E_ShowSceneType ShowSceneType
{
get { return E_ShowSceneType.Main; }
}
protected override void Awake()
{
base.Awake();
if (!CommonUtils.IsInGame())
return;
if (playableDirector == null || playableDirector.playableAsset == null)
{
DebugUtil.LogError("空数据");
return;
}
int i = 0;
foreach (PlayableBinding playableBinding in playableDirector.playableAsset.outputs)
{
dicTimelineBinding.Add(i, playableBinding.sourceObject);
++i;
}
}
/// <summary>
/// 刷新演出
/// </summary>
/// <returns></returns>
public override async UniTask RefreshShow()
{
ExtractShowCharacter();
await ExecuteShowResult();
}
/// <summary>
/// 抽取演出角色
/// </summary>
/// <exception cref="System.NotImplementedException"></exception>
protected override void ExtractShowCharacter()
{
base.ExtractShowCharacter();
listMainShowPointResult.Clear();
CharacterDataInfo[] characterDataInfos = CommonUtils.GetRandomItems(listRemindCharacter, CharacterMaxCount);
int[] pointIndexs = (int[])CommonUtils.GetRandomList(0, listShowPoint.Count - 1);
for (int i = 0; i < characterDataInfos.Length; ++i)
{
MainShowPointResult mainShowPointResult = new()
{
showPointIndex = pointIndexs[i],
characterDataInfo = characterDataInfos[i],
};
listMainShowPointResult.Add(mainShowPointResult);
}
}
/// <summary>
/// 执行演出结果
/// </summary>
/// <exception cref="System.NotImplementedException"></exception>
protected override async UniTask ExecuteShowResult()
{
if (playableDirector == null || playableDirector.playableAsset == null)
{
DebugUtil.LogError("空数据");
return;
}
for (int i = 0; i < listMainShowPointResult.Count; ++i)
{
MainShowPointResult result = listMainShowPointResult[i];
Transform tsShowPoint = listShowPoint[result.showPointIndex].transform;
if (tsShowPoint == null)
return;
GameObject goModel = await GetModel(result.characterDataInfo);
if (goModel == null)
continue;
goModel.transform.SetPositionAndRotation(tsShowPoint.position, tsShowPoint.rotation);
if (goModel.TryGetComponent(out PlayableDirector director)) // 禁用角色自身的Timeline
director.enabled = false;
if (dicTimelineBinding.TryGetValue(result.showPointIndex, out Object sourceObject))
playableDirector.SetGenericBinding(sourceObject, goModel.GetComponentInChildren<Animator>());
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: a0d5ea7f416a128408c6b330eac1d0f9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,4 @@
using cfg.PlayerSkillCfg;
using cfg.ShowCfg; using cfg.ShowCfg;
using CodeStage.AntiCheat.EditorCode.ICSharpCode.SharpZipLib.Zip;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using Framework; using Framework;
using Gameplay; using Gameplay;
@ -8,13 +6,9 @@ using PhxhSDK;
using Sirenix.OdinInspector; using Sirenix.OdinInspector;
using SRF; using SRF;
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.Playables; using UnityEngine.Playables;
using UnityEngine.Serialization;
using UnityEngine.Timeline; using UnityEngine.Timeline;
using static ShowManager; using static ShowManager;
using Object = UnityEngine.Object; using Object = UnityEngine.Object;
@ -22,7 +16,7 @@ using Object = UnityEngine.Object;
/// <summary> /// <summary>
/// 演出管理器 /// 演出管理器
/// </summary> /// </summary>
public abstract class ShowManager : MonoBehaviour public sealed class ShowManager : MonoBehaviour
{ {
/// <summary> /// <summary>
/// 当前状态 /// 当前状态
@ -67,6 +61,13 @@ public abstract class ShowManager : MonoBehaviour
} }
#region 外部序列化字段 #region 外部序列化字段
/// <summary>
/// 演出场景类型
/// </summary>
[LabelText("演出场景类型")]
[SerializeField]
private E_ShowSceneType ShowSceneType;
/// <summary> /// <summary>
/// 角色根节点 /// 角色根节点
/// </summary> /// </summary>
@ -93,7 +94,7 @@ public abstract class ShowManager : MonoBehaviour
/// </summary> /// </summary>
[LabelText("是否忽略看板娘")] [LabelText("是否忽略看板娘")]
[SerializeField] [SerializeField]
protected bool IsIgnoreKanbanban; private bool IsIgnoreKanbanban;
/// <summary> /// <summary>
/// 抽取记录 /// 抽取记录
@ -106,30 +107,22 @@ public abstract class ShowManager : MonoBehaviour
#endregion #endregion
/// <summary> /// <summary>
/// 所有演出点 /// 当前场景所有演出点
/// </summary> /// </summary>
protected List<Transform> listShowPoint; private List<Transform> listShowPoint;
/// <summary> /// <summary>
/// 可以抽取的演出组数据 /// 当前场景所有演出组字典 key:组id value:演出组数据
/// </summary> /// </summary>
private readonly List<ShowGroupData> listRemindCampShowConfigGroup = new(); private readonly Dictionary<int, ShowGroupData> dicShowGroup = new();
/// <summary> /// <summary>
/// 可以抽取演出的角色数据 /// 最终的演出点数据
/// </summary> /// </summary>
protected readonly List<CharacterDataInfo> listRemindCharacter = new(); protected readonly List<ShowPointResult> listShowPointResult = new();
/// <summary>
/// 演出组字典 key:组id value:演出组数据
/// </summary>
private readonly Dictionary<int, ShowGroupData> dicShowConfigGroup = new();
/// <summary>
/// 最终的营地演出点数据
/// </summary>
private readonly List<CampShowPointResult> listCampShowPointResult = new();
/// <summary> /// <summary>
/// Timeline资源字典 /// Timeline资源字典
/// </summary> /// </summary>
private readonly Dictionary<int, TimelineAsset> dicTimeLineAsset = new(); private readonly Dictionary<int, TimelineAsset> dicTimeLineAsset = new();
/// <summary> /// <summary>
/// 已经加载的资源集合 /// 已经加载的资源集合
/// </summary> /// </summary>
@ -142,10 +135,33 @@ public abstract class ShowManager : MonoBehaviour
/// 当前状态 /// 当前状态
/// </summary> /// </summary>
private E_CurState currState = E_CurState.None; private E_CurState currState = E_CurState.None;
#region (刷新数据,抽取)过程临时变量
/// <summary> /// <summary>
/// 演出场景类型 /// 可以抽取的演出组数据(排序用)
/// </summary> /// </summary>
protected abstract E_ShowSceneType ShowSceneType { get; } private List<ShowGroupData> listRemindShowGroup = new();
/// <summary>
/// 可以抽取演出的角色数据(排序用)
/// </summary>
protected List<CharacterDataInfo> listRemindCharacter = new();
/// <summary>
/// 随机抽取的演出组链表
/// </summary>
private LinkedList<ShowGroupData> linkShowGroup;
/// <summary>
/// 随机抽取的角色链表
/// </summary>
private LinkedList<CharacterDataInfo> linkCharacter;
/// <summary>
/// 已经抽取的演出点索引集合
/// </summary>
private readonly HashSet<int> setUseShowPointIndex = new();
/// <summary>
/// 已经抽取的角色id
/// </summary>
private readonly HashSet<int> setUseCharactrtId = new();
#endregion
/// <summary> /// <summary>
/// 可以抽取的角色最大数量 /// 可以抽取的角色最大数量
@ -165,7 +181,7 @@ public abstract class ShowManager : MonoBehaviour
} }
#endif #endif
protected virtual void Awake() private void Awake()
{ {
if (!CommonUtils.IsInGame()) if (!CommonUtils.IsInGame())
return; return;
@ -196,25 +212,25 @@ public abstract class ShowManager : MonoBehaviour
continue; continue;
int groupID = showConfig.GroupID; int groupID = showConfig.GroupID;
if (!dicShowConfigGroup.TryGetValue(groupID, out ShowGroupData group)) if (!dicShowGroup.TryGetValue(groupID, out ShowGroupData group))
{ {
group = new(groupID); group = new(groupID);
dicShowConfigGroup.Add(groupID, group); dicShowGroup.Add(groupID, group);
} }
group.Add(showConfig); group.Add(showConfig);
} }
foreach (ShowGroupData group in dicShowConfigGroup.Values) foreach (ShowGroupData group in dicShowGroup.Values)
{ {
group.Sort(); group.Shuffle();
} }
#endregion #endregion
#endregion #endregion
} }
protected virtual void OnDestroy() private void OnDestroy()
{ {
foreach (string path in setAssetToUnload) foreach (string path in setAssetToUnload)
{ {
@ -225,7 +241,7 @@ public abstract class ShowManager : MonoBehaviour
/// <summary> /// <summary>
/// 刷新演出 /// 刷新演出
/// </summary> /// </summary>
public virtual async UniTask RefreshShow() public async UniTask RefreshShow()
{ {
currState = E_CurState.LoadingCharacters; currState = E_CurState.LoadingCharacters;
@ -239,12 +255,12 @@ public abstract class ShowManager : MonoBehaviour
/// <summary> /// <summary>
/// 刷新演出数据 /// 刷新演出数据
/// </summary> /// </summary>
protected virtual void RefreshShowData() private void RefreshShowData()
{ {
listRemindCampShowConfigGroup.Clear(); listRemindShowGroup.Clear();
listRemindCharacter.Clear(); listRemindCharacter.Clear();
listRemindCampShowConfigGroup.AddRange(dicShowConfigGroup.Values); listRemindShowGroup.AddRange(dicShowGroup.Values);
foreach (CharacterDataInfo characterDataInfo in CharacterDataInfoManager.Instance.DataList) foreach (CharacterDataInfo characterDataInfo in CharacterDataInfoManager.Instance.DataList)
{ {
@ -254,51 +270,49 @@ public abstract class ShowManager : MonoBehaviour
} }
listRemindCharacter.Add(characterDataInfo); listRemindCharacter.Add(characterDataInfo);
} }
CommonUtils.Shuffle(listRemindShowGroup);
CommonUtils.Shuffle(listRemindCharacter);
linkShowGroup = new(listRemindShowGroup);
linkCharacter = new(listRemindCharacter);
} }
/// <summary> /// <summary>
/// 抽取演出角色 /// 抽取演出角色
/// </summary> /// </summary>
protected virtual void ExtractShowCharacter() private void ExtractShowCharacter()
{ {
listExtractRecord.Clear(); listExtractRecord.Clear();
listCampShowPointResult.Clear(); listShowPointResult.Clear();
List<CampShowPointResult> listTempResult = new(); List<ShowPointResult> listTempResult = new(); // 临时存放抽取的结果
while (listCampShowPointResult.Count < CharacterMaxCount)
while (linkShowGroup.First != null)
{ {
ShowGroupData randomGroup = CommonUtils.GetRandomItem(listRemindCampShowConfigGroup, true); ShowGroupData groupData = linkShowGroup.First.Value;
if (randomGroup == null) // 如果所有组都抽完了,则直接返回 linkShowGroup.RemoveFirst();
return;
ExtractRecord record = new() // 如果组里的演出点和当前已经使用的演出点重复,则踢出该组
if (IsShowPointExist(groupData))
{ {
groupID = randomGroup.GroupID listExtractRecord.Add(new ExtractRecord(groupData.GroupID, E_DisposeReason.ShowPointRepeat));
};
listExtractRecord.Add(record);
// 如果组里的演出点和当前已经使用的演出点重复,则跳过该组
if (IsShowPointExist(randomGroup))
{
record.isDispose = true;
record.disposeReason = E_DisposeReason.ShowPointRepeat;
continue; continue;
} }
// 如果组里有限定演员,但演员已使用,则跳过该组 // 如果是固定角色的组的角色已经被使用,则踢出该组
if (!CanUseCharacter(randomGroup)) if (!IsCanUseFixCharacter(groupData))
{ {
record.isDispose = true; listExtractRecord.Add(new ExtractRecord(groupData.GroupID, E_DisposeReason.FixedCharacterNotExist));
record.disposeReason = E_DisposeReason.FixedCharacterNotExist;
continue; continue;
} }
// 临时存放抽取的结果
listTempResult.Clear(); listTempResult.Clear();
foreach (DataShowConfig dataShowConfig in randomGroup.ListConfig) ExtractRecord extractRecord = new(groupData.GroupID, E_DisposeReason.None);
foreach (DataShowConfig dataShowConfig in groupData.ListConfig)
{ {
// 如果当前没有剩余的演员,则直接跳出抽取 // 如果当前没有剩余的演员,则直接跳出抽取
if (listRemindCharacter.Count == 0) if (linkCharacter.First == null)
break; break;
// 抽取timeline // 抽取timeline
@ -307,77 +321,95 @@ public abstract class ShowManager : MonoBehaviour
{ {
timelineID = timelineID timelineID = timelineID
}; };
record.listRecord.Add(singlePointRecord); extractRecord.Add(singlePointRecord);
if (timelineID == 0) // 说明不站人 if (timelineID == 0) // 说明不站人
continue; continue;
#region 角色抽取
CharacterDataInfo characterDataInfo = null; CharacterDataInfo characterDataInfo = null;
if (ValueValidator.IsIdValid(dataShowConfig.CharacterID)) // 抽取指定演员 if (ValueValidator.IsIdValid(dataShowConfig.CharacterID)) // 抽取指定演员
{ {
int index = listRemindCharacter.FindIndex(characterInfo => characterInfo.ID == dataShowConfig.CharacterID); foreach (CharacterDataInfo character in linkCharacter)
characterDataInfo = listRemindCharacter[index]; {
listRemindCharacter.RemoveAt(index); if ((int)character.ID == dataShowConfig.CharacterID)
} {
else // 随机抽取演员 characterDataInfo = character;
characterDataInfo = CommonUtils.GetRandomItem(listRemindCharacter, true); break;
}
}
CampShowPointResult result = new() if (characterDataInfo == null)
continue;
else
linkCharacter.Remove(characterDataInfo);
}
else
{ {
groupID = randomGroup.GroupID, characterDataInfo = linkCharacter.First.Value;
showPoint = dataShowConfig.PointID, linkCharacter.RemoveFirst();
timelineID = timelineID, }
characterDataInfo = characterDataInfo #endregion
};
ShowPointResult result = new(groupData.GroupID, dataShowConfig.PointID, timelineID, characterDataInfo);
singlePointRecord.showPoint = dataShowConfig.PointID; singlePointRecord.showPoint = dataShowConfig.PointID;
singlePointRecord.characterID = characterDataInfo.ID; singlePointRecord.characterID = characterDataInfo.ID;
listTempResult.Add(result); listTempResult.Add(result);
} }
if (randomGroup.IsMustHasCharacter && listTempResult.Count < randomGroup.ListConfig.Count) if (groupData.IsMustHasCharacter && listTempResult.Count < groupData.ListConfig.Count)
{ {
// 如果该组必须满员但没满员 // 如果该组必须满员但没满员
// 取出来的CharacterDataInfo归还 // 取出来的CharacterDataInfo归还
foreach (CampShowPointResult result in listTempResult) foreach (ShowPointResult result in listTempResult)
{ {
listRemindCharacter.Add(result.characterDataInfo); listRemindCharacter.Add(result.CharacterData);
} }
record.isDispose = true; listExtractRecord.Add(new ExtractRecord(groupData.GroupID, E_DisposeReason.CharacterCountNotFull));
record.disposeReason = E_DisposeReason.CharacterCountNotFull;
} }
else // 添加到最后的result列表中 else // 添加到最后的result列表中
listCampShowPointResult.AddRange(listTempResult); {
foreach (ShowPointResult result in listTempResult)
{
listShowPointResult.Add(result);
setUseCharactrtId.Add((int)result.CharacterData.ID);
setUseShowPointIndex.Add(result.ShowPointIndex);
}
}
} }
}
setUseShowPointIndex.Clear();
setUseCharactrtId.Clear();
}
/// <summary> /// <summary>
/// 执行演出结果 /// 执行演出结果
/// </summary> /// </summary>
protected virtual async UniTask ExecuteShowResult() private async UniTask ExecuteShowResult()
{ {
if (listCampShowPointResult.Count == 0) if (listShowPointResult.Count == 0)
return; return;
foreach (CampShowPointResult result in listCampShowPointResult) foreach (ShowPointResult result in listShowPointResult)
{ {
int showPointID = result.showPoint; int showPointIndex = result.ShowPointIndex;
if (showPointID < 0 || showPointID >= listShowPoint.Count || listShowPoint[showPointID] == null) if (showPointIndex < 0 || showPointIndex >= listShowPoint.Count || listShowPoint[showPointIndex] == null)
{ {
DebugUtil.LogError($"找不到演出点!演出点ID:{showPointID}"); DebugUtil.LogError($"找不到演出点!演出点索引:{showPointIndex}");
continue; continue;
} }
Transform tsShowPoint = listShowPoint[showPointID].transform; Transform tsShowPoint = listShowPoint[showPointIndex].transform;
GameObject goModel = await GetModel(result.characterDataInfo); GameObject goModel = await GetModel(result.CharacterData);
if (goModel == null) if (goModel == null)
continue; continue;
goModel.transform.SetPositionAndRotation(tsShowPoint.position, tsShowPoint.rotation); goModel.transform.SetPositionAndRotation(tsShowPoint.position, tsShowPoint.rotation);
TimelineAsset timelineAsset = await GetTimeLineAsset(result.timelineID); TimelineAsset timelineAsset = await GetTimeLineAsset(result.TimelineID);
if (timelineAsset == null) if (timelineAsset == null)
continue; continue;
@ -404,7 +436,7 @@ public abstract class ShowManager : MonoBehaviour
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <param name="path"></param> /// <param name="path"></param>
/// <returns></returns> /// <returns></returns>
protected async UniTask<T> LoadAssetAsync<T>(string path) where T : Object private async UniTask<T> LoadAssetAsync<T>(string path) where T : Object
{ {
T res = await AssetManager.Instance.LoadAssetAsync<T>(path); T res = await AssetManager.Instance.LoadAssetAsync<T>(path);
if (res != null) if (res != null)
@ -418,7 +450,7 @@ public abstract class ShowManager : MonoBehaviour
/// </summary> /// </summary>
/// <param name="characterDataInfo"></param> /// <param name="characterDataInfo"></param>
/// <returns></returns> /// <returns></returns>
protected async UniTask<GameObject> GetModel(CharacterDataInfo characterDataInfo) private async UniTask<GameObject> GetModel(CharacterDataInfo characterDataInfo)
{ {
if (!dicCharacterModel.TryGetValue(characterDataInfo, out GameObject goModel)) if (!dicCharacterModel.TryGetValue(characterDataInfo, out GameObject goModel))
{ {
@ -448,7 +480,7 @@ public abstract class ShowManager : MonoBehaviour
{ {
if (!dicTimeLineAsset.TryGetValue(timelineID, out TimelineAsset timelineAsset)) if (!dicTimeLineAsset.TryGetValue(timelineID, out TimelineAsset timelineAsset))
{ {
string timelinePath = CampTimeLineCollector.Instance[timelineID]; string timelinePath = CampTimeLineCollector.Instance[ShowSceneType, timelineID];
if (string.IsNullOrWhiteSpace(timelinePath)) if (string.IsNullOrWhiteSpace(timelinePath))
{ {
DebugUtil.LogError($"找不到timelinePath,id:{timelineID}"); DebugUtil.LogError($"找不到timelinePath,id:{timelineID}");
@ -475,27 +507,39 @@ public abstract class ShowManager : MonoBehaviour
/// <returns></returns> /// <returns></returns>
private bool IsShowPointExist(ShowGroupData group) private bool IsShowPointExist(ShowGroupData group)
{ {
return group.ListConfig.Any(cfg => IsShowPointExist(cfg.PointID)); foreach (DataShowConfig showConfig in group.ListConfig)
{
if (setUseShowPointIndex.Contains(showConfig.PointID))
return true;
}
return false;
} }
/// <summary> /// <summary>
/// 根据id判断演出点是否重复 /// 是否可以使用限定角色
/// </summary> /// </summary>
/// <param name="showPointID"></param> /// <param name="group"></param>
/// <returns></returns> /// <returns></returns>
private bool IsShowPointExist(int showPointID) private bool IsCanUseFixCharacter(ShowGroupData group)
{ {
return listCampShowPointResult.Any(result => result.showPoint == showPointID); foreach(DataShowConfig showConfig in group.ListConfig)
{
if (!ValueValidator.IsIdValid(showConfig.CharacterID) && !IsCanUseCharacter(showConfig.CharacterID))
return false;
}
return true;
} }
private bool CanUseCharacter(ShowGroupData group) /// <summary>
/// 角色是否可用
/// </summary>
/// <param name="characterId"></param>
/// <returns></returns>
private bool IsCanUseCharacter(int characterId)
{ {
return !group.ListConfig.Any(cfg => ValueValidator.IsIdValid(cfg.CharacterID) && !CanUseCharacter(cfg.CharacterID)); return !setUseCharactrtId.Contains(characterId);
}
private bool CanUseCharacter(int characterID)
{
return listRemindCharacter.Any(characterInfo => characterInfo.ID == characterID);
} }
/// <summary> /// <summary>
@ -507,7 +551,7 @@ public abstract class ShowManager : MonoBehaviour
return currState switch return currState switch
{ {
E_CurState.None => 0f, E_CurState.None => 0f,
E_CurState.LoadingCharacters => (float)listCampShowPointResult.Count / CharacterMaxCount, E_CurState.LoadingCharacters => (float)listShowPointResult.Count / CharacterMaxCount,
E_CurState.Present => 1f, E_CurState.Present => 1f,
_ => 0f, _ => 0f,
}; };
@ -518,13 +562,13 @@ public abstract class ShowManager : MonoBehaviour
/// 抽取流程的记录 /// 抽取流程的记录
/// </summary> /// </summary>
[Serializable] [Serializable]
public class ExtractRecord public struct ExtractRecord
{ {
/// <summary> /// <summary>
/// 单个演出点记录 /// 单个演出点记录
/// </summary> /// </summary>
[Serializable] [Serializable]
public class SinglePointRecord public struct SinglePointRecord
{ {
[LabelText("演出点ID")] [LabelText("演出点ID")]
public int showPoint; public int showPoint;
@ -535,28 +579,38 @@ public class ExtractRecord
} }
[LabelText("组ID")] [LabelText("组ID")]
public int groupID; private int groupID;
[LabelText("是否抛弃")]
public bool isDispose;
[LabelText("抛弃原因")] [LabelText("抛弃原因")]
[ShowIf("isDispose")] [ShowIf("isDispose")]
public E_DisposeReason disposeReason; private E_DisposeReason disposeReason;
[LabelText("角色记录")] [LabelText("角色记录")]
public List<SinglePointRecord> listRecord = new(); private List<SinglePointRecord> listRecord;
public ExtractRecord(int groupID, E_DisposeReason disposeReason)
{
this.groupID = groupID;
this.disposeReason = disposeReason;
listRecord = new();
}
public readonly void Add(SinglePointRecord singlePointRecord)
{
listRecord.Add(singlePointRecord);
}
} }
/// <summary> /// <summary>
/// 演出组数据 /// 演出组数据
/// </summary> /// </summary>
public class ShowGroupData public struct ShowGroupData
{ {
/// <summary> /// <summary>
/// 演出组id /// 演出组id
/// </summary> /// </summary>
private int groupId; private readonly int groupId;
/// <summary> /// <summary>
/// 是否必须有角色 /// 是否必须有角色
/// </summary> /// </summary>
@ -564,12 +618,12 @@ public class ShowGroupData
/// <summary> /// <summary>
/// 该组演出点配置数据 /// 该组演出点配置数据
/// </summary> /// </summary>
private readonly List<DataShowConfig> listConfig = new(); private readonly List<DataShowConfig> listConfig;
/// <summary> /// <summary>
/// 演出组id /// 演出组id
/// </summary> /// </summary>
public int GroupID public readonly int GroupID
{ {
get { return groupId; } get { return groupId; }
} }
@ -577,12 +631,12 @@ public class ShowGroupData
/// <summary> /// <summary>
/// 是否必须有角色 /// 是否必须有角色
/// </summary> /// </summary>
public bool IsMustHasCharacter { get { return isMustHasCharacter; } } public readonly bool IsMustHasCharacter { get { return isMustHasCharacter; } }
/// <summary> /// <summary>
/// 该组演出点配置数据 /// 该组演出点配置数据
/// </summary> /// </summary>
public List<DataShowConfig> ListConfig public readonly List<DataShowConfig> ListConfig
{ {
get { return listConfig; } get { return listConfig; }
} }
@ -592,6 +646,7 @@ public class ShowGroupData
this.groupId = groupId; this.groupId = groupId;
isMustHasCharacter = false; isMustHasCharacter = false;
listConfig = new();
} }
public void Add(DataShowConfig dataShowConfig) public void Add(DataShowConfig dataShowConfig)
@ -601,36 +656,61 @@ public class ShowGroupData
} }
/// <summary> /// <summary>
/// 有指定id的排前面 /// 打乱顺序
/// </summary> /// </summary>
public void Sort() public readonly void Shuffle()
{ {
listConfig.Sort((a, b) => b.CharacterID.CompareTo(a.CharacterID)); CommonUtils.Shuffle(listConfig);
} }
} }
/// <summary> /// <summary>
/// 阵营演出点结果 /// 演出点结果
/// </summary> /// </summary>
public class CampShowPointResult public readonly struct ShowPointResult
{ {
/// <summary> /// <summary>
/// 演出组id /// 演出组id
/// </summary> /// </summary>
public int groupID; private readonly int groupID;
/// <summary> /// <summary>
/// 演出点 /// 演出点索引
/// </summary> /// </summary>
public int showPoint; private readonly int showPointIndex;
/// <summary> /// <summary>
/// Timelineid /// Timelineid
/// </summary> /// </summary>
public int timelineID; private readonly int timelineID;
/// <summary> /// <summary>
/// 角色数据 /// 角色数据
/// </summary> /// </summary>
public CharacterDataInfo characterDataInfo; private readonly CharacterDataInfo characterData;
public int GroupID
{
get { return groupID; }
}
public int ShowPointIndex
{
get { return showPointIndex; }
}
public int TimelineID
{
get { return timelineID; }
}
public CharacterDataInfo CharacterData
{
get { return characterData; }
}
public ShowPointResult(int groupID, int showPointIndex, int timelineID, CharacterDataInfo characterData)
{
this.groupID = groupID;
this.showPointIndex = showPointIndex;
this.timelineID = timelineID;
this.characterData = characterData;
}
} }

View File

@ -0,0 +1,125 @@
using System;
using System.Collections.Generic;
using System.IO;
using PhxhSDK;
using Sirenix.OdinInspector;
using UnityEngine;
using cfg.ShowCfg;
#if UNITY_EDITOR
using UnityEditor;
#endif
[CreateAssetMenu(menuName = "演出TimeLine收集")]
public class CampTimeLineCollector : ScriptableObject
{
private const string PATH = "Assets/Art/Show/ShowTimelineCollector.asset";
private static CampTimeLineCollector instance;
public static CampTimeLineCollector Instance
{
get
{
if (instance == null)
{
instance = AssetManager.Instance.LoadAsset<CampTimeLineCollector>(PATH);
instance.Init();
}
return instance;
}
}
/// <summary>
/// 所有Timeline资源路径
/// </summary>
[ReadOnly]
[SerializeField]
private List<string> listAllTimelineAssetPath = new();
/// <summary>
/// 外层key演出场景类型内层keyTimeline的IDvalue:资源路径
/// </summary>
private readonly Dictionary<E_ShowSceneType, Dictionary<int, string>> dicShowTimeline = new();
public string this[E_ShowSceneType type, int id]
{
get
{
if (!dicShowTimeline.TryGetValue(type, out var dicTimeline))
{
DebugUtil.LogError("不存在的演出场景类型");
return string.Empty;
}
if (!dicTimeline.TryGetValue(id, out string path))
{
DebugUtil.LogError("不存在的TimelineId");
return string.Empty;
}
return path;
}
}
private void Init()
{
dicShowTimeline.Clear();
foreach (string path in listAllTimelineAssetPath)
{
DirectoryInfo directoryInfo = new(path);
if (!Enum.TryParse(directoryInfo.Parent.Name, false, out E_ShowSceneType result))
{
DebugUtil.LogError($"timeline文件夹错误没有和{typeof(E_ShowSceneType).Name}对应");
continue;
}
string timeLineName = Path.GetFileNameWithoutExtension(path);
int index = timeLineName.LastIndexOf("_", StringComparison.Ordinal);
if (index < 0)
{
DebugUtil.LogError($"timeline名字中找不到_path:{path}");
continue;
}
string idStr = timeLineName[(index + 1)..];
if (!int.TryParse(idStr, out int id))
{
DebugUtil.LogError($"timeline名字中找不到idpath:{path}");
continue;
}
if (!dicShowTimeline.TryGetValue(result, out var dicTimeline))
{
dicTimeline = new Dictionary<int, string>();
dicShowTimeline.Add(result, dicTimeline);
}
dicTimeline.Add(id, path);
}
}
#if UNITY_EDITOR
[MenuItem("Tools/演出/收集所有Timeline")]
private static void CollectAllTimeLineInMenu()
{
Instance.CollectAllTimeLine();
}
public void CollectAllTimeLine()
{
EditorUtility.SetDirty(this);
listAllTimelineAssetPath.Clear();
string[] guids = AssetDatabase.FindAssets("t:TimelineAsset", new[] { "Assets/Art/Show" });
foreach (string guid in guids)
{
string path = AssetDatabase.GUIDToAssetPath(guid);
listAllTimelineAssetPath.Add(path);
}
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}
#endif
}

View File

@ -690,7 +690,7 @@ namespace Gameplay
arr[i] = beginInt + i; arr[i] = beginInt + i;
} }
arr = Shuffle(arr); Shuffle(arr);
return arr; return arr;
} }
@ -1411,7 +1411,7 @@ namespace Gameplay
IList<T> listValue = new T[count]; IList<T> listValue = new T[count];
list = Shuffle(list); Shuffle(list);
for (int i = 0; i < listValue.Count; ++i) for (int i = 0; i < listValue.Count; ++i)
{ {
@ -1427,12 +1427,12 @@ namespace Gameplay
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <param name="list"></param> /// <param name="list"></param>
/// <returns></returns> /// <returns></returns>
public static IList<T> Shuffle<T>(IList<T> list) public static void Shuffle<T>(IList<T> list)
{ {
if (list == null) if (list == null)
{ {
DebugUtil.LogError("空数据"); DebugUtil.LogError("空数据");
return list; return;
} }
for (int i = list.Count - 1; i >= 0; --i) for (int i = list.Count - 1; i >= 0; --i)
@ -1443,8 +1443,6 @@ namespace Gameplay
(list[index], list[i]) = (list[i], list[index]); (list[index], list[i]) = (list[i], list[index]);
} }
return list;
} }
public static T GetSceneRootComponent<T>(Scene scene) where T : Component public static T GetSceneRootComponent<T>(Scene scene) where T : Component

View File

@ -17598,7 +17598,7 @@ GameObject:
- component: {fileID: 1257681355} - component: {fileID: 1257681355}
- component: {fileID: 1257681356} - component: {fileID: 1257681356}
m_Layer: 0 m_Layer: 0
m_Name: CampShowManager m_Name: ShowManager
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -17628,9 +17628,10 @@ MonoBehaviour:
m_GameObject: {fileID: 1257681354} m_GameObject: {fileID: 1257681354}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 20df75fffc984b44ca1450867e104ba8, type: 3} m_Script: {fileID: 11500000, guid: 57012a906036c894f89473379533acf7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ShowSceneType: 0
tsCharacterRoot: {fileID: 2008262905} tsCharacterRoot: {fileID: 2008262905}
tsShowPointRoot: {fileID: 1608561687} tsShowPointRoot: {fileID: 1608561687}
characterMaxCount: 20 characterMaxCount: 20

View File

@ -419,9 +419,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children: []
- {fileID: 1516697306}
- {fileID: 1688542927}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &158125597 --- !u!1 &158125597
@ -1121,79 +1119,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 1232725964} m_Father: {fileID: 1232725964}
m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0} m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0}
--- !u!1 &845641694
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 845641696}
- component: {fileID: 845641695}
m_Layer: 0
m_Name: Timeline
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!320 &845641695
PlayableDirector:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 845641694}
m_Enabled: 1
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: 7f0a0184cda76ee47a12f24d773dcdc2, type: 2}
m_InitialState: 1
m_WrapMode: 1
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
- key: {fileID: 8033954692991531443, guid: 913e5375d826c4f4c8cf4d74b38edaf2, type: 2}
value: {fileID: 0}
- key: {fileID: -6862285970675656174, guid: 913e5375d826c4f4c8cf4d74b38edaf2, type: 2}
value: {fileID: 0}
- key: {fileID: 3131439894240438939, guid: 913e5375d826c4f4c8cf4d74b38edaf2, type: 2}
value: {fileID: 0}
- key: {fileID: 1074184894212459683, guid: 913e5375d826c4f4c8cf4d74b38edaf2, type: 2}
value: {fileID: 0}
- key: {fileID: 8996189954335961344, guid: 913e5375d826c4f4c8cf4d74b38edaf2, type: 2}
value: {fileID: 0}
- key: {fileID: 8676903761886718887, guid: 913e5375d826c4f4c8cf4d74b38edaf2, type: 2}
value: {fileID: 0}
- key: {fileID: 7443584707458951820, guid: 7f0a0184cda76ee47a12f24d773dcdc2, type: 2}
value: {fileID: 0}
- key: {fileID: 4155594759277150191, guid: 7f0a0184cda76ee47a12f24d773dcdc2, type: 2}
value: {fileID: 0}
- key: {fileID: -246988356586829787, guid: 7f0a0184cda76ee47a12f24d773dcdc2, type: 2}
value: {fileID: 0}
- key: {fileID: -4617044316659957984, guid: 7f0a0184cda76ee47a12f24d773dcdc2, type: 2}
value: {fileID: 0}
- key: {fileID: -8266168239376728924, guid: 7f0a0184cda76ee47a12f24d773dcdc2, type: 2}
value: {fileID: 0}
- key: {fileID: 1263292279375096832, guid: 7f0a0184cda76ee47a12f24d773dcdc2, type: 2}
value: {fileID: 0}
m_ExposedReferences:
m_References: []
--- !u!4 &845641696
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 845641694}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
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 &871916846 --- !u!1 &871916846
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1799,7 +1724,7 @@ GameObject:
- component: {fileID: 1054421165} - component: {fileID: 1054421165}
- component: {fileID: 1054421166} - component: {fileID: 1054421166}
m_Layer: 0 m_Layer: 0
m_Name: MainSceneManager m_Name: ShowManager
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -1829,19 +1754,15 @@ MonoBehaviour:
m_GameObject: {fileID: 1054421164} m_GameObject: {fileID: 1054421164}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a0d5ea7f416a128408c6b330eac1d0f9, type: 3} m_Script: {fileID: 11500000, guid: 57012a906036c894f89473379533acf7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
characterMaxCount: 6 ShowSceneType: 1
tsCharacterRoot: {fileID: 54667940} tsCharacterRoot: {fileID: 54667940}
listShowPoint: tsShowPointRoot: {fileID: 1753177013}
- {fileID: 979629191} characterMaxCount: 6
- {fileID: 1705299694} IsIgnoreKanbanban: 1
- {fileID: 669651737} listExtractRecord: []
- {fileID: 932839240}
- {fileID: 44803683}
- {fileID: 2011606367}
playableDirector: {fileID: 845641695}
--- !u!1001 &1076410784 --- !u!1001 &1076410784
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2318,7 +2239,7 @@ PrefabInstance:
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 54667940} m_TransformParent: {fileID: 1533719808}
m_Modifications: m_Modifications:
- target: {fileID: 6770644500165233157, guid: f25b2bc6189e34ed8b865938c6332264, - target: {fileID: 6770644500165233157, guid: f25b2bc6189e34ed8b865938c6332264,
type: 3} type: 3}
@ -2343,17 +2264,17 @@ PrefabInstance:
- target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264, - target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 15.489999 value: 41.685932
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264, - target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: -0.46445358
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264, - target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 31.55 value: 34.314888
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264, - target: {fileID: 7803087331950724001, guid: f25b2bc6189e34ed8b865938c6332264,
type: 3} type: 3}
@ -2406,6 +2327,39 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1516697305} m_PrefabInstance: {fileID: 1516697305}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1533719807
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1533719808}
m_Layer: 0
m_Name: OtherRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1533719808
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1533719807}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -26.195932, y: 0.46445358, z: -2.7648883}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1516697306}
- {fileID: 1688542927}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1570180720 --- !u!1001 &1570180720
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2648,12 +2602,12 @@ Transform:
m_GameObject: {fileID: 1688542926} m_GameObject: {fileID: 1688542926}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.8256171, z: -0, w: -0.564231} m_LocalRotation: {x: -0, y: 0.8256171, z: -0, w: -0.564231}
m_LocalPosition: {x: 35.66289, y: 0, z: 30.539604} m_LocalPosition: {x: 61.858826, y: -0.46445358, z: 33.304493}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1217796783} - {fileID: 1217796783}
m_Father: {fileID: 54667940} m_Father: {fileID: 1533719808}
m_LocalEulerAnglesHint: {x: 0, y: 248.698, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 248.698, z: 0}
--- !u!95 &1688542928 --- !u!95 &1688542928
Animator: Animator:
@ -3806,8 +3760,8 @@ SceneRoots:
m_Roots: m_Roots:
- {fileID: 1054421165} - {fileID: 1054421165}
- {fileID: 780044542} - {fileID: 780044542}
- {fileID: 845641696}
- {fileID: 1232725964} - {fileID: 1232725964}
- {fileID: 1753177013} - {fileID: 1753177013}
- {fileID: 875017989} - {fileID: 875017989}
- {fileID: 54667940} - {fileID: 54667940}
- {fileID: 1533719808}

View File

@ -1156,7 +1156,7 @@ MonoBehaviour:
Data: Assets/Art/AutoGen/PostProcessScenes/Assets_Scenes_MainScene/MainScene_PostProcess.unity Data: Assets/Art/AutoGen/PostProcessScenes/Assets_Scenes_MainScene/MainScene_PostProcess.unity
- Name: hashCode - Name: hashCode
Entry: 1 Entry: 1
Data: e681a5bc90d9e5b0d877ab0feef15331 Data: 416bd7d90ea8d30ef7c15352ca2d108e
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -1180,7 +1180,7 @@ MonoBehaviour:
Data: Assets/Art/AutoGen/PostProcessScenes/Assets_Scenes_CampScene/CampScene_PostProcess.unity Data: Assets/Art/AutoGen/PostProcessScenes/Assets_Scenes_CampScene/CampScene_PostProcess.unity
- Name: hashCode - Name: hashCode
Entry: 1 Entry: 1
Data: c31cb86d13961d4a82ef29c1df06316f Data: e0201e92e36ee27c7c2df6067e45f0ec
- Name: - Name:
Entry: 8 Entry: 8
Data: Data: