diff --git a/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/AttackShort.anim b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/AttackShort.anim index 0dbf2280..db2ca817 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/AttackShort.anim +++ b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/AttackShort.anim @@ -14,35 +14,44 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.319, y: 0.185, z: 0.38} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0.319, y: 0.77, z: 0.38} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.319, y: 0.185, z: 0.38} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: 21300000, guid: a42b63ef21b40a44188d10ccba5f8a13, type: 3} - - time: 0.11666667 - value: {fileID: 21300000, guid: 1f671c9075dd43a42aaaa0a1fb47f7ac, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: 084d501d700b53a4cbcf7cbf423e67d7, type: 3} - - time: 0.41666666 - value: {fileID: 21300000, guid: d9673e81d5dbef745bcb63be76b8e000, type: 3} - - time: 0.46666667 - value: {fileID: 21300000, guid: 1d4ba1b6112198142a185ded66277a64, type: 3} - - time: 0.51666665 - value: {fileID: 21300000, guid: 678cca87b106cc14590858c1340709fe, type: 3} - - time: 0.5833333 - value: {fileID: 21300000, guid: 3dbf4b665e51a804187aa2b0f09c58a0, type: 3} - - time: 0.71666664 - value: {fileID: 21300000, guid: fcb87208a15c34143bf685c3e3f9e1e7, type: 3} - - time: 0.8833333 - value: {fileID: 21300000, guid: 49f20f73a6b13914ba24d8e3a33752a9, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - flags: 2 + m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -52,29 +61,20 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 0 - attribute: 0 + attribute: 1 script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 + typeID: 4 + customType: 0 + isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: 21300000, guid: a42b63ef21b40a44188d10ccba5f8a13, type: 3} - - {fileID: 21300000, guid: 1f671c9075dd43a42aaaa0a1fb47f7ac, type: 3} - - {fileID: 21300000, guid: 084d501d700b53a4cbcf7cbf423e67d7, type: 3} - - {fileID: 21300000, guid: d9673e81d5dbef745bcb63be76b8e000, type: 3} - - {fileID: 21300000, guid: 1d4ba1b6112198142a185ded66277a64, type: 3} - - {fileID: 21300000, guid: 678cca87b106cc14590858c1340709fe, type: 3} - - {fileID: 21300000, guid: 3dbf4b665e51a804187aa2b0f09c58a0, type: 3} - - {fileID: 21300000, guid: fcb87208a15c34143bf685c3e3f9e1e7, type: 3} - - {fileID: 21300000, guid: 49f20f73a6b13914ba24d8e3a33752a9, type: 3} + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.9 + m_StopTime: 0.6666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -89,15 +89,125 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.319 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.185 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.77 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.185 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.38 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: - - time: 0.36666667 - functionName: AttackVoicePlayer - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim new file mode 100644 index 00000000..25190800 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: none + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim.meta b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim.meta new file mode 100644 index 00000000..2781ca0b --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19e2b78de33bc07478716f340f1df20f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/playerAni.controller b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/playerAni.controller index 259f673f..8ef541bd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/playerAni.controller +++ b/ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/playerAni.controller @@ -11,7 +11,6 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -2631735499208187108} - {fileID: -2740206605776522904} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} @@ -22,7 +21,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: aeef1255bc1df8c48a9bdb1051c749e8, type: 2} + m_Motion: {fileID: 7400000, guid: 19e2b78de33bc07478716f340f1df20f, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -53,31 +52,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-2631735499208187108 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: move - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3713776644712451186} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75409836 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-2580958152059753047 AnimatorState: serializedVersion: 6 @@ -86,7 +60,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: AttackShort - m_Speed: 1 + m_Speed: 2 m_CycleOffset: 0 m_Transitions: - {fileID: 5696496716602928511} @@ -119,13 +93,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: attack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -150,13 +124,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -6036269737509403969} - m_Position: {x: 0, y: 260, z: 0} + m_Position: {x: 40, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: -2580958152059753047} - m_Position: {x: 310, y: 260, z: 0} + m_Position: {x: 320, y: 250, z: 0} - serializedVersion: 1 m_State: {fileID: 3713776644712451186} - m_Position: {x: 120, y: 350, z: 0} + m_Position: {x: 40, y: 360, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -177,8 +151,7 @@ AnimatorState: m_Name: Move m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 5940797015065165906} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -208,36 +181,11 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75409836 + m_ExitTime: 1 m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &5940797015065165906 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: move - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6036269737509403969} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75409836 - m_HasExitTime: 0 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta index c7363e76..55fd2a56 100644 --- a/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta +++ b/ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta @@ -138,8 +138,8 @@ TextureImporter: y: 299 width: 502 height: 568 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.48820016, y: 0.30185232} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab index 9781c419..15d4d3b0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab @@ -154,6 +154,104 @@ MonoBehaviour: speed: 0.005 currentdisappearTime: 0 aimGamgObject: {fileID: 0} +--- !u!1 &1314556980751243917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2109013878162462771} + - component: {fileID: 6455667115297943236} + - component: {fileID: 8242089696254415575} + m_Layer: 9 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2109013878162462771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314556980751243917} + serializedVersion: 2 + m_LocalRotation: {x: 0.19320382, y: 0.42019618, z: -0.10795913, w: 0.88002974} + m_LocalPosition: {x: 0.055, y: 0.694, z: -0.02} + m_LocalScale: {x: 0.055, y: 0.0552475, z: 0.055} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 4158766577167906083} + m_LocalEulerAnglesHint: {x: 25.517, y: 50.649, z: -1.756} +--- !u!212 &6455667115297943236 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314556980751243917} + 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: 21300000, guid: e69f8bdf1b6fb814794e42cac08d7549, 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!114 &8242089696254415575 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1314556980751243917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} --- !u!1 &1880325291853289959 GameObject: m_ObjectHideFlags: 0 @@ -186,8 +284,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 322596807654122222} + - {fileID: 2109013878162462771} - {fileID: 8098012657445599304} + - {fileID: 322596807654122222} - {fileID: 5661943736827879434} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -242,6 +341,7 @@ MonoBehaviour: followPoint: {fileID: 8098012657445599304} bone: {fileID: 6928223977781211758, guid: 5a133951e41a4ec43a57bc107e44f87e, type: 3} bone_Re: {fileID: 0} + lasteHp: 0 canMove: 0 planAction: 2 --- !u!114 &8412139385272254344 @@ -272,13 +372,14 @@ GameObject: - component: {fileID: 322596807654122222} - component: {fileID: 278785895296680341} - component: {fileID: 2729846693771078170} + - component: {fileID: 3298301351620550330} m_Layer: 9 m_Name: Enemy_1 m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &322596807654122222 Transform: m_ObjectHideFlags: 0 @@ -344,6 +445,19 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3298301351620550330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2778471538238530486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} --- !u!1 &8800151131615427679 GameObject: m_ObjectHideFlags: 0 @@ -367,15 +481,15 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8800151131615427679} - m_LocalRotation: {x: 0.19956653, y: 0.38129517, z: -0.08378536, w: 0.8987587} - m_LocalPosition: {x: 0, y: 0, z: -0.23} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494} + m_LocalPosition: {x: 0, y: 0, z: -0.273} + m_LocalScale: {x: 1, y: 0.99999976, z: 1.0000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4158766577167906083} - m_LocalEulerAnglesHint: {x: 25, y: 46, z: 0.1} + m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.25, y: 0.317} + m_AnchoredPosition: {x: -0.371, y: 0.398} m_SizeDelta: {x: 1.164, y: 0.6462} m_Pivot: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab index 59ff61c7..de1763a8 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab @@ -343,6 +343,7 @@ GameObject: - component: {fileID: 8739798778191560965} - component: {fileID: 8570734685845233804} - component: {fileID: 6055812006071397122} + - component: {fileID: 2423811669981212207} m_Layer: 10 m_Name: EnemyInSenceCanvas(Clone) m_TagString: Untagged @@ -481,7 +482,20 @@ BoxCollider: m_Enabled: 1 serializedVersion: 3 m_Size: {x: 0.7, y: 0.7, z: 0.100000024} - m_Center: {x: 0, y: 0.6, z: 0} + m_Center: {x: 0, y: 0.6, z: -0.2} +--- !u!114 &2423811669981212207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964438308613443404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3} + m_Name: + m_EditorClassIdentifier: + _camera: {fileID: 0} --- !u!1 &1844870834168589050 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab index 2b674031..e42b4d0b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab @@ -230,8 +230,12 @@ MonoBehaviour: nextLevelNodes: [] lineRenderer: {fileID: 3498766877212628700, guid: 627727da82f872c4dbc2519635427a3d, type: 3} + lineOffset: 0 + lineOffsetInFight: 30 roomType: 0 roomDestinationIndex: 0 + roomIcon: {fileID: 0} + roomText: {fileID: 0} --- !u!1 &5824790460616149335 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab index de4b817d..f290ba75 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab @@ -58,14 +58,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: -1106922250, guid: 3f178ac41dab5ba4f87ae0183d99f2ff, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index d2bf0b40..50bc7cbf 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -856,7 +856,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 60998406} - m_Enabled: 0 + m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: f6dd374739cf95b4f9c87536c4106a36, type: 2} m_CullingMode: 0 @@ -3291,96 +3291,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b11a487f21e55274181e172db1955ef0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &210762156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 210762157} - - component: {fileID: 210762160} - - component: {fileID: 210762159} - - component: {fileID: 210762158} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &210762157 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 210762156} - 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: 1780349018} - m_Father: {fileID: 1982133052} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &210762158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 210762156} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &210762159 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 210762156} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &210762160 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 210762156} - m_CullTransparentMesh: 1 --- !u!1 &216708359 GameObject: m_ObjectHideFlags: 0 @@ -3562,7 +3472,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -592, y: -306} + m_AnchoredPosition: {x: -771, y: -343} m_SizeDelta: {x: 491.36, y: 140.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &218472043 @@ -3829,6 +3739,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223587224} m_CullTransparentMesh: 1 +--- !u!1 &234112441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 234112442} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &234112442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 234112441} + 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: 2132133212} + m_Father: {fileID: 465036639} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &253958914 GameObject: m_ObjectHideFlags: 0 @@ -4432,16 +4378,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282261046} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1780349018} + m_Father: {fileID: 513794050} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -450, y: -878} + m_AnchoredPosition: {x: -1110, y: -303} m_SizeDelta: {x: 131, y: 197} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &285844505 @@ -6563,7 +6509,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -8309,6 +8255,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464618902} m_CullTransparentMesh: 1 +--- !u!1 &465036638 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 465036639} + - component: {fileID: 465036642} + - component: {fileID: 465036641} + - component: {fileID: 465036640} + m_Layer: 5 + m_Name: Scrollbar Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &465036639 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 465036638} + 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: 234112442} + m_Father: {fileID: 1611111519} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!114 &465036640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 465036638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2132133213} + m_HandleRect: {fileID: 2132133212} + m_Direction: 0 + m_Value: 0 + m_Size: 0.45375586 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &465036641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 465036638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &465036642 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 465036638} + m_CullTransparentMesh: 1 --- !u!1 &467535681 GameObject: m_ObjectHideFlags: 0 @@ -8529,7 +8601,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -9824,6 +9896,93 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 512020676} m_CullTransparentMesh: 1 +--- !u!1 &513794049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 513794050} + - component: {fileID: 513794051} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &513794050 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513794049} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000023619} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 282261047} + - {fileID: 1941832819} + - {fileID: 812365597} + - {fileID: 919224487} + m_Father: {fileID: 1341243797} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: -4.25} + m_SizeDelta: {x: 2820.9, y: 791.5} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &513794051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 513794049} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 92ebdfcbdb82fb149b8613ed10e2f9e8, type: 3} + m_Name: + m_EditorClassIdentifier: + levelPrefab: {fileID: 2776771565202051383, guid: 8b905c93e0100a840bdd4b09bd25384a, + type: 3} + levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} + generatorPoint: {fileID: 282261046} + lineOffset: 100 + columnOffset: 150 + levelMap: + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + - levelColumn: [] + monsterIcon: {fileID: 1709634788, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + eliteMonsterIcon: {fileID: 929432110, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + bossIcon: {fileID: 865203525, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + shopIcon: {fileID: 865446097, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + campfireIcon: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + incidentIcon: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + treasureIcon: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + mosterBig: {x: 0.4, y: 0.4, z: 0.4} + eliteMosterBig: {x: 0.5, y: 0.5, z: 0.5} + shopBig: {x: 0.5, y: 0.5, z: 0.5} + incidentBig: {x: 0.45, y: 0.45, z: 0.45} + campfireBig: {x: 0.45, y: 0.45, z: 0.45} + bossBig: {x: 0.8, y: 0.8, z: 0.8} + treasureBig: {x: 0.4, y: 0.4, z: 0.4} --- !u!1 &513901905 GameObject: m_ObjectHideFlags: 0 @@ -10706,7 +10865,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1731567177} m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp - m_MethodName: UIClickPlayer + m_MethodName: MenuClosePlayer m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -11448,7 +11607,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -13610,7 +13769,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1731567177} m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp - m_MethodName: UIClickPlayer + m_MethodName: MenuClosePlayer m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -14420,6 +14579,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809894445} m_CullTransparentMesh: 1 +--- !u!1 &812365596 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 812365597} + - component: {fileID: 812365599} + - component: {fileID: 812365598} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &812365597 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812365596} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 513794050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 2818, y: 0} + m_SizeDelta: {x: 1410.2002, y: 792.56} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &812365598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812365596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b5d132332ff25a44aa45b175b20ca9c9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &812365599 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812365596} + m_CullTransparentMesh: 1 --- !u!1 &813012068 GameObject: m_ObjectHideFlags: 0 @@ -15913,6 +16147,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 910259996} m_CullTransparentMesh: 1 +--- !u!1 &919224486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 919224487} + - component: {fileID: 919224489} + - component: {fileID: 919224488} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &919224487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919224486} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1081034591} + m_Father: {fileID: 513794050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 72, y: 23.1} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &919224488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919224486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ff32fb1659a153e42a94662fdb5b6066, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &919224489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 919224486} + m_CullTransparentMesh: 1 --- !u!1 &919678623 GameObject: m_ObjectHideFlags: 0 @@ -17250,7 +17560,7 @@ AudioSource: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 992566368} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3} @@ -18534,6 +18844,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076314298} m_CullTransparentMesh: 1 +--- !u!1 &1081034590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1081034591} + - component: {fileID: 1081034593} + - component: {fileID: 1081034592} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1081034591 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081034590} + m_LocalRotation: {x: 0, y: 0, z: 0.021814892, w: 0.999762} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 919224487} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 76, y: -22} + m_SizeDelta: {x: 45, y: 5} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1081034592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081034590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1543605294, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1081034593 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081034590} + m_CullTransparentMesh: 1 --- !u!1 &1086901266 GameObject: m_ObjectHideFlags: 0 @@ -22253,132 +22638,6 @@ RectTransform: m_AnchoredPosition: {x: 296.99988, y: 28.66513} m_SizeDelta: {x: 70.7, y: 57.65} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1271583135 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1271583136} - - component: {fileID: 1271583139} - - component: {fileID: 1271583138} - - component: {fileID: 1271583137} - m_Layer: 5 - m_Name: Scrollbar Vertical - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1271583136 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271583135} - 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: 1736686173} - m_Father: {fileID: 1982133052} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -0.000061035} - m_Pivot: {x: 1, y: 1} ---- !u!114 &1271583137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271583135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1387694160} - m_HandleRect: {fileID: 1387694159} - m_Direction: 2 - m_Value: 0 - m_Size: 0.53999996 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1271583138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271583135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1271583139 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271583135} - m_CullTransparentMesh: 1 --- !u!1 &1275515499 GameObject: m_ObjectHideFlags: 0 @@ -23218,7 +23477,7 @@ MonoBehaviour: m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -23820,6 +24079,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1337505876} m_CullTransparentMesh: 1 +--- !u!1 &1341243796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1341243797} + - component: {fileID: 1341243800} + - component: {fileID: 1341243799} + - component: {fileID: 1341243798} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1341243797 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341243796} + 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: 513794050} + m_Father: {fileID: 1611111519} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -17} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1341243798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341243796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1341243799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341243796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1341243800 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341243796} + m_CullTransparentMesh: 1 --- !u!1 &1373007394 GameObject: m_ObjectHideFlags: 0 @@ -24235,81 +24584,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1383214999} m_CullTransparentMesh: 1 ---- !u!1 &1387694158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1387694159} - - component: {fileID: 1387694161} - - component: {fileID: 1387694160} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1387694159 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387694158} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1736686173} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.54} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1387694160 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387694158} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1387694161 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387694158} - m_CullTransparentMesh: 1 --- !u!1 &1411570287 GameObject: m_ObjectHideFlags: 0 @@ -28154,6 +28428,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1608025176} m_CullTransparentMesh: 1 +--- !u!1 &1611111518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1611111519} + - component: {fileID: 1611111522} + - component: {fileID: 1611111521} + - component: {fileID: 1611111520} + m_Layer: 5 + m_Name: mainMapView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1611111519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1611111518} + 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: 1341243797} + - {fileID: 465036639} + m_Father: {fileID: 1803518538} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1280, y: 800} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1611111520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1611111518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 513794050} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1341243797} + m_HorizontalScrollbar: {fileID: 465036640} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1611111521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1611111518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1611111522 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1611111518} + m_CullTransparentMesh: 1 --- !u!1 &1612911696 GameObject: m_ObjectHideFlags: 0 @@ -30117,42 +30499,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1736686172 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1736686173} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1736686173 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736686172} - 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: 1387694159} - m_Father: {fileID: 1271583136} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1740592867 GameObject: m_ObjectHideFlags: 0 @@ -31190,108 +31536,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1779627253} m_CullTransparentMesh: 1 ---- !u!1 &1780349017 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1780349018} - - component: {fileID: 1780349019} - - component: {fileID: 1780349020} - m_Layer: 5 - m_Name: CardContent - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1780349018 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780349017} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00003701212} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 282261047} - m_Father: {fileID: 210762157} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0.000030517578, y: 0} - m_SizeDelta: {x: 834, y: 2000} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &1780349019 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780349017} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 45 - m_Right: 0 - m_Top: 20 - m_Bottom: 0 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 131, y: 197} - m_Spacing: {x: 20, y: 20} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!114 &1780349020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1780349017} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 92ebdfcbdb82fb149b8613ed10e2f9e8, type: 3} - m_Name: - m_EditorClassIdentifier: - levelPrefab: {fileID: 2776771565202051383, guid: 8b905c93e0100a840bdd4b09bd25384a, - type: 3} - levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} - generatorPoint: {fileID: 282261046} - lineOffset: 150 - columnOffset: 150 - levelMap: - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - - levelColumn: [] - monsterIcon: {fileID: 21300000, guid: 76c98050a10569a47b1a39a896495b71, type: 3} - eliteMonsterIcon: {fileID: 21300000, guid: 646e58a8cd5cd2145bf0985299361fa8, type: 3} - bossIcon: {fileID: 21300000, guid: a61b314c8ac7c44468531f8788cfafcc, type: 3} - shopIcon: {fileID: 21300000, guid: 0ede3fde763ed2f4eb0a9d302223dfc8, type: 3} - campfireIcon: {fileID: 21300000, guid: 61f8f385d55979a48aeda4bcce61fccf, type: 3} - incidentIcon: {fileID: 21300000, guid: 44e3626da16308c43b0b0c0842f18ab9, type: 3} - treasureIcon: {fileID: 21300000, guid: ec538e81295984d4ab30a848644947dc, type: 3} --- !u!1 &1781804769 GameObject: m_ObjectHideFlags: 0 @@ -31773,7 +32017,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1731567177} m_TargetAssemblyTypeName: UIAudio, Assembly-CSharp - m_MethodName: UIClickPlayer + m_MethodName: MenuClosePlayer m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -32267,7 +32511,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1982133052} + - {fileID: 1611111519} - {fileID: 218472042} m_Father: {fileID: 846544929} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -34479,6 +34723,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1931945937} m_CullTransparentMesh: 1 +--- !u!1 &1941832818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1941832819} + - component: {fileID: 1941832821} + - component: {fileID: 1941832820} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1941832819 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941832818} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 513794050} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1410.2, y: 792.56} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1941832820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941832818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: b5d132332ff25a44aa45b175b20ca9c9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1941832821 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941832818} + m_CullTransparentMesh: 1 --- !u!1 &1949385018 GameObject: m_ObjectHideFlags: 0 @@ -35432,114 +35751,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981478567} m_CullTransparentMesh: 1 ---- !u!1 &1982133051 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1982133052} - - component: {fileID: 1982133055} - - component: {fileID: 1982133054} - - component: {fileID: 1982133053} - m_Layer: 5 - m_Name: MainGroundScroll View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1982133052 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982133051} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.000022207} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 210762157} - - {fileID: 1271583136} - m_Father: {fileID: 1803518538} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 11.24, y: 0.0024872} - m_SizeDelta: {x: 851, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1982133053 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982133051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 1780349018} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 45 - m_Viewport: {fileID: 210762157} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 1271583137} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1982133054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982133051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b0ea3df8b35153c43b1bdabc1fdc164c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1982133055 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982133051} - m_CullTransparentMesh: 1 --- !u!1 &1998717000 GameObject: m_ObjectHideFlags: 0 @@ -37337,6 +37548,81 @@ Transform: m_Children: [] m_Father: {fileID: 1852574232} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2132133211 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2132133212} + - component: {fileID: 2132133214} + - component: {fileID: 2132133213} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2132133212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132133211} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 234112442} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.45375586, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2132133213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132133211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2132133214 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132133211} + m_CullTransparentMesh: 1 --- !u!4 &29249060631100806 Transform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs index b244ffc1..20c89d4d 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using static UnityEngine.Rendering.DebugUI; public class AudioManager : Singleton { @@ -134,4 +135,9 @@ public class AudioManager : Singleton enemyActionSource.clip = enemyHurtClip; enemyActionSource.Play(); } + public IEnumerator WaitShieldVoicePlayer(int value , float time) + { + yield return new WaitForSeconds(time); + ShieldVoicePlayer(value); + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs index 026108d0..662ce6ff 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs @@ -138,15 +138,12 @@ public class CardEntity : MonoBehaviour //Ч AudioManager.Instance.AttackVoicePlayer(); //ͽɫת - if(cardOriginalData .CarType == 1) - { - Player player = GameManager.Instance.player; - player.anim.SetTrigger("attack"); + Player player = GameManager.Instance.player; + player.anim.SetTrigger("attack"); + Vector3 dis = Input.mousePosition + Vector3.forward *15; + Vector3 pos = Camera.main.ScreenToWorldPoint(dis); + player.FlipLocalScale(pos); - Vector3 dis = Input.mousePosition + Vector3.forward * 15; - Vector3 pos = Camera.main.ScreenToWorldPoint(dis); - player.FlipLocalScale(pos); - } //debug Debug.Log(""+cardOriginalData.ChineseName); //ɫؿЧ diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 860cdd13..4219bad3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -152,7 +152,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver //ѪЧ if(EnemyState .currentHP < lasteHp ) { - StartCoroutine(EnemyHurtVoice(1.3f)); + StartCoroutine(EnemyHurtVoice(0.9f)); lasteHp = (int)EnemyState.currentHP; } } @@ -172,7 +172,8 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver { //this.transform.position = GameManager.Instance.X[positionX].Y[positionY].transform.position; GameManager.Instance.X[positionX].Y[positionY].enemyNode = this; - if(enemyType ==EnemyType.block) + transform.SetParent(GameManager.Instance.X[positionX].Y[positionY].CylinderFloor.transform); + if (enemyType ==EnemyType.block) { GameManager.Instance.X[positionX].Y[positionY].blocked = true; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkullGuardian.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkullGuardian.cs index e822d668..75837d97 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkullGuardian.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkullGuardian.cs @@ -139,6 +139,7 @@ public class SkullGuardian : MonoBehaviour enemyNode.positionX = disNode.locationX; enemyNode.positionY = disNode.locationY; disNode.enemyNode = enemyNode; + transform.SetParent(disNode.CylinderFloor.transform); yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode)); } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs index fa671533..1e57c383 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using static LevelDevelopManager; public class InFightMap : Singleton { @@ -22,7 +23,14 @@ public class InFightMap : Singleton public Sprite campfireIcon; public Sprite incidentIcon; public Sprite treasureIcon; - + [Header("ڵɴС")] + public Vector3 mosterBig; + public Vector3 eliteMosterBig; + public Vector3 shopBig; + public Vector3 incidentBig; + public Vector3 campfireBig; + public Vector3 bossBig; + public Vector3 treasureBig; private void Start() { originalPoint = generatorPoint.transform.localPosition; @@ -52,10 +60,10 @@ public class InFightMap : Singleton { if (i == generatorLine - 1) { - generatorPoint.transform.localPosition = new Vector3(originalPoint.x, generatorPoint.transform.localPosition.y + columnOffset, 0); + generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x + columnOffset, originalPoint.y , 0); for (int j = 0; j < generatorColumn; j++) { - generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x + lineOffset, generatorPoint.transform.localPosition.y, 0); + generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x , generatorPoint.transform.localPosition.y + lineOffset, 0); //var level = Instantiate(levelPrefab, generatorPoint.transform.position, this.transform.rotation); //level.transform.SetParent(transform); @@ -76,13 +84,13 @@ public class InFightMap : Singleton { for (int j = 0; j < generatorColumn; j++) { - generatorPoint.transform.localPosition= new Vector3(generatorPoint.transform.localPosition.x + lineOffset, generatorPoint.transform.localPosition.y, 0); + generatorPoint.transform.localPosition= new Vector3(generatorPoint.transform.localPosition.x , generatorPoint.transform.localPosition.y + lineOffset, 0); GenerateLevelNode(i, j, generatorPoint.transform.localPosition); } } - generatorPoint.transform.localPosition = new Vector3(originalPoint.x, generatorPoint.transform.localPosition.y + columnOffset, 0); + generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x + columnOffset, originalPoint.y, 0); } } //ݱϢɵͼ @@ -100,7 +108,7 @@ public class InFightMap : Singleton } } - + SetRoomBig(); for (int i = 0; i } } + + //÷С + public void SetRoomBig() + { + for (int i = 0; i < levelDevelopData.levelSaveMap.Count; i++) + { + for (int j = 0; j < levelDevelopData.levelSaveMap[i].levelDataList.Count; j++) + { + switch (levelDevelopData.levelSaveMap[i].levelDataList[j].roomType) + { + case RoomType.monster: + levelMap[i].levelColumn[j].roomIcon .transform.localScale = mosterBig; + break; + case RoomType.eliteMonster: + levelMap[i].levelColumn[j].roomIcon.transform.localScale = eliteMosterBig; + break; + case RoomType.shop: + levelMap[i].levelColumn[j].roomIcon.transform.localScale = shopBig; + break; + case RoomType.incident: + levelMap[i].levelColumn[j].roomIcon.transform.localScale = incidentBig; + break; + case RoomType.treasure: + levelMap[i].levelColumn[j].roomIcon.transform.localScale = treasureBig; + break; + case RoomType.boss: + levelMap[i].levelColumn[j].roomIcon.transform.localScale = bossBig; + break; + case RoomType.campfire: + levelMap[i].levelColumn[j].roomIcon.transform.localScale = campfireBig; + break; + } + } + + } + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs index b6a6ab68..f9f93d7a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs @@ -21,13 +21,14 @@ public class LevelNode : MonoBehaviour public GameObject lineRenderer; [Header("߶ƫ")] public float lineOffset; + public float lineOffsetInFight; [Header("")] public LevelDevelopManager.RoomType roomType; [Header("Ŀĵ")] public int roomDestinationIndex; - - Image roomIcon; - Text roomText; + [Header("װ")] + public Image roomIcon; + public Text roomText; private void OnEnable() { @@ -252,9 +253,10 @@ public class LevelNode : MonoBehaviour line.transform.Rotate(0, 0, angle); // - float distance = Vector3.Distance(nextLevelNodes[i].transform.localPosition ,transform.localPosition); - Debug.Log(distance ); - line.GetComponent().sizeDelta = new Vector2(line.GetComponent().sizeDelta.x, distance); + float distance = Vector3.Distance(nextLevelNodes[i].transform.localPosition ,transform.localPosition ); + Debug.Log(distance); + line.GetComponent().sizeDelta = new Vector2(line.GetComponent().sizeDelta.x, distance - lineOffsetInFight * 2); + line.GetComponent().localPosition += new Vector3 ( lineOffsetInFight,0,0); } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs index 610bb1b5..7d659318 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs @@ -193,8 +193,7 @@ public class MapManager : Singleton EnemyNode enemynode = currentEnemy.GetComponent(); enemynode.positionX = enemy.locationX; enemynode.positionY = enemy.locationY; - enemynode.StartPosition(); - + enemynode.StartPosition(); } yield return null; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs index 7a262021..2372f5d9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs @@ -62,11 +62,11 @@ public class Usermanager : Singleton } private void Update() { - if(lasteShield != shield ) + /* if(lasteShield != shield ) { if (lasteShield < shield) { - AudioManager.Instance.ShieldVoicePlayer(1); + StartCoroutine(AudioManager.Instance.WaitShieldVoicePlayer(1, 0.9f)); } else { @@ -74,7 +74,7 @@ public class Usermanager : Singleton } lasteShield = shield; } - + */ } //Buffʩ public void SufferPlayerAbnormalCondition(string condition, int value ,Buff buff)