tanghai пре 7 година
родитељ
комит
68e7e00651

+ 1 - 1
Server/Model/Server.Model.csproj

@@ -65,7 +65,6 @@
     <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\InnerConfig.cs" Link="Module\Message\InnerConfig.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Component\Config\OuterConfig.cs" Link="Module\Message\OuterConfig.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Component\TimerComponent.cs" Link="Component\TimerComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Scripts\Entity\Session.cs" Link="Module\Message\Session.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ACategory.cs" Link="Module\Config\ACategory.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\AConfig.cs" Link="Module\Config\AConfig.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Config\ConfigAttribute.cs" Link="Module\Config\ConfigAttribute.cs" />
@@ -99,6 +98,7 @@
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\OuterOpcode.cs" Link="Module\Message\OuterOpcode.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\ProtobufPacker.cs" Link="Module\Message\ProtobufPacker.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\RpcException.cs" Link="Module\Message\RpcException.cs" />
+    <Compile Include="..\..\Unity\Assets\Scripts\Module\Message\Session.cs" Link="Module\Message\Session.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\INumericWatcher.cs" Link="Module\Numeric\INumericWatcher.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" Link="Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" />
     <Compile Include="..\..\Unity\Assets\Scripts\Module\Numeric\NumericComponent.cs" Link="Module\Numeric\NumericComponent.cs" />

+ 0 - 0
Unity/Assets/Scripts/Entity/Session.cs → Unity/Assets/Scripts/Module/Message/Session.cs


+ 0 - 0
Unity/Assets/Scripts/Entity/Session.cs.meta → Unity/Assets/Scripts/Module/Message/Session.cs.meta


+ 0 - 0
Unity/Assets/Scripts/Event/NumericWatcher_Hp_ShowUI.cs → Unity/Assets/Scripts/Module/Numeric/NumericWatcher_Hp_ShowUI.cs


+ 0 - 0
Unity/Assets/Scripts/Event/NumericWatcher_Hp_ShowUI.cs.meta → Unity/Assets/Scripts/Module/Numeric/NumericWatcher_Hp_ShowUI.cs.meta


+ 0 - 0
Unity/Assets/Scripts/MonoConfig/CanvasConfig.cs → Unity/Assets/Scripts/Module/UI/CanvasConfig.cs


+ 0 - 0
Unity/Assets/Scripts/MonoConfig/CanvasConfig.cs.meta → Unity/Assets/Scripts/Module/UI/CanvasConfig.cs.meta


+ 7 - 2
Unity/Assets/Scripts/MonoConfig.meta

@@ -1,3 +1,8 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
 guid: c6e0e4d83fad46c3b1306e0c8fd35033
-timeCreated: 1504162083
+folderAsset: yes
+timeCreated: 1504162083
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Hotfix/Event/TestHotfixSubscribMonoEvent_LogString.cs → Unity/Hotfix/Module/FrameSync/TestHotfixSubscribMonoEvent_LogString.cs


+ 1 - 1
Unity/Hotfix/Unity.Hotfix.csproj

@@ -58,7 +58,7 @@
     <Compile Include="Base\Object\IStart.cs" />
     <Compile Include="Module\FrameSync\OperaComponent.cs" />
     <Compile Include="Entity\Config\UnitConfig.cs" />
-    <Compile Include="Event\TestHotfixSubscribMonoEvent_LogString.cs" />
+    <Compile Include="Module\FrameSync\TestHotfixSubscribMonoEvent_LogString.cs" />
     <Compile Include="Module\FrameSync\Actor_CreateUnitsHandler.cs" />
     <Compile Include="Module\FrameSync\Actor_TestHandler.cs" />
     <Compile Include="Module\FrameSync\Frame_ClickMapHandler.cs" />

+ 7 - 10
Unity/Unity.csproj

@@ -12,15 +12,12 @@
     <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-    <CompilerResponseFile>
-    </CompilerResponseFile>
+    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <CompilerResponseFile></CompilerResponseFile>
     <UnityProjectType>Game:1</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>2017.1.1p4</UnityVersion>
-    <RootNamespace>
-    </RootNamespace>
+    <RootNamespace></RootNamespace>
     <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -201,10 +198,8 @@
     <Compile Include="Assets\Scripts\Entity\Game.cs" />
     <Compile Include="Assets\Scripts\Entity\Hotfix.cs" />
     <Compile Include="Assets\Scripts\Entity\Scene.cs" />
-    <Compile Include="Assets\Scripts\Entity\Session.cs" />
     <Compile Include="Assets\Scripts\Entity\UnityWebRequestAsync.cs" />
     <Compile Include="Assets\Scripts\Entity\WWWAsync.cs" />
-    <Compile Include="Assets\Scripts\Event\NumericWatcher_Hp_ShowUI.cs" />
     <Compile Include="Assets\Scripts\Helper\ActionHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\BundleHelper.cs" />
     <Compile Include="Assets\Scripts\Helper\DllHelper.cs" />
@@ -319,19 +314,21 @@
     <Compile Include="Assets\Scripts\Module\Message\OuterOpcode.cs" />
     <Compile Include="Assets\Scripts\Module\Message\ProtobufPacker.cs" />
     <Compile Include="Assets\Scripts\Module\Message\RpcException.cs" />
+    <Compile Include="Assets\Scripts\Module\Message\Session.cs" />
     <Compile Include="Assets\Scripts\Module\Numeric\INumericWatcher.cs" />
     <Compile Include="Assets\Scripts\Module\Numeric\NumericChangeEvent_NotifyWatcher.cs" />
     <Compile Include="Assets\Scripts\Module\Numeric\NumericComponent.cs" />
     <Compile Include="Assets\Scripts\Module\Numeric\NumericType.cs" />
+    <Compile Include="Assets\Scripts\Module\Numeric\NumericWatcher_Hp_ShowUI.cs" />
     <Compile Include="Assets\Scripts\Module\Numeric\NumericWatcherAttribute.cs" />
     <Compile Include="Assets\Scripts\Module\Numeric\NumericWatcherComponent.cs" />
+    <Compile Include="Assets\Scripts\Module\UI\CanvasConfig.cs" />
     <Compile Include="Assets\Scripts\Module\UI\IUIFactory.cs" />
     <Compile Include="Assets\Scripts\Module\UI\LayerNames.cs" />
     <Compile Include="Assets\Scripts\Module\UI\UI.cs" />
     <Compile Include="Assets\Scripts\Module\UI\UIComponent.cs" />
     <Compile Include="Assets\Scripts\Module\UI\UIFactoryAttribute.cs" />
     <Compile Include="Assets\Scripts\Module\UI\UIType.cs" />
-    <Compile Include="Assets\Scripts\MonoConfig\CanvasConfig.cs" />
     <Compile Include="Assets\Scripts\Other\AppType.cs" />
     <Compile Include="Assets\Scripts\Other\Define.cs" />
     <Compile Include="Assets\Scripts\Other\IInstanceMethod.cs" />
@@ -682,4 +679,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="GenerateTargetFrameworkMonikerAttribute" />
-</Project>
+</Project>