Skip to content

E
et

老鱼er / et
与 Fork 源项目一致

从无法访问的项目Fork

通知 10
Star 1
Fork 0
E
et

体验新版 GitCode，发现更多精彩内容 >>

提交 eb40e833 编写于 作者: T tanghai
浏览文件
操作

需要反射创建的对象放在Plugin下好像有问题，只好把Component全部放到Model里面了

上级 6e286342
隐藏空白更改
内联 并排
Showing with 196 addition and 342 deletion
Server/Base/Server.Base.csproj
浏览文件 @ eb40e833
......@@ -47,27 +47,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Component\EventComponent.cs">
<Link>Component\EventComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Component\KVComponent.cs">
<Link>Component\KVComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Component\MessageComponent.cs">
<Link>Component\MessageComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Component\MessageHandlerComponent.cs">
<Link>Component\MessageHandlerComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Component\NetworkComponent.cs">
<Link>Component\NetworkComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Component\TimeComponent.cs">
<Link>Component\TimeComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Component\TimerComponent.cs">
<Link>Component\TimerComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Plugins\Base\Config\ACategory.cs">
<Link>Config\ACategory.cs</Link>
</Compile>
......
Server/Model/Server.Model.csproj
浏览文件 @ eb40e833
......@@ -41,6 +41,24 @@
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Unity\Assets\Scripts\Component\EventComponent.cs">
<Link>Component\EventComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Scripts\Component\KVComponent.cs">
<Link>Component\KVComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Scripts\Component\MessageComponent.cs">
<Link>Component\MessageComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Scripts\Component\MessageHandlerComponent.cs">
<Link>Component\MessageHandlerComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Scripts\Component\NetworkComponent.cs">
<Link>Component\NetworkComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Scripts\Component\TimerComponent.cs">
<Link>Component\TimerComponent.cs</Link>
</Compile>
<Compile Include="..\..\Unity\Assets\Scripts\Message\AppType.cs">
<Link>Message\AppType.cs</Link>
</Compile>
......
Unity/Assets/Plugins/Base.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: 14541eab3adc63f4e99ba2fd13b7e488
folderAsset: yes
timeCreated: 1463828880
timeCreated: 1476550922
licenseType: Pro
DefaultImporter:
userData:
......
Unity/Assets/Plugins/Base/Component/LogComponent.cs 已删除 100644 → 0
浏览文件 @ 6e286342
using System;
using System.IO;
using System.Text;
using Base;
namespace Base
{
[ObjectEvent]
public class LogComponentEvent : ObjectEvent<LogComponent>, IAwake
{
public void Awake()
{
this.GetValue().Awake();
}
}
public class LogComponent : Component
{
private StreamWriter info;
private StreamWriter error;
// 每多少秒发一次
public long SendToServerFrequency = 20 * 1000;
public long SendToServerTime;
#if UNITY_EDITOR
private static bool IsNeedFlush = true;
#else
private static bool IsNeedFlush = false;
#endif
public void Awake()
{
if (!Directory.Exists("../Log"))
{
Directory.CreateDirectory("../Log");
}
string s = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
info = new StreamWriter($"../Log/log-{s}.info.log", false, Encoding.Unicode, 1024);
error = new StreamWriter($"../Log/log-{s}.error.log", false, Encoding.Unicode, 1024);
}
public void Warning(string msg)
{
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}";
info.WriteLine(s);
if (IsNeedFlush)
{
info.Flush();
}
#if UNITY_EDITOR
UnityEngine.Debug.LogWarning(s);
#endif
}
public void Info(string msg)
{
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}";
info.WriteLine(s);
if (IsNeedFlush)
{
info.Flush();
}
#if UNITY_EDITOR
UnityEngine.Debug.Log(s);
#endif
}
public void Error(string msg)
{
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}";
error.WriteLine(s);
if (IsNeedFlush)
{
error.Flush();
}
#if UNITY_EDITOR
UnityEngine.Debug.LogError(s);
#endif
long timeNow = TimeHelper.ClientNow();
if (timeNow - SendToServerTime > SendToServerFrequency)
{
SendToServerTime = timeNow;
Game.Scene.GetComponent<EventComponent>().Run(EventBaseType.LogError, s);
}
}
public void Debug(string msg)
{
#if UNITY_EDITOR
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}";
UnityEngine.Debug.Log(s);
#endif
}
public void Flush()
{
info.Flush();
error.Flush();
}
public override void Dispose()
{
if (this.Id == 0)
{
return;
}
base.Dispose();
this.info.Close();
this.error.Close();
}
}
}
\ No newline at end of file
Unity/Assets/Plugins/Base/Component/LogComponent.cs.meta 已删除 100644 → 0
浏览文件 @ 6e286342
fileFormatVersion: 2
guid: 1551ca8574c888743a5b3e614de8123f
timeCreated: 1476427963
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Plugins/Base/Log.cs
浏览文件 @ eb40e833
namespace Base
using System;
using System.IO;
using System.Text;
namespace Base
{
public static class Log
{
public static void Warning(string msg)
private static StreamWriter info;
private static StreamWriter error;
// 每多少秒发一次
public static long SendToServerFrequency = 20 * 1000;
public static long SendToServerTime;
#if UNITY_EDITOR
private static bool IsNeedFlush = true;
#else
private static bool IsNeedFlush = false;
#endif
static Log()
{
Game.Scene.GetComponent<LogComponent>().Info(msg);
if (!Directory.Exists("../Log"))
{
Directory.CreateDirectory("../Log");
}
string s = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
info = new StreamWriter($"../Log/log-{s}.info.log", false, Encoding.Unicode, 1024);
error = new StreamWriter($"../Log/log-{s}.error.log", false, Encoding.Unicode, 1024);
}
public static void Info(string msg)
public static void Warning(string msg)
{
Game.Scene.GetComponent<LogComponent>().Info(msg);
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}";
info.WriteLine(s);
if (IsNeedFlush)
{
info.Flush();
}
#if UNITY_EDITOR
UnityEngine.Debug.LogWarning(s);
#endif
}
public static void Debug(string msg)
public static void Info(string msg)
{
Game.Scene.GetComponent<LogComponent>().Info(msg);
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {msg}";
info.WriteLine(s);
if (IsNeedFlush)
{
info.Flush();
}
#if UNITY_EDITOR
UnityEngine.Debug.Log(s);
#endif
}
public static void Error(string msg)
{
Game.Scene.GetComponent<LogComponent>().Error(msg);
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}";
error.WriteLine(s);
if (IsNeedFlush)
{
error.Flush();
}
#if UNITY_EDITOR
UnityEngine.Debug.LogError(s);
#endif
long timeNow = TimeHelper.ClientNow();
if (timeNow - SendToServerTime > SendToServerFrequency)
{
SendToServerTime = timeNow;
}
}
public static void Debug(string msg)
{
#if UNITY_EDITOR
DateTime dateTime = DateTime.Now;
string s = $"{dateTime.ToString("yyyy-MM-dd HH:mm:ss")} {TimeHelper.ClientNow()} {msg}";
UnityEngine.Debug.Log(s);
#endif
}
public static void Flush()
{
Game.Scene.GetComponent<LogComponent>().Flush();
info.Flush();
error.Flush();
}
}
}
\ No newline at end of file
Unity/Assets/Plugins/Base/Log.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: fc246493a8b0d404ba5453ac0dd404d6
timeCreated: 1476430040
timeCreated: 1476552159
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Plugins/Base/Message/AMEvent.cs
浏览文件 @ eb40e833
using Base;
using System;
using Base;
namespace Base
{
public abstract class AMEvent<T>: IMRegister<MessageHandlerComponent>
public interface IMessageHandler
{
public void Register(MessageHandlerComponent component, ushort opcode)
void Register<T>(ushort opcode, Action<Entity, T> action);
void RegisterOpcode(Type type, ushort opcode);
}
public abstract class AMEvent<T>: IMRegister<IMessageHandler>
{
public abstract void Run(Entity scene, T message);
public void Register(IMessageHandler component, ushort opcode)
{
component.MessageOpcode[typeof(T)] = opcode;
component.RegisterOpcode(typeof(T), opcode);
component.Register<T>(opcode, Run);
}
public abstract void Run(Entity scene, T message);
}
}
\ No newline at end of file
Unity/Assets/Plugins/Base/Component/EventComponent.cs → Unity/Assets/Scripts/Component/EventComponent.cs
浏览文件 @ eb40e833
using System;
using System.Collections.Generic;
using System.Reflection;
using Base;
using Object = Base.Object;
namespace Base
namespace Model
{
[ObjectEvent]
public class EventComponentEvent : ObjectEvent<EventComponent>, ILoader, IAwake
......
Unity/Assets/Plugins/Base/Component/EventComponent.cs.meta → Unity/Assets/Scripts/Component/EventComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: cfb3b30793a2f664487948e085514abe
timeCreated: 1476427109
guid: 2fda74f39a3e29e449d5891c8b62033b
timeCreated: 1476550922
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Scripts/Component/Scene/GlobalConfigComponent.cs.meta → Unity/Assets/Scripts/Component/GlobalConfigComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: 12489c91591fe244fa8f81457cb494b9
timeCreated: 1474944344
guid: db89fa931c9a7594abb4142f40283554
timeCreated: 1476550923
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Plugins/Base/Component/KVComponent.cs → Unity/Assets/Scripts/Component/KVComponent.cs
浏览文件 @ eb40e833
......@@ -2,7 +2,7 @@
using Base;
using MongoDB.Bson.Serialization.Attributes;
namespace Base
namespace Model
{
/// <summary>
/// Key Value组件用于保存一些数据
......
Unity/Assets/Plugins/Base/Component/KVComponent.cs.meta → Unity/Assets/Scripts/Component/KVComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: e72548f682c0f584f82c92748e6bc7ec
timeCreated: 1476427964
guid: df17a81a4db312744a45e5756fe92bce
timeCreated: 1476550924
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Plugins/Base/Component/MessageComponent.cs → Unity/Assets/Scripts/Component/MessageComponent.cs
浏览文件 @ eb40e833
......@@ -2,15 +2,16 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Base;
namespace Base
namespace Model
{
[ObjectEvent]
public class MessageComponentEvent : ObjectEvent<MessageComponent>, IAwake<MessageHandlerComponent, AChannel>
public class MessageComponentEvent : ObjectEvent<MessageComponent>, IAwake<AChannel>
{
public void Awake(MessageHandlerComponent messageHandler, AChannel aChannel)
public void Awake(AChannel aChannel)
{
this.GetValue().Awake(messageHandler, aChannel);
this.GetValue().Awake(aChannel);
}
}
......@@ -25,9 +26,9 @@ namespace Base
private AChannel channel;
private MessageHandlerComponent messageHandler;
public void Awake(MessageHandlerComponent handler, AChannel aChannel)
public void Awake(AChannel aChannel)
{
this.messageHandler = handler;
this.messageHandler = Game.Scene.GetComponent<MessageHandlerComponent>();
this.channel = aChannel;
this.StartRecv();
}
......
Unity/Assets/Plugins/Base/Component/MessageComponent.cs.meta → Unity/Assets/Scripts/Component/MessageComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: 036da353bafc88746b4c6dc2d3a9c6ae
timeCreated: 1476427109
guid: 3ad2d94454456394ab8af33f059f9254
timeCreated: 1476550923
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs → Unity/Assets/Scripts/Component/MessageHandlerComponent.cs
浏览文件 @ eb40e833
using System;
using System.Collections.Generic;
using System.Reflection;
using Base;
using Object = Base.Object;
namespace Base
namespace Model
{
[ObjectEvent]
public class MessageHandlerComponentEvent : ObjectEvent<MessageHandlerComponent>, ILoader, IAwake<string>
......@@ -21,7 +23,7 @@ namespace Base
/// <summary>
/// 消息分发组件
/// </summary>
public class MessageHandlerComponent: Component
public class MessageHandlerComponent: Component, IMessageHandler
{
private string AppType;
private Dictionary<ushort, List<Action<Entity, byte[], int, int>>> events;
......@@ -68,6 +70,11 @@ namespace Base
}
}
public void RegisterOpcode(Type type, ushort opcode)
{
this.MessageOpcode[type] = opcode;
}
public void Register<T>(ushort opcode, Action<Entity, T> action)
{
if (!this.events.ContainsKey(opcode))
......
Unity/Assets/Plugins/Base/Component/MessageHandlerComponent.cs.meta → Unity/Assets/Scripts/Component/MessageHandlerComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: bd40986789dd57549adb51bc5c2413fa
timeCreated: 1476427109
guid: 8e97599ee372f6f40aaa5e743851a74c
timeCreated: 1476550923
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Plugins/Base/Component/NetworkComponent.cs → Unity/Assets/Scripts/Component/NetworkComponent.cs
浏览文件 @ eb40e833
using System;
using System.Collections.Generic;
using Base;
namespace Base
namespace Model
{
[ObjectEvent]
public class NetworkComponentEvent : ObjectEvent<NetworkComponent>, IUpdate, IAwake<NetworkProtocol>, IAwake<NetworkProtocol, string, int>
......
Unity/Assets/Plugins/Base/Component/NetworkComponent.cs.meta → Unity/Assets/Scripts/Component/NetworkComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: 18e8dac8edb032f4da7021896febf6b4
timeCreated: 1476427963
guid: 151d2db7aab5bc8438bc039443ba0e3b
timeCreated: 1476550922
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Scripts/Component/Scene/Scene.cs.meta → Unity/Assets/Scripts/Component/Scene.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: 73186e6a1c3318e4a95cc253c860e0af
timeCreated: 1475915396
guid: 6a74878a3e383af45bac4995de1e0f53
timeCreated: 1476550923
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Scripts/Component/Scene.meta 已删除 100644 → 0
浏览文件 @ 6e286342
fileFormatVersion: 2
guid: 1dc39317a0f5e0e469e618f7ec70921a
folderAsset: yes
timeCreated: 1474944344
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Scripts/Component/Share.cs 已删除 100644 → 0
浏览文件 @ 6e286342
using Base;
namespace Model
{
/// <summary>
/// 游戏和扩展编辑器都需要用到的数据放在这个Scene上面
/// </summary>
public sealed class Share
{
private static Entity share;
public static Entity Scene
{
get
{
if (share == null)
{
share = new Entity();
share.AddComponent<Scene>();
share.AddComponent<EventComponent>();
share.AddComponent<LogComponent>();
GlobalConfigComponent globalConfigComponent = share.AddComponent<GlobalConfigComponent>();
share.AddComponent<NetworkComponent, NetworkProtocol>(globalConfigComponent.GlobalProto.Protocol);
}
return share;
}
}
public static void Close()
{
Entity scene = share;
share = null;
scene?.Dispose();
}
}
}
\ No newline at end of file
Unity/Assets/Scripts/Component/Share.cs.meta 已删除 100644 → 0
浏览文件 @ 6e286342
fileFormatVersion: 2
guid: 25b1f211f8fdbe64aa3b3fdb425b30c7
timeCreated: 1474943388
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Plugins/Base/Component/TimeComponent.cs → Unity/Assets/Scripts/Component/TimeComponent.cs
浏览文件 @ eb40e833
namespace Base
using Base;
namespace Model
{
/// <summary>
/// 用于同步服务端和客户端时间
......
Unity/Assets/Plugins/Base/Component/TimeComponent.cs.meta → Unity/Assets/Scripts/Component/TimeComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: f149185a7df54774383b4883e3bcc6ef
timeCreated: 1476427964
guid: ef493cd670f2eab428b7aa9d0e368212
timeCreated: 1476550924
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Plugins/Base/Component/TimerComponent.cs → Unity/Assets/Scripts/Component/TimerComponent.cs
浏览文件 @ eb40e833
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Base;
using MongoDB.Bson;
namespace Base
namespace Model
{
public class Timer
{
......
Unity/Assets/Plugins/Base/Component/TimerComponent.cs.meta → Unity/Assets/Scripts/Component/TimerComponent.cs.meta
浏览文件 @ eb40e833
fileFormatVersion: 2
guid: d5ba602e9f553ff44b1baef3f68a563b
timeCreated: 1476427964
guid: 2f4a73ac996f1404aa1866a86140fe38
timeCreated: 1476550922
licenseType: Pro
MonoImporter:
serializedVersion: 2
......
Unity/Assets/Scripts/Component/UI.meta 已删除 100644 → 0
浏览文件 @ 6e286342
fileFormatVersion: 2
guid: e86307745c67e5447bce24ec9c64397b
folderAsset: yes
timeCreated: 1475915395
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Unity/Assets/Scripts/Init.cs
浏览文件 @ eb40e833
......@@ -10,6 +10,7 @@ namespace Model
private void Start()
{
Object.ObjectManager.Register("Base", typeof(Game).Assembly);
Object.ObjectManager.Register("Model", typeof(Init).Assembly);
GameObject code = (GameObject)Resources.Load("Code");
byte[] assBytes = code.Get<TextAsset>("Controller.dll").bytes;
......
Unity/Controller/Event/InitSceneStartEvent_InitGame.cs
浏览文件 @ eb40e833
......@@ -12,14 +12,13 @@ namespace Controller
{
public async void Run()
{
MessageHandlerComponent messageHandlerComponent = Game.Scene.AddComponent<MessageHandlerComponent, string>("Client");
Game.Scene.AddComponent<NetworkComponent, NetworkProtocol>(NetworkProtocol.UDP);
//Game.Scene.AddComponent<MessageComponent, MessageHandlerComponent>();
Game.Scene.AddComponent<ChildrenComponent>();
Game.Scene.AddComponent<MessageHandlerComponent, string>("Client");
NetworkComponent networkComponent = Game.Scene.AddComponent<NetworkComponent, NetworkProtocol>(NetworkProtocol.UDP);
Entity session = networkComponent.Get("127.0.0.1:8888");
try
{
S2C_Login s2CLogin = await Game.Scene.GetComponent<MessageComponent>().CallAsync<S2C_Login>(new C2S_Login {Account = "tanghai", Password = "1111111"});
S2C_Login s2CLogin = await session.GetComponent<MessageComponent>().CallAsync<S2C_Login>(new C2S_Login {Account = "tanghai", Password = "1111111"});
Log.Info(MongoHelper.ToJson(s2CLogin));
}
catch (RpcException e)
......
Unity/ProjectSettings/ProjectVersion.txt
浏览文件 @ eb40e833
m_EditorVersion: 5.3.4f1
m_EditorVersion: 5.4.2f1
m_StandardAssetsVersion: 0
Unity/Unity.CSharp.Editor.csproj
浏览文件 @ eb40e833
......@@ -16,7 +16,7 @@
<CompilerResponseFile></CompilerResponseFile>
<UnityProjectType>Editor:5</UnityProjectType>
<UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
<UnityVersion>5.3.4f1</UnityVersion>
<UnityVersion>5.4.2f1</UnityVersion>
<RootNamespace></RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
......@@ -26,7 +26,7 @@
<IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
......@@ -36,7 +36,7 @@
<IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
<DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
......@@ -87,30 +87,6 @@
<Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
<HintPath>Library\UnityAssemblies\SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.EditorTestsRunner">
<HintPath>Library\UnityAssemblies\UnityEditor.EditorTestsRunner.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Networking">
<HintPath>Library\UnityAssemblies\UnityEditor.Networking.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>Library\UnityAssemblies\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.UI">
<HintPath>Library\UnityAssemblies\UnityEditor.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>Library\UnityAssemblies\UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>Library\UnityAssemblies\UnityEditor.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.TreeEditor">
<HintPath>Library\UnityAssemblies\UnityEditor.TreeEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>Library\UnityAssemblies\UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="AsyncBridge.Net35">
<HintPath>Assets\CSharp 6.0 Support\AsyncTools\Plugins\AsyncBridge.Net35.dll</HintPath>
</Reference>
......
Unity/Unity.CSharp.Plugins.csproj
浏览文件 @ eb40e833
......@@ -13,11 +13,13 @@
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
<CompilerResponseFile></CompilerResponseFile>
<CompilerResponseFile>
</CompilerResponseFile>
<UnityProjectType>GamePlugins:3</UnityProjectType>
<UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
<UnityVersion>5.3.4f1</UnityVersion>
<RootNamespace></RootNamespace>
<UnityVersion>5.4.2f1</UnityVersion>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......@@ -26,7 +28,7 @@
<IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
......@@ -36,7 +38,7 @@
<IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
<DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
......@@ -57,12 +59,6 @@
<Reference Include="UnityEngine.Networking">
<HintPath>Library\UnityAssemblies\UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>Library\UnityAssemblies\UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>Library\UnityAssemblies\UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>Library\UnityAssemblies\UnityEditor.dll</HintPath>
</Reference>
......@@ -77,14 +73,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Plugins\Base\Component\EventComponent.cs" />
<Compile Include="Assets\Plugins\Base\Component\KVComponent.cs" />
<Compile Include="Assets\Plugins\Base\Component\LogComponent.cs" />
<Compile Include="Assets\Plugins\Base\Component\MessageComponent.cs" />
<Compile Include="Assets\Plugins\Base\Component\MessageHandlerComponent.cs" />
<Compile Include="Assets\Plugins\Base\Component\NetworkComponent.cs" />
<Compile Include="Assets\Plugins\Base\Component\TimeComponent.cs" />
<Compile Include="Assets\Plugins\Base\Component\TimerComponent.cs" />
<Compile Include="Assets\Plugins\Base\Config\ACategory.cs" />
<Compile Include="Assets\Plugins\Base\Config\AConfig.cs" />
<Compile Include="Assets\Plugins\Base\Config\ConfigAttribute.cs" />
......@@ -520,5 +508,6 @@
<None Include="Assets\CSharp 6.0 Support\AsyncTools\Plugins\AsyncBridge.Net35.xml" />
<None Include="Assets\CSharp 6.0 Support\AsyncTools\Plugins\System.Threading.xml" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2015\UnityVS.CSharp.targets" />
</Project>
Unity/Unity.CSharp.csproj
浏览文件 @ eb40e833
......@@ -13,11 +13,13 @@
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
<CompilerResponseFile></CompilerResponseFile>
<CompilerResponseFile>
</CompilerResponseFile>
<UnityProjectType>Game:1</UnityProjectType>
<UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
<UnityVersion>5.3.4f1</UnityVersion>
<RootNamespace></RootNamespace>
<UnityVersion>5.4.2f1</UnityVersion>
<RootNamespace>
</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>pdbonly</DebugType>
......@@ -26,7 +28,7 @@
<IntermediateOutputPath>Temp\UnityVS_obj\Debug\</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
......@@ -36,7 +38,7 @@
<IntermediateOutputPath>Temp\UnityVS_obj\Release\</IntermediateOutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_3_4;UNITY_5_3;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE</DefineConstants>
<DefineConstants>TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_4_2;UNITY_5_4;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_EDITOR_RETINA;ENABLE_RETINA_GUISTYLES;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_SPRITE_POLYGON;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;ENABLE_EDITOR_TESTS_RUNNER;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE</DefineConstants>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
......@@ -57,12 +59,6 @@
<Reference Include="UnityEngine.Networking">
<HintPath>Library\UnityAssemblies\UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>Library\UnityAssemblies\UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>Library\UnityAssemblies\UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>Library\UnityAssemblies\UnityEditor.dll</HintPath>
</Reference>
......@@ -85,10 +81,16 @@
<ItemGroup>
<Compile Include="Assets\Scripts\Component\ChildrenComponent.cs" />
<Compile Include="Assets\Scripts\Component\GameObjectComponent.cs" />
<Compile Include="Assets\Scripts\Component\Scene\GlobalConfigComponent.cs" />
<Compile Include="Assets\Scripts\Component\Scene\Scene.cs" />
<Compile Include="Assets\Scripts\Component\Share.cs" />
<Compile Include="Assets\Scripts\Component\UI\UI.cs" />
<Compile Include="Assets\Scripts\Component\EventComponent.cs" />
<Compile Include="Assets\Scripts\Component\GlobalConfigComponent.cs" />
<Compile Include="Assets\Scripts\Component\KVComponent.cs" />
<Compile Include="Assets\Scripts\Component\MessageComponent.cs" />
<Compile Include="Assets\Scripts\Component\MessageHandlerComponent.cs" />
<Compile Include="Assets\Scripts\Component\NetworkComponent.cs" />
<Compile Include="Assets\Scripts\Component\Scene.cs" />
<Compile Include="Assets\Scripts\Component\TimeComponent.cs" />
<Compile Include="Assets\Scripts\Component\TimerComponent.cs" />
<Compile Include="Assets\Scripts\Component\UI.cs" />
<Compile Include="Assets\Scripts\Config\BuffProto.cs" />
<Compile Include="Assets\Scripts\Config\GlobalProto.cs" />
<Compile Include="Assets\Scripts\Event\EnvKey.cs" />
......@@ -109,5 +111,6 @@
<None Include="Assets\CSharp 6.0 Support\AsyncTools\Plugins\AsyncBridge.Net35.xml" />
<None Include="Assets\CSharp 6.0 Support\AsyncTools\Plugins\System.Threading.xml" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath)\SyntaxTree\UnityVS\2015\UnityVS.CSharp.targets" />
</Project>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或