Mercurial > hg > Members > kazuma > JungleforUnity

changeset 7:ad4729c5eec4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix error.
author Kazuma Takeda
date Thu, 15 Dec 2016 22:45:31 +0900
parents 9be20fcffaac
children 599bd8ddb72b
files Assets/Application/BenchMarkTest.cs Assets/Application/Scripts/SaveData.cs Assets/Application/Scripts/Test/SaveDataTest.cs Assets/Item.cs Assets/jungle-sharp.meta README.md obj/Debug/Assembly-CSharp.csproj.FilesWrittenAbsolute.txt obj/Debug/Assembly-CSharp.dll obj/Debug/Assembly-CSharp.dll.mdb
diffstat 9 files changed, 34 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Assets/Application/BenchMarkTest.cs	Mon Dec 05 05:24:05 2016 +0900
+++ b/Assets/Application/BenchMarkTest.cs	Thu Dec 15 22:45:31 2016 +0900
@@ -1,5 +1,6 @@
 using UnityEngine;
 using System.Collections;
+using JungleDB;
 
 public class BenchMarkTest : MonoBehaviour {
 
@@ -14,7 +15,7 @@
 		JungleTree tree = jungle.getTreeByName("TestTree");
 		JungleTreeEditor editor = tree.getTreeEditor();
 		editor = createTree(editor, 0, 3, new DefaultNodePath());
-		Either<Error, JungleTreeEditor> either = editor.success();
+		Either<Error, JungleTreeEditor> either = editor.commit();
 		DebugCommon.Assert (either.isA (), "[Error]" + either.a());
 		sw.Stop ();
 		print ("[Time]"  + sw.Elapsed);
--- a/Assets/Application/Scripts/SaveData.cs	Mon Dec 05 05:24:05 2016 +0900
+++ b/Assets/Application/Scripts/SaveData.cs	Thu Dec 15 22:45:31 2016 +0900
@@ -1,5 +1,6 @@
 using UnityEngine;
 using System.Collections;
+using JungleDB;
 
 public class SaveData : MonoBehaviour {
 
@@ -77,7 +78,7 @@
 	}
  
 	public void Push() {
-		Either<Error, JungleTreeEditor> r = TreeEditor.success();
+		Either<Error, JungleTreeEditor> r = TreeEditor.commit();
 		if (r.isA ()) {
 			Debug.LogError ("[Error]");
 		} else {
--- a/Assets/Application/Scripts/Test/SaveDataTest.cs	Mon Dec 05 05:24:05 2016 +0900
+++ b/Assets/Application/Scripts/Test/SaveDataTest.cs	Thu Dec 15 22:45:31 2016 +0900
@@ -2,6 +2,7 @@
 using UnityEditor;
 using System.Collections;
 using UnityEngine.SceneManagement;
+using JungleDB;
 
 public class SaveDataTest : MonoBehaviour {
 
--- a/Assets/Item.cs	Mon Dec 05 05:24:05 2016 +0900
+++ b/Assets/Item.cs	Thu Dec 15 22:45:31 2016 +0900
@@ -3,10 +3,4 @@
 
 public class Item : MonoBehaviour {
 
-	public Stage.Type Attribute;
-	public int ID = 0;
-
-	public void SetHaveObject () {
-		Player.Instance.SetHaveObjectNumber (ID);
-	}
 }
--- a/Assets/jungle-sharp.meta	Mon Dec 05 05:24:05 2016 +0900
+++ b/Assets/jungle-sharp.meta	Thu Dec 15 22:45:31 2016 +0900
@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 112633efb5605c24c9cce3405588dcc9
+guid: f4c6f4be0d3bd48b498f817482579302
 folderAsset: yes
-timeCreated: 1480879149
+timeCreated: 1481808779
 licenseType: Free
 DefaultImporter:
   userData: 
--- a/README.md	Mon Dec 05 05:24:05 2016 +0900
+++ b/README.md	Thu Dec 15 22:45:31 2016 +0900
@@ -3,4 +3,9 @@
 # Settings
 
 $ cd Assets/
-$ hg clone http://www.cr.ie.u-ryukyu.ac.jp/hg/Database/jungle-sharp/ 
+$ hg clone http://www.cr.ie.u-ryukyu.ac.jp/hg/Database/jungle-sharp/
+
+# Unity Version
+
+Unity 5.5.0f3
+can not open before version 5.4.
--- a/obj/Debug/Assembly-CSharp.csproj.FilesWrittenAbsolute.txt	Mon Dec 05 05:24:05 2016 +0900
+++ b/obj/Debug/Assembly-CSharp.csproj.FilesWrittenAbsolute.txt	Thu Dec 15 22:45:31 2016 +0900
@@ -32,3 +32,24 @@
 /Users/e135768K/Documents/labo/Unity/JungleApplication/Temp/bin/Debug/Unity.CecilTools.dll
 /Users/e135768K/Documents/labo/Unity/JungleApplication/Temp/bin/Debug/Mono.Cecil.Pdb.dll
 /Users/e135768K/Documents/labo/Unity/JungleApplication/Temp/bin/Debug/Mono.Cecil.Mdb.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/obj/Debug/Assembly-CSharp.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/obj/Debug/Assembly-CSharp.dll.mdb
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEngine.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEditor.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEngine.Analytics.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEngine.PlaymodeTestsRunner.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEngine.Networking.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEngine.UI.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEngine.HoloLens.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/UnityEngine.VR.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Mono.Cecil.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Unity.SerializationLogic.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Unity.DataContract.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/ICSharpCode.NRefactory.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Unity.UNetWeaver.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Unity.UNetWeaver.dll.mdb
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Unity.CecilTools.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Mono.Cecil.Pdb.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Mono.Cecil.Mdb.dll
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Assembly-CSharp.dll.mdb
+/Users/kazuma/Documents/workspace/labo/JungleforUnity/Temp/bin/Debug/Assembly-CSharp.dll
Binary file obj/Debug/Assembly-CSharp.dll has changed
Binary file obj/Debug/Assembly-CSharp.dll.mdb has changed