From bc14626b98377c39db4d77029326389bb34484a8 Mon Sep 17 00:00:00 2001 From: chenxin <chenxin6991@163.com> Date: Sat, 31 Oct 2020 16:59:37 +0800 Subject: [PATCH] boss动作、结算特效、选择部分特效,关卡流程的bug --- Assets/Scenes/Levels/Battle/Endless.unity | 384 ++++++++++++++++++++++-------------------------------- 1 files changed, 160 insertions(+), 224 deletions(-) diff --git a/Assets/Scenes/Levels/Battle/Endless.unity b/Assets/Scenes/Levels/Battle/Endless.unity index 7b9284f..1d2a70d 100644 --- a/Assets/Scenes/Levels/Battle/Endless.unity +++ b/Assets/Scenes/Levels/Battle/Endless.unity @@ -280,7 +280,7 @@ - {fileID: 1474449435} - {fileID: 654889359} m_Father: {fileID: 849284131} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -943,6 +943,115 @@ bOpponentSide: 1 areaMesh: {fileID: 122104238} weight: 1 +--- !u!1 &114868870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114868871} + - component: {fileID: 114868874} + - component: {fileID: 114868873} + - component: {fileID: 114868872} + - component: {fileID: 114868875} + m_Layer: 5 + m_Name: Boss + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &114868871 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114868870} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.8, y: 1.8, z: 1.8} + m_Children: [] + m_Father: {fileID: 561495239} + m_RootOrder: 7 + 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: 18, y: 584} + m_SizeDelta: {x: 1080, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &114868872 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114868870} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a8fab1a61bfa8374c836c792c68bd979, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &114868873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114868870} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9f43aa951d6e12d47a69576a54158624, 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 &114868874 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114868870} + m_CullTransparentMesh: 0 +--- !u!114 &114868875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 114868870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a9888d9463147846ada342fbc131017, type: 3} + m_Name: + m_EditorClassIdentifier: + BossAnimator: {fileID: 114868872} --- !u!1 &122104235 GameObject: m_ObjectHideFlags: 0 @@ -1436,7 +1545,6 @@ - {fileID: 1486810257} - {fileID: 44403929} - {fileID: 203833506} - - {fileID: 386100046} m_Father: {fileID: 561495239} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1459,7 +1567,7 @@ m_EditorClassIdentifier: HPImage1: {fileID: 2044565606} HPImage2: {fileID: 1486810258} - BossImage: {fileID: 853139038} + BossImage: {fileID: 0} BaseBlood: {fileID: 21300000, guid: f9a15ea7a2090444e88b74ec5ec9a825, type: 3} Speed: 0.3 WaveNumText: {fileID: 203833507} @@ -2626,7 +2734,7 @@ - {fileID: 2031820231} - {fileID: 1525511251} m_Father: {fileID: 849284131} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2650,7 +2758,8 @@ - {fileID: 1883569033} - {fileID: 1310262349} SelectBtn: {fileID: 1525511252} - EffectObj: {fileID: 1178370179} + EffectPrefabObject: {fileID: 8778242158096956769, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, + type: 3} --- !u!1 &309006004 GameObject: m_ObjectHideFlags: 0 @@ -2946,42 +3055,6 @@ area: 0.05177675 completeArea: 0.70710707 outSidePointsParent: {fileID: 1410659829} ---- !u!1 &386100045 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 386100046} - m_Layer: 5 - m_Name: Boss - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &386100046 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 386100045} - 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_Children: - - {fileID: 853139037} - m_Father: {fileID: 181323909} - m_RootOrder: 4 - 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: 2, y: -242.0003} - m_SizeDelta: {x: 411, y: 438} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &392880631 GameObject: m_ObjectHideFlags: 0 @@ -4050,7 +4123,7 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 541755970} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000007152557} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 19764330} @@ -4058,7 +4131,7 @@ 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: 444} + m_AnchoredPosition: {x: 0, y: 528} m_SizeDelta: {x: 1080, y: 425} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &541755972 @@ -4233,6 +4306,7 @@ - {fileID: 181323909} - {fileID: 1570259601} - {fileID: 559457822} + - {fileID: 114868871} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6313,10 +6387,10 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 1172214030} - {fileID: 306286610} - {fileID: 19764330} - {fileID: 1730636813} + - {fileID: 1172214030} m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6325,81 +6399,6 @@ m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &853139036 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 853139037} - - component: {fileID: 853139039} - - component: {fileID: 853139038} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &853139037 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853139036} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} - m_Children: [] - m_Father: {fileID: 386100046} - m_RootOrder: 0 - 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: 1954, y: 1613} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &853139038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853139036} - 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: 075c38bb7e6a0a941ad9dcdf00975081, 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 &853139039 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 853139036} - m_CullTransparentMesh: 0 --- !u!1 &861002745 GameObject: m_ObjectHideFlags: 0 @@ -6580,6 +6579,36 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 895529420} m_CullTransparentMesh: 0 +--- !u!1 &898016331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 898016332} + m_Layer: 0 + m_Name: ParticleSystemObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &898016332 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898016331} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 73, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &902738588 GameObject: m_ObjectHideFlags: 0 @@ -9545,7 +9574,7 @@ - {fileID: 1108718555} - {fileID: 1387193656} m_Father: {fileID: 849284131} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9608,8 +9637,8 @@ m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 + m_fontSize: 200 + m_fontSizeBase: 200 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -9644,7 +9673,7 @@ m_VertexBufferAutoSizeReduction: 1 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -188.74492, y: 0, z: -207.61734, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -9759,101 +9788,6 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1172845526} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1178370178 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalPosition.x - value: -21.6 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalPosition.y - value: 73.4 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalPosition.z - value: 5.5 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 7783682426108990601, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 7793989333963163665, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8778242158096956769, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - propertyPath: m_Name - value: Effect_xuanze - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, type: 3} ---- !u!1 &1178370179 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8778242158096956769, guid: 2510c4ef924ab244985ab6e0dd4e0ec6, - type: 3} - m_PrefabInstance: {fileID: 1178370178} - m_PrefabAsset: {fileID: 0} --- !u!1 &1178594625 GameObject: m_ObjectHideFlags: 0 @@ -11251,7 +11185,7 @@ m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 285} - m_SizeDelta: {x: 300, y: 30} + m_SizeDelta: {x: 500, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1346638858 MonoBehaviour: @@ -11266,7 +11200,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9622642, g: 0.9338108, b: 0.15795653, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -11275,7 +11209,7 @@ m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 24 + m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 @@ -11286,7 +11220,7 @@ m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6700\u7EC8\u6CE2\u6B21\uFF1A\u7B2C500\u5173\u7B2C600\u6CE2" + m_Text: "\u7B2C500\u5173\u7B2C600\u6CE2" --- !u!222 &1346638859 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14131,7 +14065,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 849284131} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16516,7 +16450,7 @@ m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -16656,6 +16590,8 @@ FinalWaveText: {fileID: 1346638858} PropListUI: {fileID: 654889358} SettlementUI: {fileID: 19764329} + EffectPrefabObject: {fileID: 7138521553006750645, guid: dc871e79b125aae4c85ce1a65454d733, + type: 3} --- !u!114 &1967975865 MonoBehaviour: m_ObjectHideFlags: 0 -- Gitblit v1.9.1