Procházet zdrojové kódy

rsync搞了一晚上都没搞定,linux上软件的配置简直就是垃圾,错误莫名奇妙,fuck

tanghai před 9 roky
rodič
revize
f19b575123

+ 0 - 19
Server/Model/Component/StartConfigComponent.cs

@@ -26,25 +26,6 @@ namespace Model
 
 		public void Awake(string[] args)
 		{
-			//StartConfig sc = new StartConfig();
-			////sc.IP = "192.168.12.112";
-			////sc.Options.AppType = "Realm";
-			////sc.Options.Id = 1;
-			//
-			//InnerConfig inneConfig = sc.Config.AddComponent<InnerConfig>();
-			////inneConfig.Host = "127.0.0.1";
-			////inneConfig.Port = 10002;
-			//
-			//OuterConfig outerConfig = sc.Config.AddComponent<OuterConfig>();
-			////outerConfig.Host = "127.0.0.1";
-			////outerConfig.Port = 10003;
-			//
-			//string s3 = MongoHelper.ToJson(sc);
-			//StartConfig s4 = MongoHelper.FromJson<StartConfig>(s3);
-
-			//BsonClassMap.RegisterClassMap<OuterConfig>();
-			//BsonClassMap.RegisterClassMap<InnerConfig>();
-
 			string[] ss = File.ReadAllText("./Start.txt").Split('\n');
 			foreach (string s in ss)
 			{

+ 2 - 0
Tools/cwRsync/Rsync.txt

@@ -0,0 +1,2 @@
+SET HOME=%HOMEDRIVE%%HOMEPATH%
+rsync.exe -vzrtopg --progress --password-file=./rsync.secrets --exclude-from=exclude.txt ../.. tanghai@192.168.1.134::Source/Egametang

+ 47 - 0
Tools/cwRsync/cwrsync.cmd

@@ -0,0 +1,47 @@
+@ECHO OFF
+REM *****************************************************************
+REM
+REM CWRSYNC.CMD - Batch file template to start your rsync command (s).
+REM
+REM By Tevfik K. (http://itefix.no)
+REM *****************************************************************
+
+REM Make environment variable changes local to this batch file
+SETLOCAL
+
+REM ** CUSTOMIZE ** Specify where to find rsync and related files (C:\CWRSYNC)
+SET CWRSYNCHOME=%PROGRAMFILES%\CWRSYNC
+
+REM Set HOME variable to your windows home directory. That makes sure 
+REM that ssh command creates known_hosts in a directory you have access.
+SET HOME=%HOMEDRIVE%%HOMEPATH%
+
+REM Make cwRsync home as a part of system PATH to find required DLLs
+SET CWOLDPATH=%PATH%
+SET PATH=%CWRSYNCHOME%\BIN;%PATH%
+
+REM Windows paths may contain a colon (:) as a part of drive designation and 
+REM backslashes (example c:\, g:\). However, in rsync syntax, a colon in a 
+REM path means searching for a remote host. Solution: use absolute path 'a la unix', 
+REM replace backslashes (\) with slashes (/) and put -/cygdrive/- in front of the 
+REM drive letter:
+REM 
+REM Example : C:\WORK\* --> /cygdrive/c/work/*
+REM 
+REM Example 1 - rsync recursively to a unix server with an openssh server :
+REM
+REM       rsync -r /cygdrive/c/work/ remotehost:/home/user/work/
+REM
+REM Example 2 - Local rsync recursively 
+REM
+REM       rsync -r /cygdrive/c/work/ /cygdrive/d/work/doc/
+REM
+REM Example 3 - rsync to an rsync server recursively :
+REM    (Double colons?? YES!!)
+REM
+REM       rsync -r /cygdrive/c/doc/ remotehost::module/doc
+REM
+REM Rsync is a very powerful tool. Please look at documentation for other options. 
+REM
+
+REM ** CUSTOMIZE ** Enter your rsync command(s) here

binární
Tools/cwRsync/cygcrypto-1.0.0.dll


binární
Tools/cwRsync/cyggcc_s-1.dll


binární
Tools/cwRsync/cygiconv-2.dll


binární
Tools/cwRsync/cygssp-0.dll


binární
Tools/cwRsync/cygwin1.dll


binární
Tools/cwRsync/cygz.dll


+ 1 - 0
Tools/cwRsync/exclude.txt

@@ -0,0 +1 @@
+../../.git

binární
Tools/cwRsync/rsync.exe


+ 1 - 0
Tools/cwRsync/rsync.secrets

@@ -0,0 +1 @@
+123456

+ 11 - 0
Tools/cwRsync/rsyncd.conf

@@ -0,0 +1,11 @@
+uid = root
+gid = root
+#strict modes = no
+use chroot = no
+max connections = 100
+
+[Source]
+path = /home/tanghai/Source/
+auth users = tanghai
+secrets file = /etc/rsyncd.secrets
+list = yes

binární
Tools/cwRsync/ssh-keygen.exe


binární
Tools/cwRsync/ssh.exe


+ 2 - 2
Unity/Assets/Editor/ServerCommandLineEditor/UI.meta → Unity/Assets/Editor/RsyncEditor.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 04d12359a9fbea443904bae2c7dcf115
+guid: 56c88c70f2044f74dae91724d10cd93c
 folderAsset: yes
-timeCreated: 1476673684
+timeCreated: 1477156499
 licenseType: Pro
 DefaultImporter:
   userData: 

+ 15 - 0
Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Diagnostics;
+using UnityEditor;
+
+namespace MyEditor
+{
+	public class RsyncEditor : EditorWindow
+	{
+		[MenuItem("Tools/Rsync")]
+		private static void ShowUnDisposeObjects()
+		{
+			Process.Start("../Tools/cwRsync/rsync.exe", "");
+		}
+	}
+}

+ 12 - 0
Unity/Assets/Editor/RsyncEditor/RsyncEditor.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 386af34361bc52a4b8269f8ef9643fcf
+timeCreated: 1477156531
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 0
Unity/Assets/Editor/ServerCommandLineEditor/UI/ServerCommandLineEditor.cs → Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs


+ 0 - 0
Unity/Assets/Editor/ServerCommandLineEditor/UI/ServerCommandLineEditor.cs.meta → Unity/Assets/Editor/ServerCommandLineEditor/ServerCommandLineEditor.cs.meta


+ 1 - 1
Unity/Assets/Plugins/Base/Message/MessageAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fcf293ee7dda23746a98f4308723280e
+guid: 485eb61dbc2b9664d80d40e19aa80c49
 timeCreated: 1476426533
 licenseType: Pro
 MonoImporter:

+ 0 - 2
Unity/Assets/Plugins/Base/Object/ObjectManager.cs

@@ -122,7 +122,6 @@ namespace Base
 
 		public void Add(Object obj)
 		{
-			Log.Debug($"Add: {obj.GetType().Name} {obj.Id}");
 			if (objectEvents == null)
 			{
 				return;
@@ -156,7 +155,6 @@ namespace Base
 
 		public void Remove(long id)
 		{
-			Log.Debug($"remove: {id}");
 			this.objects.Remove(id);
 		}
 

binární
Unity/Assets/Res/Code/Controller.dll.bytes


binární
Unity/Assets/Res/Code/Controller.dll.mdb.bytes


+ 6 - 3
Unity/Unity.CSharp.Editor.csproj

@@ -13,11 +13,13 @@
     <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
-    <CompilerResponseFile></CompilerResponseFile>
+    <CompilerResponseFile>
+    </CompilerResponseFile>
     <UnityProjectType>Editor:5</UnityProjectType>
     <UnityBuildTarget>StandaloneWindows:5</UnityBuildTarget>
     <UnityVersion>5.4.1f1</UnityVersion>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -114,7 +116,8 @@
     <Compile Include="Assets\Editor\EditorInit.cs" />
     <Compile Include="Assets\Editor\ObjectManagerToolsEditor\ObjectManagerToolsWindow.cs" />
     <Compile Include="Assets\Editor\ReferenceCollectorEditor\ReferenceCollectorEditor.cs" />
-    <Compile Include="Assets\Editor\ServerCommandLineEditor\UI\ServerCommandLineEditor.cs" />
+    <Compile Include="Assets\Editor\RsyncEditor\RsyncEditor.cs" />
+    <Compile Include="Assets\Editor\ServerCommandLineEditor\ServerCommandLineEditor.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Assets\CSharp 6.0 Support\AsyncTools\Plugins\AsyncBridge.Net35.xml" />