update core

This commit is contained in:
2024-10-24 22:16:39 +08:00
parent 249705c952
commit 2181e42066
9 changed files with 1042 additions and 12471 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

View File

@@ -2175,8 +2175,7 @@ MonoBehaviour:
m_AnimatedTarget: {fileID: 6555429748334898973} m_AnimatedTarget: {fileID: 6555429748334898973}
m_LayerIndex: 0 m_LayerIndex: 0
m_ShowDebugText: 0 m_ShowDebugText: 0
m_ChildCameras: m_ChildCameras: []
- {fileID: 8402593591323444239}
m_Instructions: [] m_Instructions: []
m_DefaultBlend: m_DefaultBlend:
m_Style: 1 m_Style: 1
@@ -3343,6 +3342,42 @@ SpriteRenderer:
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1 &2569090468629136966
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2558686753146435160}
m_Layer: 0
m_Name: Enemys
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2558686753146435160
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2569090468629136966}
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: 5894730123257792291}
- {fileID: 6926850498603954599}
- {fileID: 2184805088862847279}
- {fileID: 7913198350365602262}
- {fileID: 5748299821972806540}
m_Father: {fileID: 3470085375275940891}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2681270773199330165 --- !u!1 &2681270773199330165
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4972,7 +5007,7 @@ GameObject:
- component: {fileID: 5689008963380115352} - component: {fileID: 5689008963380115352}
- component: {fileID: 4851269271332994727} - component: {fileID: 4851269271332994727}
m_Layer: 0 m_Layer: 0
m_Name: Part_Home m_Name: HomeScene
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@@ -4986,7 +5021,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4255928186054079110} m_GameObject: {fileID: 4255928186054079110}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 0 m_ConstrainProportionsScale: 0
@@ -4998,6 +5033,7 @@ Transform:
- {fileID: 2173541254871124966} - {fileID: 2173541254871124966}
- {fileID: 2925989089492316297} - {fileID: 2925989089492316297}
- {fileID: 9215404511707638853} - {fileID: 9215404511707638853}
- {fileID: 2558686753146435160}
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!320 &5689008963380115352 --- !u!320 &5689008963380115352
@@ -5010,7 +5046,7 @@ PlayableDirector:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: a0f42c2ed5438954691c7a96e22be18b, type: 2} m_PlayableAsset: {fileID: 11400000, guid: a0f42c2ed5438954691c7a96e22be18b, type: 2}
m_InitialState: 1 m_InitialState: 0
m_WrapMode: 2 m_WrapMode: 2
m_DirectorUpdateMode: 1 m_DirectorUpdateMode: 1
m_InitialTime: 0 m_InitialTime: 0
@@ -12114,6 +12150,268 @@ SpriteRenderer:
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1001 &1388482561822837321
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2558686753146435160}
m_Modifications:
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.x
value: -3.06
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.y
value: 7.51
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: WalkArea.x
value: 16.52
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: WalkArea.y
value: 10.34
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: CreatePos.x
value: -3.06
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: CreatePos.y
value: 7.51
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: IsDebugDraw
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: ActiveArea.y
value: 28.08
objectReference: {fileID: 0}
- target: {fileID: 6069865906189566131, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_Name
value: enemy_A
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
--- !u!4 &2184805088862847279 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
m_PrefabInstance: {fileID: 1388482561822837321}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4815206810372133098
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2558686753146435160}
m_Modifications:
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.x
value: -0.55
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.y
value: 12.82
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: WalkArea.x
value: 16.52
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: WalkArea.y
value: 10.34
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: CreatePos.x
value: -0.55
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: CreatePos.y
value: 12.82
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: IsDebugDraw
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: ActiveArea.y
value: 28.08
objectReference: {fileID: 0}
- target: {fileID: 6069865906189566131, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_Name
value: enemy_A (2)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
--- !u!4 &5748299821972806540 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
m_PrefabInstance: {fileID: 4815206810372133098}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5244615652379338185
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2558686753146435160}
m_Modifications:
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: WalkArea.x
value: 13.08
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: WalkArea.y
value: 7.85
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: CreatePos.x
value: -4.78
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: CreatePos.y
value: 6.68
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: IsDebugDraw
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: ActiveArea.y
value: 8.75
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: TriggerDistance
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.x
value: -4.78
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.y
value: 6.68
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4628036417912431990, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_Name
value: enemy_B (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
--- !u!4 &6926850498603954599 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
m_PrefabInstance: {fileID: 5244615652379338185}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5349686948620608019 --- !u!1001 &5349686948620608019
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -12360,6 +12658,182 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7326805731375476827, guid: 3a2dc99a210051b4494893903945a0de, type: 3} m_CorrespondingSourceObject: {fileID: 7326805731375476827, guid: 3a2dc99a210051b4494893903945a0de, type: 3}
m_PrefabInstance: {fileID: 5349686948620608019} m_PrefabInstance: {fileID: 5349686948620608019}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &6972784807560034992
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2558686753146435160}
m_Modifications:
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.x
value: 3.44
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.y
value: 10.11
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: WalkArea.x
value: 16.52
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: WalkArea.y
value: 10.34
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: CreatePos.x
value: 3.44
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: CreatePos.y
value: 10.11
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: IsDebugDraw
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4056488597769165095, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: ActiveArea.y
value: 28.08
objectReference: {fileID: 0}
- target: {fileID: 6069865906189566131, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
propertyPath: m_Name
value: enemy_A (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
--- !u!4 &7913198350365602262 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 942691787043277670, guid: ddd4bd95d98561b4b91d0eece4015b8d, type: 3}
m_PrefabInstance: {fileID: 6972784807560034992}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8730168653709038413
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2558686753146435160}
m_Modifications:
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: WalkArea.x
value: 13.08
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: WalkArea.y
value: 7.85
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: CreatePos.x
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: CreatePos.y
value: 7.36
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: IsDebugDraw
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: ActiveArea.y
value: 8.75
objectReference: {fileID: 0}
- target: {fileID: 2888369101095008481, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: TriggerDistance
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.x
value: 1.1
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.y
value: 7.36
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4628036417912431990, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
propertyPath: m_Name
value: enemy_B
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
--- !u!4 &5894730123257792291 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2948032506932270190, guid: 2642ddee418c6ac49b6d0b1e13358eb9, type: 3}
m_PrefabInstance: {fileID: 8730168653709038413}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8755400308238285348 --- !u!1001 &8755400308238285348
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@@ -27,7 +27,7 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
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: 0.761, y: 0.761, z: 0.7612}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 942691787043277670} m_Father: {fileID: 942691787043277670}
@@ -120,6 +120,9 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1011058509842004292} - {fileID: 1011058509842004292}
- {fileID: 8591590385818716212}
- {fileID: 1443470046836760825}
- {fileID: 4502416466766089948}
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!114 &4366283394277835301 --- !u!114 &4366283394277835301
@@ -282,3 +285,528 @@ MonoBehaviour:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
SpriteRenderer: {fileID: 3341132083008652638} SpriteRenderer: {fileID: 3341132083008652638}
--- !u!1 &6113347259097911117
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8591590385818716212}
- component: {fileID: 7606783151337245537}
- component: {fileID: 7987867173582654552}
m_Layer: 0
m_Name: Trail
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8591590385818716212
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6113347259097911117}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.312, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 942691787043277670}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7606783151337245537
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6113347259097911117}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 021d861a33544758adb18c8d30c052e4, type: 3}
m_Name:
m_EditorClassIdentifier:
length: 10
lineRend: {fileID: 7987867173582654552}
targetDist: 0.05
_smoothSpeed: 0
trailSpeed: 100
wiggle: 1
wiggleSpeed: 3
wiggleMagnitude: 8
HasFixedLength: 1
AutoPlay: 0
--- !u!120 &7987867173582654552
LineRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6113347259097911117}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f24565f4f7ad42b4a9df49eb44b2accf, 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_Positions: []
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.2
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.71231294
value: 0.7399234
inSlope: -1.4996955
outSlope: -1.4996955
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- 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
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 28604
atime2: 65535
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 3
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MaskInteraction: 0
m_UseWorldSpace: 1
m_Loop: 0
m_ApplyActiveColorSpace: 1
--- !u!1 &7526067730481239899
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1443470046836760825}
- component: {fileID: 9096384273366072926}
- component: {fileID: 2292333945492632184}
m_Layer: 0
m_Name: Trail (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &1443470046836760825
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7526067730481239899}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: 0.8417956, w: 0.5397965}
m_LocalPosition: {x: 0.232, y: 0.167, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 942691787043277670}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 114.66}
--- !u!114 &9096384273366072926
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7526067730481239899}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 021d861a33544758adb18c8d30c052e4, type: 3}
m_Name:
m_EditorClassIdentifier:
length: 10
lineRend: {fileID: 2292333945492632184}
targetDist: 0.05
_smoothSpeed: 0
trailSpeed: 100
wiggle: 1
wiggleSpeed: 3
wiggleMagnitude: 8
HasFixedLength: 1
AutoPlay: 0
--- !u!120 &2292333945492632184
LineRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7526067730481239899}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f24565f4f7ad42b4a9df49eb44b2accf, 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_Positions: []
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.2
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.71231294
value: 0.7399234
inSlope: -1.4996955
outSlope: -1.4996955
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- 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
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 28604
atime2: 65535
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 3
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MaskInteraction: 0
m_UseWorldSpace: 1
m_Loop: 0
m_ApplyActiveColorSpace: 1
--- !u!1 &8424245645757087427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4502416466766089948}
- component: {fileID: 5177758876458707741}
- component: {fileID: 267612453392645663}
m_Layer: 0
m_Name: Trail (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &4502416466766089948
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8424245645757087427}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: 0.84491485, w: -0.5349009}
m_LocalPosition: {x: -0.231, y: 0.135, z: 0}
m_LocalScale: {x: 1, y: 1, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 942691787043277670}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 244.67401}
--- !u!114 &5177758876458707741
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8424245645757087427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 021d861a33544758adb18c8d30c052e4, type: 3}
m_Name:
m_EditorClassIdentifier:
length: 10
lineRend: {fileID: 267612453392645663}
targetDist: 0.05
_smoothSpeed: 0
trailSpeed: 100
wiggle: 1
wiggleSpeed: 3
wiggleMagnitude: 8
HasFixedLength: 1
AutoPlay: 0
--- !u!120 &267612453392645663
LineRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8424245645757087427}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: f24565f4f7ad42b4a9df49eb44b2accf, 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_Positions: []
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.2
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.71231294
value: 0.7399234
inSlope: -1.4996955
outSlope: -1.4996955
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- 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
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 28604
atime2: 65535
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 3
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
textureScale: {x: 1, y: 1}
shadowBias: 0.5
generateLightingData: 0
m_MaskInteraction: 0
m_UseWorldSpace: 1
m_Loop: 0
m_ApplyActiveColorSpace: 1

File diff suppressed because it is too large Load Diff

View File

@@ -36,7 +36,6 @@ namespace Game
private EventGroup _eventGroup; private EventGroup _eventGroup;
private GameFsm _gameFsm; private GameFsm _gameFsm;
private RoomGlobalData _roomGlobalData; private RoomGlobalData _roomGlobalData;
public bool HasGaming { get; private set; }
public bool HasLock { get ; private set; } public bool HasLock { get ; private set; }
public GameState CurrentGameState => this._gameFsm.CurrentState; public GameState CurrentGameState => this._gameFsm.CurrentState;
@@ -77,9 +76,6 @@ namespace Game
{ {
} }
#endif #endif
if (HasGaming)
{
}
} }

View File

@@ -46,7 +46,7 @@ Material:
m_Ints: [] m_Ints: []
m_Floats: m_Floats:
- Vector1_c9f2135c9d254951b22c018d295f8558: 0.003 - Vector1_c9f2135c9d254951b22c018d295f8558: 0.003
- _blurOffset: 0.064 - _blurOffset: 0.059033036
m_Colors: [] m_Colors: []
m_BuildTextureStacks: [] m_BuildTextureStacks: []
--- !u!114 &268278646524644520 --- !u!114 &268278646524644520

View File

@@ -1,14 +1,18 @@
using System; using System;
using System.StateSystem; using System.StateSystem;
using Framework.Asset;
using Framework.Audio; using Framework.Audio;
using Framework.FSMLite; using Framework.FSMLite;
using Framework.Timer; using Framework.Timer;
using Framework.UI; using Framework.UI;
using IcecreamView;
using StateSystem.Loader; using StateSystem.Loader;
using UnityEngine; using UnityEngine;
using UnityEngine.Playables;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using Views; using Views;
using AudioType = Framework.Audio.AudioType; using AudioType = Framework.Audio.AudioType;
using Object = UnityEngine.Object;
namespace StateSystem.State namespace StateSystem.State
{ {
@@ -17,46 +21,28 @@ namespace StateSystem.State
private SceneLoader _loader; private SceneLoader _loader;
public int _lastCatLevel = -1; //记录上一次的猫的等级,用于判断是否升级 public int _lastCatLevel = -1; //记录上一次的猫的等级,用于判断是否升级
private GameObject homeScene;
protected override async void OnEnter (params object[] args) protected override async void OnEnter (params object[] args)
{ {
AudioManager.Instance.PlayBGM (BgmAudio.LobbyBgm); AudioManager.Instance.PlayBGM (BgmAudio.LobbyBgm);
GameUpdateMgr.Instance.AddUpdater (DoUpdate); GameUpdateMgr.Instance.AddUpdater (DoUpdate);
// var activeScene = SceneManager.GetActiveScene ();
// if (activeScene.name != SceneName.MainScene.ToString ())
// {
// Debug.Log ("进入Home开始加载场景" + SceneName.MainScene.ToString ());
// this._loader = new SceneLoader (SceneName.MainScene);
// this._loader.BeginLoad (OnLoading, OnActived);
// }
// else
// {
// OnActived ();
// }
OnActived (); OnActived ();
} }
private void OnLoading (float obj)
{
Debug.Log ("加载进度: " + obj);
if (obj >= 1)
{
// Debug.Log("加载完成");
this._loader.Active ();
}
}
private void OnActived () private void OnActived ()
{ {
UIManager.Instance.OpenView (UIPanel.HomePanel); var homePart = AssetManager.Instance.LoadAlwaysAsset<GameObject> ("HomeScene.prefab");
homeScene = Object.Instantiate (homePart);
UIManager.Instance.OpenView (UIPanel.HomePanel , new IC_ViewData (this.homeScene.GetComponent<PlayableDirector> ()));
UIManager.Instance.CloseLoading (null); UIManager.Instance.CloseLoading (null);
} }
protected override void OnExit () protected override void OnExit ()
{ {
GameObject.Destroy (this.homeScene.gameObject);
GameUpdateMgr.Instance.RemoveUpdater (DoUpdate); GameUpdateMgr.Instance.RemoveUpdater (DoUpdate);
// this._loader.Kill (); // this._loader.Kill ();
} }

View File

@@ -1,11 +1,14 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.StateSystem; using System.StateSystem;
using Framework.UI; using Framework.UI;
using Game;
using Game.Component;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using IcecreamView; using IcecreamView;
using Script.Core.Utils.Extend; using Script.Core.Utils.Extend;
using StateSystem; using StateSystem;
using UnityEngine.Playables;
namespace Views{ namespace Views{
@@ -15,11 +18,13 @@ namespace Views{
public Button _settingGame; public Button _settingGame;
public Button _aboutGame; public Button _aboutGame;
private PlayableDirector _playableDirector;
public override void OnOpenView(IC_ViewData parameters) public override void OnOpenView(IC_ViewData parameters)
{ {
this._playableDirector = parameters.GetValue<PlayableDirector>();
MapContent.Instance.Pathfinder.Scan ();
MapContent.Instance.IsActiveGame = true;
} }
public override void OnCloseView() public override void OnCloseView()
@@ -62,8 +67,17 @@ namespace Views{
private void OnClickToGame() private void OnClickToGame()
{ {
// UIManager.Instance.OpenView (UIPanel.SuccessPanel); this._toGame.gameObject.SetActive(false);
// return; this._aboutGame.gameObject.SetActive(false);
this._settingGame.gameObject.SetActive(false);
this._playableDirector.stopped += ToGaming;
this._playableDirector.initialTime = 0;
this._playableDirector.Play ();
}
private void ToGaming (PlayableDirector playableDirector)
{
UIManager.Instance.OpenLoading (() => UIManager.Instance.OpenLoading (() =>
{ {
this.ViewConnector.CloseView (); this.ViewConnector.CloseView ();