Browse Source

Merge pull request #31 from darktable/master

Reorganized Unity project to be more "plugin" compliant.
Nathan Sweet 12 năm trước cách đây
mục cha
commit
7d2b974a75
26 tập tin đã thay đổi với 45 bổ sung21 xóa
  1. 4 0
      .gitignore
  2. 10 16
      spine-csharp/spine-csharp.csproj
  3. 20 0
      spine-csharp/spine-csharp.sln
  4. 1 1
      spine-unity/Assets/Plugins.meta
  5. 1 1
      spine-unity/Assets/Plugins/Editor.meta
  6. 1 1
      spine-unity/Assets/Plugins/Editor/Spine.meta
  7. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs
  8. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta
  9. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/Menus.cs
  10. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta
  11. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs
  12. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta
  13. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs
  14. 0 0
      spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta
  15. 4 0
      spine-unity/Assets/Plugins/Spine.meta
  16. 0 1
      spine-unity/Assets/Plugins/Spine/AtlasAsset.cs
  17. 0 0
      spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta
  18. 0 0
      spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs
  19. 0 0
      spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta
  20. 0 1
      spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs
  21. 0 0
      spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta
  22. 0 0
      spine-unity/Assets/Plugins/Spine/spine-csharp.meta
  23. 0 0
      spine-unity/Assets/Plugins/Spine/spine-csharp/Place spine-csharp here.txt
  24. 4 0
      spine-unity/Assets/Shaders.meta
  25. 0 0
      spine-unity/Assets/Shaders/Skeleton.shader
  26. 0 0
      spine-unity/Assets/Shaders/Skeleton.shader.meta

+ 4 - 0
.gitignore

@@ -36,3 +36,7 @@ spine-unity/Assets/src/spine-csharp/*
 spine-unity/ProjectSettings
 spine-unity/Temp
 spine-unity/Library
+*.userprefs
+*.pidb
+Assembly-*.csproj
+Assembly-*.pidb

+ 10 - 16
spine-csharp/spine-csharp.csproj

@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{94144E22-2431-4A8F-AC04-DEC22F7EDD8F}</ProjectGuid>
-    <ProjectTypeGuids>{6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Spine</RootNamespace>
     <AssemblyName>spine-csharp</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <XnaFrameworkVersion>v4.0</XnaFrameworkVersion>
     <XnaPlatform>Windows</XnaPlatform>
@@ -43,19 +44,12 @@
     <XnaCompressContent>true</XnaCompressContent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System">
-      <Private>False</Private>
-    </Reference>
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Net">
-      <Private>False</Private>
     </Reference>
+    <Reference Include="System.Net" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -81,11 +75,11 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />
   <!--
-      To modify your build process, add your task inside one of the targets below and uncomment it. 
+      To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
       <Target Name="BeforeBuild">
       </Target>
       <Target Name="AfterBuild">
       </Target>
     -->
-</Project>
+</Project>

+ 20 - 0
spine-csharp/spine-csharp.sln

@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spine-csharp", "spine-csharp.csproj", "{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Debug|x86.ActiveCfg = Debug|x86
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Debug|x86.Build.0 = Debug|x86
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Release|x86.ActiveCfg = Release|x86
+		{E27CE91F-0B52-4A75-BE98-2FC2A8994CCE}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = spine-csharp.csproj
+	EndGlobalSection
+EndGlobal

+ 1 - 1
spine-unity/Assets/src.meta → spine-unity/Assets/Plugins.meta

@@ -1,4 +1,4 @@
 fileFormatVersion: 2
-guid: 169f112a58a7a014eb09b87c01e426dd
+guid: 89dad76e10ea944ee9f29109535294be
 DefaultImporter:
   userData: 

+ 1 - 1
spine-unity/Assets/src/Editor.meta → spine-unity/Assets/Plugins/Editor.meta

@@ -1,4 +1,4 @@
 fileFormatVersion: 2
-guid: f65f926cf250c204a9658087bc501fab
+guid: 65ba3309ea8c447678ade95f3fa398da
 DefaultImporter:
   userData: 

+ 1 - 1
spine-unity/Assets/src/Resources.meta → spine-unity/Assets/Plugins/Editor/Spine.meta

@@ -1,4 +1,4 @@
 fileFormatVersion: 2
-guid: 411b02e44c34aea459ea6ef154df73d4
+guid: 3ac78ae082927411cba77d73efde27d4
 DefaultImporter:
   userData: 

+ 0 - 0
spine-unity/Assets/src/Editor/AtlasAssetInspector.cs → spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs


+ 0 - 0
spine-unity/Assets/src/Editor/AtlasAssetInspector.cs.meta → spine-unity/Assets/Plugins/Editor/Spine/AtlasAssetInspector.cs.meta


+ 0 - 0
spine-unity/Assets/src/Editor/Menus.cs → spine-unity/Assets/Plugins/Editor/Spine/Menus.cs


+ 0 - 0
spine-unity/Assets/src/Editor/Menus.cs.meta → spine-unity/Assets/Plugins/Editor/Spine/Menus.cs.meta


+ 0 - 0
spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs → spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs


+ 0 - 0
spine-unity/Assets/src/Editor/SkeletonComponentInspector.cs.meta → spine-unity/Assets/Plugins/Editor/Spine/SkeletonComponentInspector.cs.meta


+ 0 - 0
spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs → spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs


+ 0 - 0
spine-unity/Assets/src/Editor/SkeletonDataAssetInspector.cs.meta → spine-unity/Assets/Plugins/Editor/Spine/SkeletonDataAssetInspector.cs.meta


+ 4 - 0
spine-unity/Assets/Plugins/Spine.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: c6674329008ae4c65a7b7e8f1b2a6523
+DefaultImporter:
+  userData: 

+ 0 - 1
spine-unity/Assets/src/AtlasAsset.cs → spine-unity/Assets/Plugins/Spine/AtlasAsset.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using UnityEngine;
-using UnityEditor;
 using Spine;
 
 public class AtlasAsset : ScriptableObject {

+ 0 - 0
spine-unity/Assets/src/AtlasAsset.cs.meta → spine-unity/Assets/Plugins/Spine/AtlasAsset.cs.meta


+ 0 - 0
spine-unity/Assets/src/SkeletonComponent.cs → spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs


+ 0 - 0
spine-unity/Assets/src/SkeletonComponent.cs.meta → spine-unity/Assets/Plugins/Spine/SkeletonComponent.cs.meta


+ 0 - 1
spine-unity/Assets/src/SkeletonDataAsset.cs → spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs

@@ -2,7 +2,6 @@ using System;
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEditor;
 using Spine;
 
 public class SkeletonDataAsset : ScriptableObject {

+ 0 - 0
spine-unity/Assets/src/SkeletonDataAsset.cs.meta → spine-unity/Assets/Plugins/Spine/SkeletonDataAsset.cs.meta


+ 0 - 0
spine-unity/Assets/src/spine-csharp.meta → spine-unity/Assets/Plugins/Spine/spine-csharp.meta


+ 0 - 0
spine-unity/Assets/src/spine-csharp/Place spine-csharp here.txt → spine-unity/Assets/Plugins/Spine/spine-csharp/Place spine-csharp here.txt


+ 4 - 0
spine-unity/Assets/Shaders.meta

@@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: b41395738f68d4fbba8311d333db62b1
+DefaultImporter:
+  userData: 

+ 0 - 0
spine-unity/Assets/src/Resources/Skeleton.shader → spine-unity/Assets/Shaders/Skeleton.shader


+ 0 - 0
spine-unity/Assets/src/Resources/Skeleton.shader.meta → spine-unity/Assets/Shaders/Skeleton.shader.meta