diff --git a/meng_yao/Assets/Prefabs/Bullet/Fire.prefab b/meng_yao/Assets/Prefabs/Bullet/Fire.prefab new file mode 100644 index 000000000..97c6751e0 --- /dev/null +++ b/meng_yao/Assets/Prefabs/Bullet/Fire.prefab @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &492886037456412146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 492886037456412157} + - component: {fileID: 492886037456412156} + - component: {fileID: 3373243311622701097} + m_Layer: 0 + m_Name: Fire + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &492886037456412157 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492886037456412146} + 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: 492886037590634732} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &492886037456412156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492886037456412146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25a4f829952155e48bbe3abf99b78f2e, type: 3} + m_Name: + m_EditorClassIdentifier: + role: {fileID: 0} + attackObj: {fileID: 0} + myBulletType: 2 + bulletMoveType: 2 + BulletDeadTimer: 10 +--- !u!61 &3373243311622701097 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492886037456412146} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!1 &492886037590634733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 492886037590634732} + - component: {fileID: 492886037590634735} + - component: {fileID: 4155981886518800563} + m_Layer: 0 + m_Name: ain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &492886037590634732 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492886037590634733} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.6, y: 0, z: 0} + m_LocalScale: {x: 0.099999994, y: 0.099999994, z: 0.099999994} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 492886037456412157} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &492886037590634735 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492886037590634733} + 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: e76d40cc74c1ba44e829b4d6bcf73590, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 21.605274, y: 19.199999} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &4155981886518800563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492886037590634733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c9ace101ec275a4e9bdbca5aa9934d8, type: 3} + m_Name: + m_EditorClassIdentifier: + animationSequences: + - sprites: + - {fileID: 21300000, guid: e76d40cc74c1ba44e829b4d6bcf73590, type: 3} + - {fileID: 21300000, guid: 6ba0c86b76692524b987497193991169, type: 3} + - {fileID: 21300000, guid: 0468b8dfff97a1949b82887d418ab539, type: 3} + - {fileID: 21300000, guid: 2b65fd44cca228c488fb24c63a8ab683, type: 3} + - {fileID: 21300000, guid: 062116ebfce5f8a4fa798910ce0d1a5d, type: 3} + - {fileID: 21300000, guid: e7d21896cc45910428615b2d2ec86a23, type: 3} + - {fileID: 21300000, guid: 6de4a16c760b8e64d9a67518307e626a, type: 3} + - {fileID: 21300000, guid: f67221dcdf5508b4d995e940fbf8eeaa, type: 3} + - {fileID: 21300000, guid: 943ee05bb3ce2eb4c859e20b563315a4, type: 3} + - {fileID: 21300000, guid: 5d500d7cc0eb466449eb8a0466ddaf75, type: 3} + frameTime: 0.02 + loopType: 0 + loopCount: 1 + - sprites: + - {fileID: 21300000, guid: f91098a4f7107f64896bc1a2446f3264, type: 3} + - {fileID: 21300000, guid: 0ad229ee37caa2c4cb7008c629efadec, type: 3} + - {fileID: 21300000, guid: 13970c10cc19c31479846c59cbd9b1ab, type: 3} + - {fileID: 21300000, guid: dc3d3480afdf4664b81d280f794ffea1, type: 3} + - {fileID: 21300000, guid: 7dbf8ae252e52854b828ffe9f50d86ac, type: 3} + - {fileID: 21300000, guid: 7da8d3a4c2734c248984e003f7d96624, type: 3} + - {fileID: 21300000, guid: d3d1a475ab7464242b20e46215d9a914, type: 3} + - {fileID: 21300000, guid: e1bfa0750bbeacd4fa9176af363b700c, type: 3} + - {fileID: 21300000, guid: 518b2959286e28749adb2ce0e37c8928, type: 3} + - {fileID: 21300000, guid: 2342d29391b9f794b88075f6a83892dd, type: 3} + frameTime: 0.02 + loopType: 1 + loopCount: 3 + - sprites: + - {fileID: 21300000, guid: 7e832f6e1d0b86f4bae97666527fa936, type: 3} + - {fileID: 21300000, guid: 5b64af45c5813f84c86ffeba09afbc95, type: 3} + - {fileID: 21300000, guid: 2d062a91e5840f4469578cb115213dcb, type: 3} + - {fileID: 21300000, guid: 49c8fe51be318c64eb32b603f853f432, type: 3} + - {fileID: 21300000, guid: 43e1f72df2856714cba9c423122ea0b5, type: 3} + - {fileID: 21300000, guid: 8c114c65ad91aed49b0a6a7e63be6b6d, type: 3} + - {fileID: 21300000, guid: 6b013e843894d6e44b76fead8179208e, type: 3} + - {fileID: 21300000, guid: e692379d15c3d924aac51b5f49576781, type: 3} + - {fileID: 21300000, guid: 6397f6d1eb8029d46b75b2f88b7ce118, type: 3} + - {fileID: 21300000, guid: 78efd050c4c39c84a9976178f57038ce, type: 3} + frameTime: 0.02 + loopType: 0 + loopCount: 1 + spriteRenderer: {fileID: 492886037590634735} + groupLoopType: 2 + groupLoopCount: 3 diff --git a/meng_yao/Assets/Prefabs/Bullet/Fire.prefab.meta b/meng_yao/Assets/Prefabs/Bullet/Fire.prefab.meta new file mode 100644 index 000000000..8cf2e75ca --- /dev/null +++ b/meng_yao/Assets/Prefabs/Bullet/Fire.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3978938c41d11184ea1ce858f4d82dbe +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Prefabs/charatar/laohu.prefab b/meng_yao/Assets/Prefabs/charatar/laohu.prefab index 71e441089..9e11fa1ee 100644 --- a/meng_yao/Assets/Prefabs/charatar/laohu.prefab +++ b/meng_yao/Assets/Prefabs/charatar/laohu.prefab @@ -73,7 +73,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7c799149a5365cc45a1facec377a2a81, type: 3} + m_Sprite: {fileID: 21300000, guid: 55eab326be617db43ab0e843058ece17, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -110,7 +110,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8433650274814453344} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -129,10 +129,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 90e9cd2fc0a74084fbf1a89015db94a9, type: 3} m_Name: m_EditorClassIdentifier: - bulletPrefab: {fileID: 6998733212867311352, guid: 95e4d74ef33230c4380bb2d0780887b2, type: 3} + bulletPrefab: {fileID: 492886037456412146, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} role: {fileID: 8433650274028726420} - attackScope: 3 + attackScope: 0.5 damageTyp: 2 + attackCooldown: 10 + bulltes: [] --- !u!58 &1338343970434073545 CircleCollider2D: m_ObjectHideFlags: 0 @@ -148,7 +150,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 3 + m_Radius: 1 --- !u!1 &8433650275485930554 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/Scenes/New/Scene_map_1.unity b/meng_yao/Assets/Scenes/New/Scene_map_1.unity index 4330fd1f1..66edade24 100644 --- a/meng_yao/Assets/Scenes/New/Scene_map_1.unity +++ b/meng_yao/Assets/Scenes/New/Scene_map_1.unity @@ -7417,8 +7417,8 @@ 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: 17, y: 85} - m_SizeDelta: {x: 505.6866, y: 449.3896} + m_AnchoredPosition: {x: -8, y: 116} + m_SizeDelta: {x: 677.064, y: 601.6876} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1670253463 MonoBehaviour: diff --git a/meng_yao/Assets/Scenes/New/tast.unity b/meng_yao/Assets/Scenes/New/tast.unity index 43d0433c3..199c8cf33 100644 --- a/meng_yao/Assets/Scenes/New/tast.unity +++ b/meng_yao/Assets/Scenes/New/tast.unity @@ -429,57 +429,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1230313079 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1230313080} - - component: {fileID: 1230313081} - m_Layer: 0 - m_Name: Fire - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1230313080 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230313079} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.27194, y: -3.9393675, z: -0.63451344} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1696718376} - - {fileID: 1901411177} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1230313081 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230313079} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 25a4f829952155e48bbe3abf99b78f2e, type: 3} - m_Name: - m_EditorClassIdentifier: - role: {fileID: 0} - attackObj: {fileID: 0} - myBulletType: 2 - bulletMoveType: 2 - BulletDeadTimer: 10 --- !u!1 &1696014090 GameObject: m_ObjectHideFlags: 0 @@ -511,37 +460,6 @@ Transform: m_Father: {fileID: 193085992} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1696718375 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1696718376} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1696718376 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696718375} - 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: 1230313080} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1802466659 GameObject: m_ObjectHideFlags: 0 @@ -573,140 +491,60 @@ Transform: m_Father: {fileID: 193085992} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1901411176 -GameObject: +--- !u!1001 &492886036226231173 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1901411177} - - component: {fileID: 1901411178} - - component: {fileID: 1901411179} - m_Layer: 0 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1901411177 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1901411176} - 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: 1230313080} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1901411178 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1901411176} - 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: e76d40cc74c1ba44e829b4d6bcf73590, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 21.605274, y: 19.199999} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &1901411179 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1901411176} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c9ace101ec275a4e9bdbca5aa9934d8, type: 3} - m_Name: - m_EditorClassIdentifier: - animationSequences: - - sprites: - - {fileID: 21300000, guid: e76d40cc74c1ba44e829b4d6bcf73590, type: 3} - - {fileID: 21300000, guid: 6ba0c86b76692524b987497193991169, type: 3} - - {fileID: 21300000, guid: 0468b8dfff97a1949b82887d418ab539, type: 3} - - {fileID: 21300000, guid: 2b65fd44cca228c488fb24c63a8ab683, type: 3} - - {fileID: 21300000, guid: 062116ebfce5f8a4fa798910ce0d1a5d, type: 3} - - {fileID: 21300000, guid: e7d21896cc45910428615b2d2ec86a23, type: 3} - - {fileID: 21300000, guid: 6de4a16c760b8e64d9a67518307e626a, type: 3} - - {fileID: 21300000, guid: f67221dcdf5508b4d995e940fbf8eeaa, type: 3} - - {fileID: 21300000, guid: 943ee05bb3ce2eb4c859e20b563315a4, type: 3} - - {fileID: 21300000, guid: 5d500d7cc0eb466449eb8a0466ddaf75, type: 3} - frameTime: 1 - - sprites: - - {fileID: 21300000, guid: f91098a4f7107f64896bc1a2446f3264, type: 3} - - {fileID: 21300000, guid: 0ad229ee37caa2c4cb7008c629efadec, type: 3} - - {fileID: 21300000, guid: 13970c10cc19c31479846c59cbd9b1ab, type: 3} - - {fileID: 21300000, guid: dc3d3480afdf4664b81d280f794ffea1, type: 3} - - {fileID: 21300000, guid: 7dbf8ae252e52854b828ffe9f50d86ac, type: 3} - - {fileID: 21300000, guid: 7da8d3a4c2734c248984e003f7d96624, type: 3} - - {fileID: 21300000, guid: d3d1a475ab7464242b20e46215d9a914, type: 3} - - {fileID: 21300000, guid: e1bfa0750bbeacd4fa9176af363b700c, type: 3} - - {fileID: 21300000, guid: 518b2959286e28749adb2ce0e37c8928, type: 3} - - {fileID: 21300000, guid: 2342d29391b9f794b88075f6a83892dd, type: 3} - frameTime: 1 - - sprites: - - {fileID: 21300000, guid: 7e832f6e1d0b86f4bae97666527fa936, type: 3} - - {fileID: 21300000, guid: 5b64af45c5813f84c86ffeba09afbc95, type: 3} - - {fileID: 21300000, guid: 2d062a91e5840f4469578cb115213dcb, type: 3} - - {fileID: 21300000, guid: 49c8fe51be318c64eb32b603f853f432, type: 3} - - {fileID: 21300000, guid: 43e1f72df2856714cba9c423122ea0b5, type: 3} - - {fileID: 21300000, guid: 8c114c65ad91aed49b0a6a7e63be6b6d, type: 3} - - {fileID: 21300000, guid: 6b013e843894d6e44b76fead8179208e, type: 3} - - {fileID: 21300000, guid: e692379d15c3d924aac51b5f49576781, type: 3} - - {fileID: 21300000, guid: 6397f6d1eb8029d46b75b2f88b7ce118, type: 3} - - {fileID: 21300000, guid: 78efd050c4c39c84a9976178f57038ce, type: 3} - frameTime: 1 - spriteRenderer: {fileID: 1901411178} - currentAnimationIndex: 0 - loopType: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 492886037456412146, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_Name + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 492886037456412157, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3978938c41d11184ea1ce858f4d82dbe, type: 3} diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common index b109b30ae..f26a7c194 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit b109b30ae1dc4fcfc4fc41fe8732a09727c8f935 +Subproject commit f26a7c194de26b732df00fc752d1f53e167e0693 diff --git a/meng_yao/Assets/script/A_Fight/InitEnenyData.cs b/meng_yao/Assets/script/A_Fight/InitEnenyData.cs index 76a3cd159..1fb68b101 100644 --- a/meng_yao/Assets/script/A_Fight/InitEnenyData.cs +++ b/meng_yao/Assets/script/A_Fight/InitEnenyData.cs @@ -12,7 +12,7 @@ public class InitEnenyData : MonoBehaviour private void Awake() { instance = this; - Debug.Log(mywaypoints.Count); + // Debug.Log(mywaypoints.Count); } // 返回一个随机选择的路径点集合 diff --git a/meng_yao/Assets/script/A_Fight/cardBox.cs b/meng_yao/Assets/script/A_Fight/cardBox.cs index 47a05aa58..788cd04b7 100644 --- a/meng_yao/Assets/script/A_Fight/cardBox.cs +++ b/meng_yao/Assets/script/A_Fight/cardBox.cs @@ -27,7 +27,7 @@ public class cardBox : MonoBehaviour if (inPlaceNumber== mengyaoNumber) { gameGlobal.GameStart(); - Debug.Log("布置完成"); + //Debug.Log("布置完成"); btnObj.SetActive(true); btnObj.GetComponent