diff --git a/Assets/GameRes/AutoSource/enemyai.meta b/Assets/GameRes/AutoSource/enemyai.meta new file mode 100644 index 0000000..c9b8dfc --- /dev/null +++ b/Assets/GameRes/AutoSource/enemyai.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77596b08436babe49aafe12ffbab047b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameRes/AutoSource/enemyFsm_a.asset b/Assets/GameRes/AutoSource/enemyai/enemyFsm_a.asset similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_a.asset rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_a.asset diff --git a/Assets/GameRes/AutoSource/enemyFsm_a.asset.meta b/Assets/GameRes/AutoSource/enemyai/enemyFsm_a.asset.meta similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_a.asset.meta rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_a.asset.meta diff --git a/Assets/GameRes/AutoSource/enemyFsm_b.asset b/Assets/GameRes/AutoSource/enemyai/enemyFsm_b.asset similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_b.asset rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_b.asset diff --git a/Assets/GameRes/AutoSource/enemyFsm_b.asset.meta b/Assets/GameRes/AutoSource/enemyai/enemyFsm_b.asset.meta similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_b.asset.meta rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_b.asset.meta diff --git a/Assets/GameRes/AutoSource/enemyFsm_c.asset b/Assets/GameRes/AutoSource/enemyai/enemyFsm_c.asset similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_c.asset rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_c.asset diff --git a/Assets/GameRes/AutoSource/enemyFsm_c.asset.meta b/Assets/GameRes/AutoSource/enemyai/enemyFsm_c.asset.meta similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_c.asset.meta rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_c.asset.meta diff --git a/Assets/GameRes/AutoSource/enemyFsm_witch.asset b/Assets/GameRes/AutoSource/enemyai/enemyFsm_witch.asset similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_witch.asset rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_witch.asset diff --git a/Assets/GameRes/AutoSource/enemyFsm_witch.asset.meta b/Assets/GameRes/AutoSource/enemyai/enemyFsm_witch.asset.meta similarity index 100% rename from Assets/GameRes/AutoSource/enemyFsm_witch.asset.meta rename to Assets/GameRes/AutoSource/enemyai/enemyFsm_witch.asset.meta diff --git a/Assets/GameRes/AutoSource/scene_prop.meta b/Assets/GameRes/AutoSource/scene_prop.meta new file mode 100644 index 0000000..864af30 --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d222ffb9dd15c7c428edb4fe7c08a699 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameRes/AutoSource/scene_prop/blueProp.prefab b/Assets/GameRes/AutoSource/scene_prop/blueProp.prefab new file mode 100644 index 0000000..53180e6 --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/blueProp.prefab @@ -0,0 +1,139 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5319039742779815564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7332648076757603081} + - component: {fileID: 2861416387759832679} + - component: {fileID: 2428010830452639512} + - component: {fileID: 8829931581728881165} + m_Layer: 0 + m_Name: blueProp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7332648076757603081 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319039742779815564} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.07, y: -3.09, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2861416387759832679 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319039742779815564} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.103773475, g: 0.68216395, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &2428010830452639512 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319039742779815564} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.6 +--- !u!114 &8829931581728881165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319039742779815564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3dd24663aeb41cab20ae2e84799c6bb, type: 3} + m_Name: + m_EditorClassIdentifier: + _invalidTime: 0 + HasOnce: 1 + _duration: 1 + _speedOffset: 2 diff --git a/Assets/GameRes/AutoSource/scene_prop/blueProp.prefab.meta b/Assets/GameRes/AutoSource/scene_prop/blueProp.prefab.meta new file mode 100644 index 0000000..00580fb --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/blueProp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 218b2c14960f4ac4386fe7c1487c6374 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameRes/AutoSource/scene_prop/greenProp.prefab b/Assets/GameRes/AutoSource/scene_prop/greenProp.prefab new file mode 100644 index 0000000..fd7912d --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/greenProp.prefab @@ -0,0 +1,290 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &868685027203186800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2208835154500359050} + - component: {fileID: 4797258605602371434} + - component: {fileID: 5638709374002957773} + - component: {fileID: 3863314628993505233} + m_Layer: 0 + m_Name: greenProp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2208835154500359050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868685027203186800} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.32, y: -1.23, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3011546692511721461} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4797258605602371434 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868685027203186800} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.10196078, g: 1, b: 0.2309466, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &5638709374002957773 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868685027203186800} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.6 +--- !u!114 &3863314628993505233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868685027203186800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e3a143df6abc45dc8a49808d637d70f7, type: 3} + m_Name: + m_EditorClassIdentifier: + _invalidTime: 0 + HasOnce: 1 + _spawn: {fileID: 6644402852319362618} + _skillDuration: 0.4 + _buffDuration: 1 + _buffSpeedOffset: -0.75 +--- !u!1 &9183714658023412500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3011546692511721461} + - component: {fileID: 2910407661415657074} + - component: {fileID: 7652972295448827197} + - component: {fileID: 6644402852319362618} + m_Layer: 0 + m_Name: spwan + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3011546692511721461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9183714658023412500} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2208835154500359050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!58 &2910407661415657074 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9183714658023412500} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!114 &7652972295448827197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9183714658023412500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a081423ec3d040398636827c80f5f14c, type: 3} + m_Name: + m_EditorClassIdentifier: + IsAutoPlay: 1 + MintPlayer: + TweenOptions: + Duration: 0.35 + IsBack: 0 + IsFlip: 0 + IsLoop: 0 + LoopCount: -1 + IsCustomEase: 0 + EaseType: 0 + TimeCurve: + 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 + UpdaterTypeEnum: 2 + TweenType: 1 + IsLocal: 0 + IsAutoStartValue: 0 + StartValue: {x: 0, y: 0, z: 0} + EndValue: {x: 4, y: 4, z: 1} +--- !u!114 &6644402852319362618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9183714658023412500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35f96c77f18c4e579c04ff086160bb57, type: 3} + m_Name: + m_EditorClassIdentifier: + OnTriggerEnterAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3863314628993505233} + m_TargetAssemblyTypeName: Game.Component.SceneProp.GreenProp, Assembly-CSharp + m_MethodName: OnTriggerEnterAction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 diff --git a/Assets/GameRes/AutoSource/scene_prop/greenProp.prefab.meta b/Assets/GameRes/AutoSource/scene_prop/greenProp.prefab.meta new file mode 100644 index 0000000..c125388 --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/greenProp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f0c6801915556e5418de1ad436c4e247 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameRes/AutoSource/scene_prop/redProp.prefab b/Assets/GameRes/AutoSource/scene_prop/redProp.prefab new file mode 100644 index 0000000..33da247 --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/redProp.prefab @@ -0,0 +1,353 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &141230662941822534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3597250010637538087} + - component: {fileID: 8326163638147510782} + - component: {fileID: 7490896285389745801} + - component: {fileID: 4297414266674801802} + m_Layer: 0 + m_Name: redProp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3597250010637538087 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141230662941822534} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.91, y: -4.36, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1338944967408546110} + - {fileID: 5534166548975575169} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8326163638147510782 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141230662941822534} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 0.44140166, b: 0.10196078, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &7490896285389745801 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141230662941822534} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.6 +--- !u!114 &4297414266674801802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 141230662941822534} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 360c9ffc49c94f4598e35b18b63a6c99, type: 3} + m_Name: + m_EditorClassIdentifier: + _invalidTime: 2 + HasOnce: 0 + _actionDelay: 0.35 + _a_pos: {fileID: 2610799646880263372} + _b_pos: {fileID: 1338944967408546110} +--- !u!1 &1076861757807127009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1338944967408546110} + m_Layer: 0 + m_Name: bPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1338944967408546110 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1076861757807127009} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -1.1999999, y: -0.09000015, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3597250010637538087} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!1 &1449907169334328672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5534166548975575169} + - component: {fileID: 4876623865897179001} + - component: {fileID: 3129022721665660306} + - component: {fileID: 7023956067180661789} + m_Layer: 0 + m_Name: redPropB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5534166548975575169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449907169334328672} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.66, y: -9.16, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2610799646880263372} + m_Father: {fileID: 3597250010637538087} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4876623865897179001 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449907169334328672} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 0.44140166, b: 0.10196078, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &3129022721665660306 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449907169334328672} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.6 +--- !u!114 &7023956067180661789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449907169334328672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35f96c77f18c4e579c04ff086160bb57, type: 3} + m_Name: + m_EditorClassIdentifier: + OnTriggerEnterAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4297414266674801802} + m_TargetAssemblyTypeName: Game.Component.SceneProp.RedProp, Assembly-CSharp + m_MethodName: OnTriggerEnterAction + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &5895135455722498232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2610799646880263372} + m_Layer: 0 + m_Name: aPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2610799646880263372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5895135455722498232} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068} + m_LocalPosition: {x: 1.1100001, y: 0.13000011, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5534166548975575169} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} diff --git a/Assets/GameRes/AutoSource/scene_prop/redProp.prefab.meta b/Assets/GameRes/AutoSource/scene_prop/redProp.prefab.meta new file mode 100644 index 0000000..502a386 --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/redProp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 785186b6a682ed3448051f5e5ab66386 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameRes/AutoSource/scene_prop/whiteProp.prefab b/Assets/GameRes/AutoSource/scene_prop/whiteProp.prefab new file mode 100644 index 0000000..ffb71fe --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/whiteProp.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8351491010039012771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1486966663552037566} + - component: {fileID: 2115941108489572471} + - component: {fileID: 4262933793688692330} + - component: {fileID: 9102292644173125690} + m_Layer: 0 + m_Name: whiteProp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1486966663552037566 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8351491010039012771} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.05, y: -1.652, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2115941108489572471 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8351491010039012771} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &4262933793688692330 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8351491010039012771} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.6 +--- !u!114 &9102292644173125690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8351491010039012771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39738f45a609446db7e107b4fd98b734, type: 3} + m_Name: + m_EditorClassIdentifier: + _invalidTime: 0 + HasOnce: 1 + _duration: 1.5 diff --git a/Assets/GameRes/AutoSource/scene_prop/whiteProp.prefab.meta b/Assets/GameRes/AutoSource/scene_prop/whiteProp.prefab.meta new file mode 100644 index 0000000..16474a7 --- /dev/null +++ b/Assets/GameRes/AutoSource/scene_prop/whiteProp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7a5fc693cae9809469843646d0ee35a1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameRes/Scenes/InitScene.unity b/Assets/GameRes/Scenes/InitScene.unity index d3a4911..ec466bb 100644 --- a/Assets/GameRes/Scenes/InitScene.unity +++ b/Assets/GameRes/Scenes/InitScene.unity @@ -375,7 +375,7 @@ MonoBehaviour: isSwipeOut: 0 showPSInspector: 1 showSpriteInspector: 0 - showEventInspector: 0 + showEventInspector: 1 showBehaviourInspector: 0 showAxesInspector: 1 showTouchEventInspector: 0 @@ -388,7 +388,7 @@ MonoBehaviour: onMove: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 355335389} m_TargetAssemblyTypeName: Game.Component.PlayerEntity, Assembly-CSharp m_MethodName: OnMove m_Mode: 0 @@ -406,7 +406,7 @@ MonoBehaviour: onMoveEnd: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 355335389} m_TargetAssemblyTypeName: Game.Component.PlayerEntity, Assembly-CSharp m_MethodName: OnMoveEnd m_Mode: 1 @@ -774,6 +774,93 @@ MonoBehaviour: m_EffectColor: {r: 0.8867924, g: 0.8867924, b: 0.8867924, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!4 &220168213 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + m_PrefabInstance: {fileID: 7898905657705989879} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &355335388 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1344272198} + m_Modifications: + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalPosition.x + value: -2.31 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalPosition.y + value: -4.39 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2466171827706288463, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_Name + value: player + objectReference: {fileID: 0} + - target: {fileID: 2466171827706288463, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} +--- !u!114 &355335389 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8247442098040652398, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + m_PrefabInstance: {fileID: 355335388} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dfce19dfebea46149e6c38028733afb0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &355335390 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1011920744855142701, guid: 121fd30183d15fd41b7db01d2d435331, type: 3} + m_PrefabInstance: {fileID: 355335388} + m_PrefabAsset: {fileID: 0} +--- !u!4 &454422476 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + m_PrefabInstance: {fileID: 1203443171463701558} + m_PrefabAsset: {fileID: 0} --- !u!1 &505887312 GameObject: m_ObjectHideFlags: 0 @@ -1066,6 +1153,11 @@ MonoBehaviour: m_FrequencyGain: 0 m_Duration: 0 m_NoiseOffsets: {x: 0, y: 0, z: 0} +--- !u!4 &1065204223 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + m_PrefabInstance: {fileID: 2758327132442644158} + m_PrefabAsset: {fileID: 0} --- !u!1 &1153590224 GameObject: m_ObjectHideFlags: 0 @@ -1553,6 +1645,11 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1230494200} + - {fileID: 355335390} + - {fileID: 1818713902} + - {fileID: 454422476} + - {fileID: 1065204223} + - {fileID: 220168213} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1344272199 @@ -1567,7 +1664,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 774a99fa7c1a4245b2e1d4e0d101a5bb, type: 3} m_Name: m_EditorClassIdentifier: - PlayerEntity: {fileID: 0} + PlayerEntity: {fileID: 355335389} --- !u!1 &1575124293 GameObject: m_ObjectHideFlags: 0 @@ -2325,6 +2422,11 @@ Transform: - {fileID: 1238765764} m_Father: {fileID: 2011646794} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1818713902 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + m_PrefabInstance: {fileID: 5562488581515197173} + m_PrefabAsset: {fileID: 0} --- !u!1 &1914211174 GameObject: m_ObjectHideFlags: 0 @@ -2571,6 +2673,234 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4df116eebd24a984d949044a8237c142, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1203443171463701558 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1344272198} + m_Modifications: + - target: {fileID: 5319039742779815564, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_Name + value: blueProp + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalPosition.x + value: -1.07 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalPosition.y + value: -3.09 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7332648076757603081, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 218b2c14960f4ac4386fe7c1487c6374, type: 3} +--- !u!1001 &2758327132442644158 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1344272198} + m_Modifications: + - target: {fileID: 868685027203186800, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_Name + value: greenProp + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalPosition.x + value: -4.32 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalPosition.y + value: -1.23 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2208835154500359050, guid: f0c6801915556e5418de1ad436c4e247, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f0c6801915556e5418de1ad436c4e247, type: 3} +--- !u!1001 &5562488581515197173 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1344272198} + m_Modifications: + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalPosition.x + value: -1.05 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalPosition.y + value: -1.652 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1486966663552037566, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8351491010039012771, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} + propertyPath: m_Name + value: whiteProp + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7a5fc693cae9809469843646d0ee35a1, type: 3} +--- !u!1001 &7898905657705989879 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1344272198} + m_Modifications: + - target: {fileID: 141230662941822534, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_Name + value: redProp + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalPosition.x + value: -3.91 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalPosition.y + value: -4.36 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3597250010637538087, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 785186b6a682ed3448051f5e5ab66386, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game/Component/EnemyEntity.cs b/Assets/Scripts/Game/Component/EnemyEntity.cs index 3dec950..70092a9 100644 --- a/Assets/Scripts/Game/Component/EnemyEntity.cs +++ b/Assets/Scripts/Game/Component/EnemyEntity.cs @@ -34,6 +34,9 @@ namespace Game.Component [Header ("攻击移动速度系数"), Range (0, 1)] public float AttackSpeedOffset = 1; [Header ("速度变化系数&插值t")] public float SpeedChangeT = 0.5f; + private float _expSpeedOffset; //额外速度系数 + private TimeHandler _expTimeHandler; //额外速度计时器 + private FsmData _fsmData; private float _curAttackingTime; private float _curAttackCDTime; @@ -121,7 +124,7 @@ namespace Game.Component { return true; } - + //特殊情况 ，如果值为-1 ，表示不限制 //x如果为-1 if (this.ActiveArea.x.Compare (-1)) @@ -134,7 +137,7 @@ namespace Game.Component return true; } - + //y如果为-1 if (this.ActiveArea.y.Compare (-1)) { @@ -143,6 +146,7 @@ namespace Game.Component { return false; } + return true; } @@ -161,7 +165,13 @@ namespace Game.Component public bool HasRunaway { get; private set; } = false; - public float CurMoveSpeed => this._curMoveSpeedOffset * this.MaxMoveSpeed; + public float CurMoveSpeed => this._curMoveSpeedOffset * (this.MaxMoveSpeed * + (1 + + ( this._expTimeHandler?.IsPlaying ?? false + ? (1 - this._expTimeHandler.CurProgress) * this._expSpeedOffset + : 0f) + ) + ); private void ResetState () { @@ -190,6 +200,7 @@ namespace Game.Component private void OnDisable () { + this._expTimeHandler?.Kill (); GameUpdateMgr.Instance.RemoveUpdater (DoUpdate); } @@ -274,6 +285,14 @@ namespace Game.Component #endregion + public void AddSpeedBuff (float duration , float offset) + { + this._expSpeedOffset = offset; + this._expTimeHandler?.Kill (); + this._expTimeHandler = GameUpdateMgr.Instance.CreateTimer (duration , null); + + } + public void EndAttack () { this._hasAtkState = false; diff --git a/Assets/Scripts/Game/Component/MapContent.cs b/Assets/Scripts/Game/Component/MapContent.cs index b58b1f1..629656b 100644 --- a/Assets/Scripts/Game/Component/MapContent.cs +++ b/Assets/Scripts/Game/Component/MapContent.cs @@ -22,5 +22,7 @@ namespace Game.Component { this.PlayerPosition = PlayerEntity.transform.position; } + + } } \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/PlayerEntity.cs b/Assets/Scripts/Game/Component/PlayerEntity.cs index 7660394..d2a4c39 100644 --- a/Assets/Scripts/Game/Component/PlayerEntity.cs +++ b/Assets/Scripts/Game/Component/PlayerEntity.cs @@ -1,23 +1,38 @@ -using Framework.Utils.Extend; +using Framework.Timer; +using Framework.Utils.Extend; using UnityEngine; namespace Game.Component { public class PlayerEntity : MonoBehaviour { - public float speed = 10; + public float speed = 10; public Rigidbody2D rigidbody2D; + + private float speedBuffOffset; + private TimeHandler speedBuffTimer; + + public float CurSpeed => this.speed * + (1 + (this.speedBuffTimer?.IsPlaying ?? false ? this.speedBuffOffset * (1 - this.speedBuffTimer.CurProgress) : 0)); + + public void AddSpeedBuff (float duration = 3 , float offset = 0.5f) + { + this.speedBuffOffset = offset; + this.speedBuffTimer?.Kill (); + this.speedBuffTimer = GameUpdateMgr.Instance.CreateTimer (duration , null); + } + public void OnMove (Vector2 vector) { var t = this.transform; // 获取前方方向的世界坐标 - Vector3 forward = (Vector3)vector; + Vector3 forward = (Vector3)vector; //根据遥感向量获取一个0，1的移动速度系数 - float speedOffset = forward.magnitude; + float speedOffset = forward.magnitude; Quaternion targetRotation = Quaternion.FromToRotation (Vector3.up , forward.normalized); transform.rotation = Quaternion.Lerp (transform.rotation , targetRotation , 0.25f); // Debug.DrawLine (transform.position , transform.position + forward , Color.magenta); - this.transform.Translate ( Vector3.up * speedOffset * speed * Time.deltaTime); + this.transform.Translate ( Vector3.up * speedOffset * CurSpeed * Time.deltaTime); // this.rigidbody2D.MovePosition (t.position + ((Vector3)vector * speed * Time.deltaTime)); // Vector3 v = target.position - transform.position; // v.z = 0; // 确保向量在2D平面上 diff --git a/Assets/Scripts/Game/Component/SceneProp.meta b/Assets/Scripts/Game/Component/SceneProp.meta new file mode 100644 index 0000000..a86c2bb --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e7b0fc1611fe48ccb8edeef198cd786d +timeCreated: 1729238675 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs b/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs new file mode 100644 index 0000000..6a70aa5 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs @@ -0,0 +1,71 @@ +using System; +using Framework.Timer; +using UnityEngine; + +namespace Game.Component.SceneProp +{ + /// + /// 所有交互道具基类 + /// + public class BaseProp : MonoBehaviour + { + // 间隔cd + [SerializeField , Header ("间隔cd")] private float _invalidTime = 0f; + [SerializeField] protected bool HasOnce = true; + private TimeHandler _timeHandler; + protected bool isReady => this._timeHandler == null || this._timeHandler.IsDone; + + + protected virtual void OnTriggerEnter2D (Collider2D other) + { + if (other.gameObject.CompareTag ("Player")) + { + if (isReady) + { + var entity = other.gameObject.GetComponent (); + this.OnTrigger (entity); + if (HasOnce) + { + this.gameObject.SetActive (false); + } + else + { + RefreshInvalidTime (); + } + } + } + } + + protected virtual void OnTrigger (PlayerEntity entity) + { + } + + protected virtual void OnReady () + { + } + + + protected void RefreshInvalidTime () + { + if (this._invalidTime <= 0) + { + return; + } + + this._timeHandler?.Kill (); + this._timeHandler = null; + this._timeHandler = GameUpdateMgr.Instance.CreateTimer (this._invalidTime, null); + } + + private void OnEnable () + { + OnReady (); + } + + private void OnDisable () + { + this._timeHandler?.Kill (); + this._timeHandler = null; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs.meta b/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs.meta new file mode 100644 index 0000000..8ae599f --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/BaseProp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ea0309bfd995417689f04cf447916cbf +timeCreated: 1729238685 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/BlueProp.cs b/Assets/Scripts/Game/Component/SceneProp/BlueProp.cs new file mode 100644 index 0000000..1a1d3ea --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/BlueProp.cs @@ -0,0 +1,27 @@ +using UnityEngine; + +namespace Game.Component.SceneProp +{ + public class BlueProp : BaseProp + { + [SerializeField ,Header ("加速时长")] private float _duration = 3.0f; + [SerializeField ,Header ("额外加速幅度")] private float _speedOffset = 0.5f; + + protected override void OnTrigger (PlayerEntity entity) + { + entity.AddSpeedBuff (this._duration , this._speedOffset); + } + +#if UNITY_EDITOR + protected void OnDrawGizmos () + { + //绘制一个蓝色圆形 + Gizmos.color = Color.blue; + Gizmos.DrawWireSphere (transform.position , 0.5f); + //文字提示“加速” + UnityEditor.Handles.Label (transform.position , "加速"); + } + +#endif + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/BlueProp.cs.meta b/Assets/Scripts/Game/Component/SceneProp/BlueProp.cs.meta new file mode 100644 index 0000000..6509093 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/BlueProp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b3dd24663aeb41cab20ae2e84799c6bb +timeCreated: 1729244994 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/ColliderTriggerAction.cs b/Assets/Scripts/Game/Component/SceneProp/ColliderTriggerAction.cs new file mode 100644 index 0000000..d6bf2b6 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/ColliderTriggerAction.cs @@ -0,0 +1,16 @@ +using System; +using UnityEngine; +using UnityEngine.Events; + +namespace Game.Component.SceneProp +{ + public class ColliderTriggerAction : MonoBehaviour + { + [SerializeField] public UnityEvent OnTriggerEnterAction; + + private void OnTriggerEnter2D (Collider2D other) + { + OnTriggerEnterAction?.Invoke(other); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/ColliderTriggerAction.cs.meta b/Assets/Scripts/Game/Component/SceneProp/ColliderTriggerAction.cs.meta new file mode 100644 index 0000000..d106f13 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/ColliderTriggerAction.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 35f96c77f18c4e579c04ff086160bb57 +timeCreated: 1729272887 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/GreenProp.cs b/Assets/Scripts/Game/Component/SceneProp/GreenProp.cs new file mode 100644 index 0000000..3b794f7 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/GreenProp.cs @@ -0,0 +1,75 @@ +using Cysharp.Threading.Tasks; +using UnityEngine; + +namespace Game.Component.SceneProp +{ + public class GreenProp : BaseProp + { + [SerializeField] private ColliderTriggerAction _spawn; + [SerializeField, Header ("持续时长")] private float _skillDuration; + + [SerializeField, Header ("速度buff 持续时间")] + private float _buffDuration; + + [SerializeField, Header ("速度buff额外系数")] + private float _buffSpeedOffset; + + protected override void OnTriggerEnter2D (Collider2D other) + { + if (other.gameObject.CompareTag ("Player")) + { + if (this.isReady) + { + var entity = other.gameObject.GetComponent (); + this.OnTrigger (entity); + } + } + } + + protected override async void OnTrigger (PlayerEntity entity) + { + this._spawn.gameObject.SetActive (true); + await UniTask.Delay ( (int)(this._skillDuration * 1000)); + this._spawn.gameObject.SetActive (false); + if (HasOnce) + { + this.gameObject.SetActive (false); + } + else + { + RefreshInvalidTime (); + } + } + + protected override void OnReady () + { + this._spawn.gameObject.SetActive (false); + } + + public void OnTriggerEnterAction (Collider2D other) + { + if (other.gameObject.CompareTag ("Enemy")) + { + var entity = other.gameObject.GetComponent (); + OnSubEnemySpeed (entity , this._buffSpeedOffset , this._buffDuration); + } + } + + + protected void OnSubEnemySpeed (EnemyEntity entity , float speedOffset , float duration) + { + entity.AddSpeedBuff (duration , speedOffset); + } + +#if UNITY_EDITOR + + protected void OnDrawGizmos () + { + //减速球， 绿色标签 + Gizmos.color = Color.green; + Gizmos.DrawWireSphere (transform.position , 0.5f); + UnityEditor.Handles.Label (transform.position, "减速球"); + } +#endif + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/GreenProp.cs.meta b/Assets/Scripts/Game/Component/SceneProp/GreenProp.cs.meta new file mode 100644 index 0000000..3912aa2 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/GreenProp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e3a143df6abc45dc8a49808d637d70f7 +timeCreated: 1729245078 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/NormalLightProp.cs b/Assets/Scripts/Game/Component/SceneProp/NormalLightProp.cs new file mode 100644 index 0000000..44b569e --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/NormalLightProp.cs @@ -0,0 +1,18 @@ +using Game.EventDefine; + +namespace Game.Component.SceneProp +{ + public class NormalLightProp : BaseProp + { + protected override void OnReady () + { + + } + + protected override void OnTrigger (PlayerEntity entity) + { + GameEventDefine.OverlyCoin.SendMessage (1); + //此处可以增加交互反馈 + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/NormalLightProp.cs.meta b/Assets/Scripts/Game/Component/SceneProp/NormalLightProp.cs.meta new file mode 100644 index 0000000..7e7d558 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/NormalLightProp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8b0556f3ae8f4cdd9e0f9dfc239b5e5a +timeCreated: 1729244345 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/RedProp.cs b/Assets/Scripts/Game/Component/SceneProp/RedProp.cs new file mode 100644 index 0000000..62582a3 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/RedProp.cs @@ -0,0 +1,73 @@ +using Cysharp.Threading.Tasks; +using UnityEngine; + +namespace Game.Component.SceneProp +{ + public class RedProp : BaseProp + { + [SerializeField, Header ("施法时间")] private float _actionDelay = 0.5f; + [SerializeField, Header ("a区传送点")] private Transform _a_pos; + [SerializeField, Header ( "b区传送点")] private Transform _b_pos; + + protected override void OnTrigger (PlayerEntity entity) + { + //从a点到b + this.ToPos (entity, this._a_pos); + } + + public void OnTriggerEnterAction (Collider2D other) + { + if (other.gameObject.CompareTag ("Player")) + { + if (isReady) + { + var player = other.gameObject.GetComponent (); + this.ToPos (player , this._b_pos); + if (HasOnce) + { + this.gameObject.SetActive (false); + } + else + { + RefreshInvalidTime (); + } + } + } + } + + private async UniTask ToPos (PlayerEntity playerEntity, Transform target) + { + //消失动画 + playerEntity.gameObject.SetActive (false); + var playerEntityTransform = playerEntity.transform; + playerEntityTransform.position = target.position; + playerEntityTransform.rotation = target.rotation; + await UniTask.Delay ((int)(this._actionDelay * 1000)); + playerEntity.gameObject.SetActive (true); + //出场动画 + } + +#if UNITY_EDITOR + + private void OnDrawGizmos () + { + if (Application.isPlaying) + { + return; + } + + if (this._a_pos != null) + { + Gizmos.color = new Color (1f, 0.38f, 0.13f); + Gizmos.DrawWireSphere (this._a_pos.position, 0.2f); + } + + if (this._b_pos != null) + { + Gizmos.color = new Color (0.2f, 0.4f, 1f); + Gizmos.DrawWireSphere (this._b_pos.position, 0.2f); + } + } +#endif + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/RedProp.cs.meta b/Assets/Scripts/Game/Component/SceneProp/RedProp.cs.meta new file mode 100644 index 0000000..1241683 --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/RedProp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 360c9ffc49c94f4598e35b18b63a6c99 +timeCreated: 1729244985 \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs b/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs new file mode 100644 index 0000000..b04264c --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs @@ -0,0 +1,15 @@ +using Game.EventDefine; +using UnityEngine; + +namespace Game.Component.SceneProp +{ + public class WhiteProp : BaseProp + { + [SerializeField] private float _duration = 1.5f; + protected override void OnTrigger (PlayerEntity entity) + { + Debug.Log ("wtf？"); + GameEventDefine.GlobalRunaway.SendMessage (this._duration); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs.meta b/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs.meta new file mode 100644 index 0000000..2af8b0a --- /dev/null +++ b/Assets/Scripts/Game/Component/SceneProp/WhiteProp.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 39738f45a609446db7e107b4fd98b734 +timeCreated: 1729244810 \ No newline at end of file diff --git a/Assets/Scripts/Game/EventDefine/FightEventDefine.cs b/Assets/Scripts/Game/EventDefine/FightEventDefine.cs deleted file mode 100644 index f4f2f33..0000000 --- a/Assets/Scripts/Game/EventDefine/FightEventDefine.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using Framework.Utils.Extend; -using UniFramework.Event; -using UnityEngine; - -namespace Game.EventDefine -{ - -} \ No newline at end of file diff --git a/Assets/Scripts/Game/EventDefine/FightEventDefine.cs.meta b/Assets/Scripts/Game/EventDefine/FightEventDefine.cs.meta deleted file mode 100644 index 7d44b9a..0000000 --- a/Assets/Scripts/Game/EventDefine/FightEventDefine.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ba62c151770040a98e38fb54a9a2acf4 -timeCreated: 1718704279 \ No newline at end of file diff --git a/Assets/Scripts/Game/EventDefine/GameEventDefine.cs b/Assets/Scripts/Game/EventDefine/GameEventDefine.cs index 5f4fc23..eb6776a 100644 --- a/Assets/Scripts/Game/EventDefine/GameEventDefine.cs +++ b/Assets/Scripts/Game/EventDefine/GameEventDefine.cs @@ -20,7 +20,18 @@ namespace Game.EventDefine overlyCoin = overlyCoin }); } - + + public class GlobalRunaway : IEventMessage + { + public float Duration { get; private set; } + + private GlobalRunaway () + { + } + + public static void SendMessage (float duration) => UniEvent.SendMessage (new GlobalRunaway () { Duration = duration }); + } + /// /// 改变游戏状态 /// @@ -40,7 +51,6 @@ namespace Game.EventDefine } } - public class ShowTextHub : IEventMessage { public string text; diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 622e7af..e297cac 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - Obstcales + - Enemy layers: - Default - TransparentFX diff --git a/美术文件/场景/特殊地台/1状态/img_1_ditai.png b/美术文件/场景/特殊地台/1状态/img_1_ditai.png new file mode 100644 index 0000000..d5ef27f Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/img_1_ditai.png differ diff --git a/美术文件/场景/特殊地台/1状态/img_1_shibei.png b/美术文件/场景/特殊地台/1状态/img_1_shibei.png new file mode 100644 index 0000000..c86372f Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/img_1_shibei.png differ diff --git a/美术文件/场景/特殊地台/1状态/img_1_suishi1.png b/美术文件/场景/特殊地台/1状态/img_1_suishi1.png new file mode 100644 index 0000000..e3076da Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/img_1_suishi1.png differ diff --git a/美术文件/场景/特殊地台/1状态/img_1_suishi2.png b/美术文件/场景/特殊地台/1状态/img_1_suishi2.png new file mode 100644 index 0000000..d299339 Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/img_1_suishi2.png differ diff --git a/美术文件/场景/特殊地台/1状态/img_1_suishi3.png b/美术文件/场景/特殊地台/1状态/img_1_suishi3.png new file mode 100644 index 0000000..936c553 Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/img_1_suishi3.png differ diff --git a/美术文件/场景/特殊地台/1状态/img_1_suishi4.png b/美术文件/场景/特殊地台/1状态/img_1_suishi4.png new file mode 100644 index 0000000..b513b39 Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/img_1_suishi4.png differ diff --git a/美术文件/场景/特殊地台/1状态/img_1_suishi5.png b/美术文件/场景/特殊地台/1状态/img_1_suishi5.png new file mode 100644 index 0000000..cd280a7 Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/img_1_suishi5.png differ diff --git a/美术文件/场景/特殊地台/1状态/摆放参考.jpg b/美术文件/场景/特殊地台/1状态/摆放参考.jpg new file mode 100644 index 0000000..33a4070 Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/摆放参考.jpg differ diff --git a/美术文件/场景/特殊地台/1状态/碎石摆放参考.png b/美术文件/场景/特殊地台/1状态/碎石摆放参考.png new file mode 100644 index 0000000..5fd6193 Binary files /dev/null and b/美术文件/场景/特殊地台/1状态/碎石摆放参考.png differ diff --git a/美术文件/场景/特殊地台/2追逐战后状态/img_2_ditai.png b/美术文件/场景/特殊地台/2追逐战后状态/img_2_ditai.png new file mode 100644 index 0000000..1ddcf55 Binary files /dev/null and b/美术文件/场景/特殊地台/2追逐战后状态/img_2_ditai.png differ diff --git a/美术文件/场景/特殊地台/2追逐战后状态/img_2_shibei.png b/美术文件/场景/特殊地台/2追逐战后状态/img_2_shibei.png new file mode 100644 index 0000000..9677017 Binary files /dev/null and b/美术文件/场景/特殊地台/2追逐战后状态/img_2_shibei.png differ diff --git a/美术文件/场景/特殊地台/2追逐战后状态/摆放参考.jpg b/美术文件/场景/特殊地台/2追逐战后状态/摆放参考.jpg new file mode 100644 index 0000000..25b990c Binary files /dev/null and b/美术文件/场景/特殊地台/2追逐战后状态/摆放参考.jpg differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_ditai.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_ditai.png new file mode 100644 index 0000000..ebf621c Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_ditai.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_blue.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_blue.png new file mode 100644 index 0000000..fee0c3a Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_blue.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_green.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_green.png new file mode 100644 index 0000000..a5d0356 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_green.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_red.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_red.png new file mode 100644 index 0000000..704d472 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_red.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_wu.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_wu.png new file mode 100644 index 0000000..97e39b5 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_gem_wu.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant1.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant1.png new file mode 100644 index 0000000..23a9a64 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant1.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant2.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant2.png new file mode 100644 index 0000000..eb9c108 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant2.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant3.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant3.png new file mode 100644 index 0000000..de4a705 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant3.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant4.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant4.png new file mode 100644 index 0000000..e36fd99 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant4.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant5.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant5.png new file mode 100644 index 0000000..a85a9ae Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant5.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant6.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant6.png new file mode 100644 index 0000000..dfc37a4 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_3_piant6.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_d_guangyun.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_d_guangyun.png new file mode 100644 index 0000000..02d4a0a Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_d_guangyun.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi1.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi1.png new file mode 100644 index 0000000..0153a4d Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi1.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi2.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi2.png new file mode 100644 index 0000000..6807f61 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi2.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi3.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi3.png new file mode 100644 index 0000000..f2a1863 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi3.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi4.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi4.png new file mode 100644 index 0000000..6807f61 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi4.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi5.png b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi5.png new file mode 100644 index 0000000..bc5e23f Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/img_z_suishi5.png differ diff --git a/美术文件/场景/特殊地台/3宝石钉上后状态/摆放参考.png b/美术文件/场景/特殊地台/3宝石钉上后状态/摆放参考.png new file mode 100644 index 0000000..e8e4616 Binary files /dev/null and b/美术文件/场景/特殊地台/3宝石钉上后状态/摆放参考.png differ diff --git a/美术文件/场景道具/img_blue.png b/美术文件/场景道具/img_blue.png new file mode 100644 index 0000000..8d7f388 Binary files /dev/null and b/美术文件/场景道具/img_blue.png differ diff --git a/美术文件/场景道具/img_green.png b/美术文件/场景道具/img_green.png new file mode 100644 index 0000000..f007927 Binary files /dev/null and b/美术文件/场景道具/img_green.png differ diff --git a/美术文件/场景道具/img_guangdian.png b/美术文件/场景道具/img_guangdian.png new file mode 100644 index 0000000..c74db9f Binary files /dev/null and b/美术文件/场景道具/img_guangdian.png differ diff --git a/美术文件/场景道具/img_red.png b/美术文件/场景道具/img_red.png new file mode 100644 index 0000000..19f8bfa Binary files /dev/null and b/美术文件/场景道具/img_red.png differ diff --git a/美术文件/场景道具/img_xinxi.png b/美术文件/场景道具/img_xinxi.png new file mode 100644 index 0000000..659665e Binary files /dev/null and b/美术文件/场景道具/img_xinxi.png differ diff --git a/美术文件/角色/敌人/img_lanjie.png b/美术文件/角色/敌人/img_lanjie.png index 4af2169..827289c 100644 Binary files a/美术文件/角色/敌人/img_lanjie.png and b/美术文件/角色/敌人/img_lanjie.png differ diff --git a/设计文档/场景物品设计表.xls b/设计文档/场景物品设计表.xls index 631b2ec..d7bb635 100644 Binary files a/设计文档/场景物品设计表.xls and b/设计文档/场景物品设计表.xls differ diff --git a/设计文档/场景道具.xmind b/设计文档/场景道具.xmind new file mode 100644 index 0000000..9d7372e Binary files /dev/null and b/设计文档/场景道具.xmind differ