diff --git a/Assets/Editor/SpineSettings.asset b/Assets/Editor/SpineSettings.asset new file mode 100644 index 0000000..2648efa --- /dev/null +++ b/Assets/Editor/SpineSettings.asset @@ -0,0 +1,43 @@ +%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: b29e98153ec2fbd44b8f7da1b41194e8, type: 3} + m_Name: SpineSettings + m_EditorClassIdentifier: + defaultScale: 0.01 + defaultMix: 0.2 + defaultShader: Spine/Skeleton + defaultZSpacing: 0 + defaultInstantiateLoop: 1 + defaultPhysicsPositionInheritance: {x: 1, y: 1} + defaultPhysicsRotationInheritance: 1 + showHierarchyIcons: 1 + reloadAfterPlayMode: 1 + setTextureImporterSettings: 1 + textureSettingsReference: Packages/com.esotericsoftware.spine.spine-unity/Editor/spine-unity/Editor/ImporterPresets/StraightAlphaPreset.preset + fixPrefabOverrideViaMeshFilter: 0 + removePrefabPreviewMeshes: 0 + applyAdditiveMaterial: 0 + blendModeMaterialMultiply: {fileID: 2100000, guid: 053fed1e18e65064ca564f05c4027e1e, + type: 2} + blendModeMaterialScreen: {fileID: 2100000, guid: 1a66c2d7ee7642a459bd3831abeb30af, + type: 2} + blendModeMaterialAdditive: {fileID: 2100000, guid: 517c2df5a5dc5d44a8b3820eca503d13, + type: 2} + atlasTxtImportWarning: 1 + textureImporterWarning: 1 + componentMaterialWarning: 1 + skeletonDataAssetNoFileError: 1 + autoReloadSceneSkeletons: 1 + handleScale: 1 + mecanimEventIncludeFolderName: 1 + timelineDefaultMixDuration: 0 + timelineUseBlendDuration: 1 diff --git a/Assets/Editor/SpineSettings.asset.meta b/Assets/Editor/SpineSettings.asset.meta new file mode 100644 index 0000000..223a053 --- /dev/null +++ b/Assets/Editor/SpineSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e19246ef97f04a579799c7bb57ee91b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Start.unity b/Assets/Scenes/Start.unity index 413d8ef..a44cbd4 100644 --- a/Assets/Scenes/Start.unity +++ b/Assets/Scenes/Start.unity @@ -506,6 +506,74 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &813205546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 813205549} + - component: {fileID: 813205548} + - component: {fileID: 813205547} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &813205547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813205546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &813205548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813205546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &813205549 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813205546} + serializedVersion: 2 + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &961739749 GameObject: m_ObjectHideFlags: 0 @@ -678,6 +746,107 @@ MonoBehaviour: m_CameraActivatedEvent: m_PersistentCalls: m_Calls: [] +--- !u!1 &1122275120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1122275124} + - component: {fileID: 1122275123} + - component: {fileID: 1122275122} + - component: {fileID: 1122275121} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1122275121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122275120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1122275122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122275120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1122275123 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122275120} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1122275124 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1122275120} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1160234425 GameObject: m_ObjectHideFlags: 0 @@ -6407,6 +6576,7 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: + - {fileID: 1122275124} - {fileID: 961739753} - {fileID: 203844589} - {fileID: 1160234427} @@ -6421,3 +6591,4 @@ SceneRoots: - {fileID: 3786016077816348752} - {fileID: 1231889790} - {fileID: 1655261779} + - {fileID: 813205549} diff --git a/Assets/Shaders/VFX.mat b/Assets/Shaders/VFX.mat index 05e09bb..ea8a9e7 100644 --- a/Assets/Shaders/VFX.mat +++ b/Assets/Shaders/VFX.mat @@ -114,6 +114,8 @@ Material: - _DetailNormalMapScale: 1 - _Dissolve: 0 - _DissolveChannel: 3 + - _DissolveCustomChannel: 0 + - _DissolveCustomData: 0 - _DissolveEdgeSharpness: 2 - _DissolveHighlightWidth: 0.08 - _DissolveWidth: 0 @@ -137,6 +139,7 @@ Material: - _RenderFace: 0 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 + - _SoftParticleFade: 0 - _SpecularHighlights: 1 - _SpeedU: 0 - _SpeedV: 0 @@ -160,7 +163,7 @@ Material: - _UseVertexMask: 0 - _VertexFlipX: 1 - _WorkflowMode: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _ClipRect: {r: -1, g: -1, b: 1, a: 1} diff --git a/Assets/Shaders/particle.mat b/Assets/Shaders/particle.mat index 43e3416..ca9449e 100644 --- a/Assets/Shaders/particle.mat +++ b/Assets/Shaders/particle.mat @@ -142,6 +142,7 @@ Material: - _RenderFace: 0 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 + - _SoftParticleFade: 0 - _SpecularHighlights: 1 - _SpeedU: -2 - _SpeedV: 0 @@ -165,7 +166,7 @@ Material: - _UseVertexMask: 0 - _VertexFlipX: 1 - _WorkflowMode: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _ClipRect: {r: -1, g: -1, b: 1, a: 1} diff --git a/Assets/spine.meta b/Assets/spine.meta new file mode 100644 index 0000000..ba0f72e --- /dev/null +++ b/Assets/spine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f86728efcfcde44b793fd4c3c88d649a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 1c63fce..ffaba46 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,10 @@ { "dependencies": { "com.coplaydev.unity-mcp": "https://github.com/CoplayDev/unity-mcp.git?path=/MCPForUnity#v10.3.0", + "com.esotericsoftware.spine.spine-csharp": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-csharp/src#4.2", + "com.esotericsoftware.spine.spine-unity": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine#4.2", + "com.esotericsoftware.spine.timeline": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.timeline#4.2", + "com.esotericsoftware.spine.urp-shaders": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2", "com.unity.cinemachine": "2.9.7", "com.unity.collab-proxy": "2.12.4", "com.unity.ide.rider": "3.0.31", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5e73575..4e3b891 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -17,6 +17,45 @@ }, "hash": "aa5fc638d623f56178d50329d9ad8c541a57fe66" }, + "com.esotericsoftware.spine.spine-csharp": { + "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-csharp/src#4.2", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "e7dc1435fa4a0083ab431f1b28e083c14a1f5c68" + }, + "com.esotericsoftware.spine.spine-unity": { + "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine#4.2", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.esotericsoftware.spine.spine-csharp": "4.2.0" + }, + "hash": "e7dc1435fa4a0083ab431f1b28e083c14a1f5c68" + }, + "com.esotericsoftware.spine.timeline": { + "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.timeline#4.2", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.timeline": "1.2.10", + "com.esotericsoftware.spine.spine-unity": "4.2.13" + }, + "hash": "e7dc1435fa4a0083ab431f1b28e083c14a1f5c68" + }, + "com.esotericsoftware.spine.urp-shaders": { + "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.render-pipelines.universal": "7.1.5" + }, + "hash": "e7dc1435fa4a0083ab431f1b28e083c14a1f5c68" + }, "com.unity.burst": { "version": "1.8.16", "depth": 1,