1.13.4 build

.gitignore

@@ -90,7 +90,6 @@ crashlytics-build.properties
 /Assets/Effect/KTK_Effect_Samples
 /Assets/SCI-FI UI Components
 /Assets/Sound
-/Assets/CardBaseEntity/CardEntity_JSONLoader.asset
 
 /Assets/AddOn/@ Xxuebi.meta
 /Assets/AddOn/Energy Shield Shader.meta
@@ -101,5 +100,4 @@ crashlytics-build.properties
 /Assets/Effect/DL_Fantasy_RPG_Effects.meta
 /Assets/Effect/KTK_Effect_Samples.meta
 /Assets/SCI-FI UI Components.meta
-/Assets/Sound.meta
-/Assets/CardBaseEntity/CardEntity_JSONLoader.asset.meta
+/Assets/Sound.meta

Assets/CardBaseEntity/CardEntity_JSONLoader.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3319ffa1170fe299c32f52303593ee5af58da1e840da7dbf29fecdfc55edf11
+size 477

Assets/CardBaseEntity/CardEntity_JSONLoader.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 09a7b0e0616840d459b9d34dc3076155
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/JSONLoader_CardEntity.cs

@@ -31,6 +31,9 @@ namespace DCGO.CardEntities
         public override void OnInspectorGUI()
         {
             _loadJSON = target as LoadJSON_CardEntity;
+
+            GUILayout.Label("**IMPORTANT: DO NOT EDIT**");
+
             DrawDefaultInspector();
 
             if (GUILayout.Button("Get JSON Object"))

Assets/Editor/Missing AAs/EX11.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f2ddd22620a70ef41838fa7643e7fe1e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/ContinuousControllerScene.unity

@@ -4769,7 +4769,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 7c4910f9278fbaa45afff6d470072f2a, type: 2}
   - {fileID: 11400000, guid: fa2b4a1470920b94183eb8743359f0a1, type: 2}
   - {fileID: 11400000, guid: 269e1d3ee2087d541a9a034a7b660218, type: 2}
-  - {fileID: 11400000, guid: 201dd77cead4e2346a1db7cae4cca02c, type: 2}
   - {fileID: 11400000, guid: e8f0cd15bd343ea47baa4723139a2779, type: 2}
   - {fileID: 11400000, guid: 1a7a73ef469d5294699f9b322ad69495, type: 2}
   - {fileID: 11400000, guid: 1a64c08c91ea19b40b0cffd0df22e970, type: 2}
@@ -13561,7 +13560,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 7c4910f9278fbaa45afff6d470072f2a, type: 2}
   - {fileID: 11400000, guid: fa2b4a1470920b94183eb8743359f0a1, type: 2}
   - {fileID: 11400000, guid: 269e1d3ee2087d541a9a034a7b660218, type: 2}
-  - {fileID: 11400000, guid: 201dd77cead4e2346a1db7cae4cca02c, type: 2}
   - {fileID: 11400000, guid: e8f0cd15bd343ea47baa4723139a2779, type: 2}
   - {fileID: 11400000, guid: 1a7a73ef469d5294699f9b322ad69495, type: 2}
   - {fileID: 11400000, guid: 1a64c08c91ea19b40b0cffd0df22e970, type: 2}

Assets/Scripts

@@ -1 +1 @@
-Subproject commit 1167399ea994dbe1ad753d9b085d61ce029114cc
+Subproject commit 923153058029c5e09245063a5cce1f2594d870ce

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c79ef092079fa25487ba5e84608a2d66930c9eddf285482a272f51c650c7901a
+oid sha256:cdd66145d5dc480605d7c3bf57ed0ccac01e541babebcebae3248e265e00bd87
 size 20479