diff --git a/UnityProject/Assets/AssetRaw/Effects/Liwu/MFJ.prefab b/UnityProject/Assets/AssetRaw/Effects/Liwu/MFJ.prefab index 64cf8bab..e3a0237d 100644 --- a/UnityProject/Assets/AssetRaw/Effects/Liwu/MFJ.prefab +++ b/UnityProject/Assets/AssetRaw/Effects/Liwu/MFJ.prefab @@ -4822,7 +4822,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 199391174263626307} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -4899,6 +4899,8 @@ GameObject: - component: {fileID: 2097086630333657159} - component: {fileID: 2839945069483060334} - component: {fileID: 3977805982932000734} + - component: {fileID: 2146400364585442447} + - component: {fileID: 7854408060643714099} m_Layer: 5 m_Name: MFJ m_TagString: Untagged @@ -4906,22 +4908,26 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2097086630333657159 -Transform: +--- !u!224 &2097086630333657159 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953453472445774857} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 50, y: 50, z: 50} - m_ConstrainProportionsScale: 1 + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1539262690265876760} m_Father: {fileID: 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!198 &2839945069483060334 ParticleSystem: m_ObjectHideFlags: 0 @@ -9719,6 +9725,54 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 +--- !u!222 &2146400364585442447 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953453472445774857} + m_CullTransparentMesh: 1 +--- !u!114 &7854408060643714099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 953453472445774857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, 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_IsTrail: 0 + m_IgnoreCanvasScaler: 0 + m_AbsoluteMode: 0 + m_Scale3D: {x: 10, y: 10, z: 10} + m_AnimatableProperties: [] + m_Particles: + - {fileID: 2839945069483060334} + - {fileID: 6248957206065117300} + - {fileID: 4884790235220348462} + - {fileID: 8531002783067933688} + - {fileID: 2821033975178751885} + m_MeshSharing: 0 + m_GroupId: 0 + m_GroupMaxId: 0 + m_PositionMode: 0 + m_AutoScaling: 0 + m_AutoScalingMode: 2 + m_UseCustomView: 0 + m_CustomViewSize: 10 + m_TimeScaleMultiplier: 1 --- !u!1 &3501579831550582286 GameObject: m_ObjectHideFlags: 0 @@ -14483,7 +14537,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3501579831550582286} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -24146,7 +24200,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6622507555332874951} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 diff --git a/UnityProject/Assets/ProjectSettings.meta b/UnityProject/Assets/ProjectSettings.meta new file mode 100644 index 00000000..4851cb94 --- /dev/null +++ b/UnityProject/Assets/ProjectSettings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b75e139b50b7d044aa6700cf20b072c6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ProjectSettings/UIParticleProjectSettings.asset b/UnityProject/Assets/ProjectSettings/UIParticleProjectSettings.asset new file mode 100644 index 00000000..1bcbf945 --- /dev/null +++ b/UnityProject/Assets/ProjectSettings/UIParticleProjectSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f22a23b9d98e440478697f4adf30e61c, type: 3} + m_Name: UIParticleProjectSettings + m_EditorClassIdentifier: + m_EnableLinearToGamma: 1 + m_HideGeneratedObjects: 1 diff --git a/UnityProject/Assets/ProjectSettings/UIParticleProjectSettings.asset.meta b/UnityProject/Assets/ProjectSettings/UIParticleProjectSettings.asset.meta new file mode 100644 index 00000000..836c2d6b --- /dev/null +++ b/UnityProject/Assets/ProjectSettings/UIParticleProjectSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c9597b80a255244890e76a9f243910b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Packages/manifest.json b/UnityProject/Packages/manifest.json index da0d2893..2ecb2afc 100644 --- a/UnityProject/Packages/manifest.json +++ b/UnityProject/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git", + "com.coffee.ui-particle": "https://github.com/mob-sakai/ParticleEffectForUGUI.git", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ai.navigation": "1.1.5", diff --git a/UnityProject/Packages/packages-lock.json b/UnityProject/Packages/packages-lock.json index 4a17fb11..2fff7099 100644 --- a/UnityProject/Packages/packages-lock.json +++ b/UnityProject/Packages/packages-lock.json @@ -7,6 +7,16 @@ "dependencies": {}, "hash": "b176d63d93a6b8fd1a873769af7f7fa4c43a4288" }, + "com.coffee.ui-particle": { + "version": "https://github.com/mob-sakai/ParticleEffectForUGUI.git", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "hash": "4b98abd7469b10d55c9c623830cb6e1518f72731" + }, "com.cysharp.unitask": { "version": "file:UniTask", "depth": 0,