diff --git a/Assets/Prefabs/着火.prefab b/Assets/Prefabs/着火.prefab new file mode 100644 index 0000000..ac2a61e --- /dev/null +++ b/Assets/Prefabs/着火.prefab @@ -0,0 +1,97 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4181178188287077447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4181178188287077441} + - component: {fileID: 4181178188287077446} + - component: {fileID: 2212176824050044244} + m_Layer: 0 + m_Name: "\u7740\u706B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4181178188287077441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4181178188287077447} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.05, y: 6.19, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4181178188287077446 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4181178188287077447} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 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: 5c0aba5708616c04182e2737f0b79fec, type: 3} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.93, y: 6.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &2212176824050044244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4181178188287077447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e98d963784aa3d8438ed294296859be5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/着火.prefab.meta b/Assets/Prefabs/着火.prefab.meta new file mode 100644 index 0000000..e9db4b8 --- /dev/null +++ b/Assets/Prefabs/着火.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ca7046f990a45f44688a8e4097d6402e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/乐/Sample1.unity b/Assets/Scenes/乐/Sample1.unity index cc219a1..9c1e934 100644 --- a/Assets/Scenes/乐/Sample1.unity +++ b/Assets/Scenes/乐/Sample1.unity @@ -857,7 +857,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6620016358095660856, guid: edecf791093330a4b8299512214e3c7b, type: 3} propertyPath: m_LocalPosition.x @@ -936,7 +936,7 @@ Transform: m_Children: - {fileID: 1375056503} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &831954387 MonoBehaviour: @@ -1016,7 +1016,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7863567265678196433, guid: c4cc5bce000aaa448b52dec73dc44706, type: 3} propertyPath: m_LocalPosition.x @@ -1157,6 +1157,78 @@ Transform: m_Father: {fileID: 663361288} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 58.269} +--- !u!1 &1167537483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1167537484} + - component: {fileID: 1167537485} + - component: {fileID: 1167537486} + m_Layer: 0 + m_Name: Fire + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1167537484 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167537483} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.23, y: -1.92, z: -3.7690403} + m_LocalScale: {x: 0.60172, y: 0.60172, z: 0.60172} + m_Children: + - {fileID: 1346768666} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1167537485 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167537483} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.11254048, y: -0.5401933} + 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: 3.6559515, y: 2.0803866} + m_EdgeRadius: 0 +--- !u!114 &1167537486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167537483} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3117bb72947fa847aa126fa768a3881, type: 3} + m_Name: + m_EditorClassIdentifier: + fireStick: {fileID: 8452581746669843344} --- !u!1001 &1213287236 PrefabInstance: m_ObjectHideFlags: 0 @@ -1166,7 +1238,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1936023874439208072, guid: a74564a767dc70240816885b2afad328, type: 3} propertyPath: m_LocalPosition.x @@ -1214,6 +1286,88 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a74564a767dc70240816885b2afad328, type: 3} +--- !u!1 &1346768665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1346768666} + - component: {fileID: 1346768667} + m_Layer: 0 + m_Name: "\u706B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1346768666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1346768665} + 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: [] + m_Father: {fileID: 1167537484} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1346768667 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1346768665} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 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: 70d51fe5529327246ac1a59122dabd6c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.09, y: 4.13} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1374474098 GameObject: m_ObjectHideFlags: 0 @@ -1481,3 +1635,71 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1001 &8452581746669843343 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalPosition.x + value: -0.05 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalPosition.y + value: 6.19 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077441, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4181178188287077447, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + propertyPath: m_Name + value: "\u7740\u706B" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} +--- !u!114 &8452581746669843344 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2212176824050044244, guid: ca7046f990a45f44688a8e4097d6402e, type: 3} + m_PrefabInstance: {fileID: 8452581746669843343} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e98d963784aa3d8438ed294296859be5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scripts/乐/Fire.cs b/Assets/Scripts/乐/Fire.cs new file mode 100644 index 0000000..cc4b2fc --- /dev/null +++ b/Assets/Scripts/乐/Fire.cs @@ -0,0 +1,44 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Fire : Interacter +{ + public FireStick fireStick; + override protected void Start() + { + base.Start(); + + } + + // Update is called once per frame + void Update() + { + + } + + public override void OnCall() + { + base.OnCall(); + switch (interactState) + { + case 0: + ChangesDuringIntertacting(1f); + if (player.weapon.name == "火把") + { + Debug.Log("牛逼,烧起来了"); + ItemController.Instance.AddItem(fireStick); + ChangeToLastWeapon(); + } + else + { interactState = 0; + Debug.Log("没活了,烧不起来"); + } + break; + + default: + break; + + } +} +} diff --git a/Assets/Scripts/乐/Fire.cs.meta b/Assets/Scripts/乐/Fire.cs.meta new file mode 100644 index 0000000..9850c53 --- /dev/null +++ b/Assets/Scripts/乐/Fire.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c3117bb72947fa847aa126fa768a3881 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/乐/FireStick.cs b/Assets/Scripts/乐/FireStick.cs new file mode 100644 index 0000000..b451de2 --- /dev/null +++ b/Assets/Scripts/乐/FireStick.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FireStick : Item +{ + // Start is called before the first frame update + override protected void Start() + { + base.Start(); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/乐/FireStick.cs.meta b/Assets/Scripts/乐/FireStick.cs.meta new file mode 100644 index 0000000..6b3b4b2 --- /dev/null +++ b/Assets/Scripts/乐/FireStick.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e98d963784aa3d8438ed294296859be5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/乐/Interacter.cs b/Assets/Scripts/乐/Interacter.cs new file mode 100644 index 0000000..a878e9c --- /dev/null +++ b/Assets/Scripts/乐/Interacter.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Interacter : Interactable +{ + protected int interactState = 0; + protected bool interating = false; + + override protected void Start() + { + base.Start(); + } + + + protected void ResetInteracting() + { + interating = false; + player.ToMap("Normal"); + } + + protected virtual void ChangesDuringIntertacting(float time) + { + if (interating == false) + { + player.ToMap("Null"); + interactState++; + interating = true; + Invoke(nameof(ResetInteracting), time); + } + } + + public void ChangeToLastWeapon() + { + ItemController.Instance.ToLastestItem(); + } +} diff --git a/Assets/Scripts/乐/Interacter.cs.meta b/Assets/Scripts/乐/Interacter.cs.meta new file mode 100644 index 0000000..f120894 --- /dev/null +++ b/Assets/Scripts/乐/Interacter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 68d7f17a6df124546813c2c8f4174c53 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/乐/Item.cs b/Assets/Scripts/乐/Item.cs index bf5c8b9..2945c44 100644 --- a/Assets/Scripts/乐/Item.cs +++ b/Assets/Scripts/乐/Item.cs @@ -19,7 +19,7 @@ public class Item : MonoBehaviour } virtual public void InPosition(Transform targetTrans,Vector3 position) { transform.SetParent(targetTrans); - Debug.Log(name + targetTrans.name); + //Debug.Log(name + targetTrans.name); transform.localPosition = position; transform.localRotation = Quaternion.identity; } diff --git a/Assets/Scripts/乐/Shu.cs b/Assets/Scripts/乐/Shu.cs index bcfe22a..e17d793 100644 --- a/Assets/Scripts/乐/Shu.cs +++ b/Assets/Scripts/乐/Shu.cs @@ -3,15 +3,15 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Shu : Interactable +public class Shu : Interacter { Animator anim; - int interactState = 0; + public float rotateDuration=0.5f; SpriteRenderer m_spr; public Sprite sprite_Mu; - bool interating = false; + public Item Stick1; public Item Stick2; @@ -56,18 +56,11 @@ public class Shu : Interactable } - void ResetInteracting() { - interating = false; - CancleEvent(); - } - void ChangesDuringIntertacting(float Time) + + override protected void ChangesDuringIntertacting(float time) { - if (interating==false) { - player.ToMap("Null"); - interactState++; - interating = true; - Invoke(nameof(ResetInteracting), Time);} + base.ChangesDuringIntertacting(time); } public override void CancleEvent() @@ -76,7 +69,4 @@ public class Shu : Interactable } - public void ChangeToLastWeapon() { - ItemController.Instance.ToLastestItem(); - } } diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt index 016dc89..049151c 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -102,3 +102,13 @@ C# parse time : -1ms candidates check time : -1ms console write time : -1ms +[api-updater (non-obsolete-error-filter)] 2022/3/20 23:10:46 : Starting D:/unity/2019.3.2f1/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 758.4813ms +moved types parse time: 54ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms +