From e7ad60c7809295100842392a9539b18c8e1b5c46 Mon Sep 17 00:00:00 2001 From: Aedanc Date: Sat, 20 Apr 2019 15:08:22 +0900 Subject: [PATCH] Mashalla le network est ok --- Assets/Menus/Lobby/CarPlatform.blend.meta | 1 + Assets/Plugins/TextMesh Pro/Documentation.meta | 8 -------- Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta | 8 -------- .../TextMesh Pro/Examples & Extras/Materials.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta | 9 --------- .../Resources/Color Gradient Presets.meta | 8 -------- .../Examples & Extras/Resources/Fonts & Materials.meta | 9 --------- .../Examples & Extras/Resources/Sprite Assets.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Scenes.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Scripts.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Sprites.meta | 9 --------- .../Plugins/TextMesh Pro/Examples & Extras/Textures.meta | 9 --------- Assets/Plugins/TextMesh Pro/Sprites.meta | 8 -------- Assets/Prefabs/HeavyCar.prefab | 4 ++-- Assets/Scenes/NetworkTest.unity | 2 +- ProjectSettings/EditorBuildSettings.asset | 4 ++-- 16 files changed, 6 insertions(+), 109 deletions(-) delete mode 100644 Assets/Plugins/TextMesh Pro/Documentation.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta delete mode 100644 Assets/Plugins/TextMesh Pro/Sprites.meta diff --git a/Assets/Menus/Lobby/CarPlatform.blend.meta b/Assets/Menus/Lobby/CarPlatform.blend.meta index 99b931d..4f08b79 100644 --- a/Assets/Menus/Lobby/CarPlatform.blend.meta +++ b/Assets/Menus/Lobby/CarPlatform.blend.meta @@ -66,6 +66,7 @@ ModelImporter: 4300016: headlight 7400000: Default Take 9500000: //RootNode + 2186277476908879412: ImportLogs externalObjects: {} materials: importMaterials: 1 diff --git a/Assets/Plugins/TextMesh Pro/Documentation.meta b/Assets/Plugins/TextMesh Pro/Documentation.meta deleted file mode 100644 index afa527a..0000000 --- a/Assets/Plugins/TextMesh Pro/Documentation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e7e8f5a82a3a134e91c54efd2274ea9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta deleted file mode 100644 index 37020f0..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Fonts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b63e0053080646b9819789bf3bf9fa17 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta deleted file mode 100644 index dbedf7c..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Materials.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5808953df7a24274a851aa6dee52d30e -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta deleted file mode 100644 index 4881085..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Prefabs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 5bff2544887143f5807c7d5059d07f79 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta deleted file mode 100644 index 69552ee..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Color Gradient Presets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7f422cd1388b01047a58cd07c7a23d9d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta deleted file mode 100644 index 846e80b..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 4f1e85c79acf49968737939ce8b445c7 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta deleted file mode 100644 index 294a767..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Resources/Sprite Assets.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3ac6db30e75b49b282a3564110579f27 -folderAsset: yes -timeCreated: 1480573362 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta deleted file mode 100644 index 8520f88..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scenes.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: db1090641b3241f6995b587eb21637bc -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta deleted file mode 100644 index 225345e..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Scripts.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 3979ce59e55144c89a2b3b3f8dcf7fd3 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta deleted file mode 100644 index bafd122..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Sprites.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 701e577af2ba48b689972d42efb95456 -folderAsset: yes -timeCreated: 1488176891 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta b/Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta deleted file mode 100644 index 2a358f6..0000000 --- a/Assets/Plugins/TextMesh Pro/Examples & Extras/Textures.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6e5c6d5e25574122a7a12dbdbbeed156 -folderAsset: yes -timeCreated: 1436068007 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Sprites.meta b/Assets/Plugins/TextMesh Pro/Sprites.meta deleted file mode 100644 index 8b699e5..0000000 --- a/Assets/Plugins/TextMesh Pro/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d0603b6d5186471b96c778c3949c7ce2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/HeavyCar.prefab b/Assets/Prefabs/HeavyCar.prefab index 8c5ea0f..92250a0 100644 --- a/Assets/Prefabs/HeavyCar.prefab +++ b/Assets/Prefabs/HeavyCar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72caa4812221f90bf7ec2236a254f028a420ab78b83f483d2c762ee5efd92a0b -size 25249 +oid sha256:3b0f14216edb2c73455aa86ddc2fe4e1aa4f18a5635851df97603757f1407048 +size 25250 diff --git a/Assets/Scenes/NetworkTest.unity b/Assets/Scenes/NetworkTest.unity index 279f2fd..c1bcab9 100644 --- a/Assets/Scenes/NetworkTest.unity +++ b/Assets/Scenes/NetworkTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71ccf7a87fd131dc34a22b68fa19756ea2bbb9a58541b9b15dd7e37d4d559453 +oid sha256:7cec63abf0dbabdaee18931038e69b151741e7aced2f3f739d0177ef1e38f325 size 21015 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index cfa402e..b7b1bbc 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad8df9bf97dbf28596225b123b57543113458cf4ff2a496c7abc939b2287c28a -size 458 +oid sha256:0a1a448c7c9453e4594bfe680c11c9c838796ccbe8dac3461161bd7b68838174 +size 558