{"id":13836,"date":"2015-04-16T12:45:28","date_gmt":"2015-04-16T03:45:28","guid":{"rendered":"http:\/\/labs.gree.jp\/blog\/?p=13836"},"modified":"2015-04-17T19:56:12","modified_gmt":"2015-04-17T10:56:12","slug":"%e6%a6%82%e8%a6%81unityyamlmerge","status":"publish","type":"post","link":"https:\/\/labs.gree.jp\/blog\/2015\/04\/13836\/","title":{"rendered":"\u6982\u8981UnityYAMLMerge"},"content":{"rendered":"<p>\u3053\u3093\u306b\u3061\u306f\u3002\u3061\u3087\u3073\u3048\u3067\u3059\u3002\u6700\u8fd1\u3072\u307e\u3064\u3076\u3057\u306bUnity\u3092\u306f\u3058\u3081\u3066\u307f\u307e\u3057\u305f\u3002<br \/>\n\u3068\u3044\u3046\u3053\u3068\u3067\u5c11\u3057\u524d\u306b\u9023\u8f09\u3057\u3066\u3044\u305fMySQL\u30d7\u30ed\u30c8\u30b3\u30eb\u306f\u3072\u3068\u3084\u3059\u307f\u3057\u3064\u3064\u3001\u4eca\u65e5\u306fUnity\u3089\u3078\u3093\u306e\u3053\u3068\u3067\u3082\u66f8\u3044\u3066\u307f\u3088\u3046\u304b\u306a\u3041\u3001\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n<p>\u6700\u8fd1\u904a\u3093\u3067\u3044\u308b\u306e\u304cUnity5\u3067\u5165\u3063\u305fSmartMerge\u3001\u3082\u3068\u3044UnityYAMLMerge\u306a\u306e\u3067\u3059\u304c\u8aac\u660e\u306e\u306a\u3055\u3063\u3077\u308a\u304c\u7d20\u6674\u3089\u3057\u304f\u3001\u9762\u767d\u534a\u5206\u3067\u691c\u8a3c\u3092\u884c\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n<h2>SmartMarge - UnityYAMLMerge<\/h2>\n<p><a href=\"http:\/\/docs.unity3d.com\/Manual\/SmartMerge.html\">http:\/\/docs.unity3d.com\/Manual\/SmartMerge.html<\/a><\/p>\n<blockquote><p>\nUnity incorporates a tool called UnityYAMLMerge that can merge scene and prefab files in a semantically correct way. The tool can be accessed from the command line and is also available to third party version control software.\n<\/p><\/blockquote>\n<p>\u5272\u611b\u3057\u307e\u3059\u3068\u3001Unity\u306fUnityYAMLMerge\u3068\u3044\u3046Prefab\u3068Scene\u30d5\u30a1\u30a4\u30eb\u3092\u610f\u5473\u5408\u3044\u7684\u306b\u6b63\u3057\u304f\u30de\u30fc\u30b8\u3059\u308b\u30c4\u30fc\u30eb\u3092\u7528\u610f\u3057\u3066\u304f\u308c\u305f\u306e\u3067\u3059\u3002<br \/>\n\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u3067\u3082\u3001VCS\u304b\u3089\u3067\u3082\u5229\u7528\u3067\u304d\u308b\u3093\u3067\u305c\u3072\u4f7f\u3063\u3066\u306d\uff01\u3068\u3044\u3046\u30c4\u30fc\u30eb\u3067\u3059<\/p>\n<h2>\u8a2d\u5b9a\u65b9\u6cd5<\/h2>\n<p>Windows\u306e\u5834\u5408\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306fC:\\Program Files\\Unity\\Editor\\Data\\Tools\u306bUnityYAMLMerge\u3068\u3044\u3046exe\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u3059\u3002<br \/>\nWindows\u306e\u5834\u5408\u30d1\u30b9\u9078\u629e\u3059\u308b\u306e\u304c\u9762\u5012\u306a\u306e\u3067\u74b0\u5883\u5909\u6570\u306ePath\u306b\u3067\u3082\u901a\u3057\u3066\u304a\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<p>Windows<\/p>\n<pre>C:\\Program Files\\Unity\\Editor\\Data\\Tools\\UnityYAMLMerge.exe<\/pre>\n<p>MaxOS X\u306e\u5834\u5408\u306f\u4e0b\u8a18\u306e\u5834\u6240\u3068\u306a\u308a\u307e\u3059\u3002\u3000<\/p>\n<pre>\/Applications\/Unity\/Unity.app\/Contents\/Tools\/UnityYAMLMerge<\/pre>\n<p>UnityYAMLMerge\u3092\u5f15\u6570\u306a\u3057\u3067\u5b9f\u884c\u3059\u308b\u3068\u30d8\u30eb\u30d7\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002\u4eca\u56de\u306f\u307e\u305a\u8a55\u4fa1\u3068\u3044\u3046\u3053\u3068\u306a\u306e\u3067VCS\u3067\u306e\u8a2d\u5b9a\u306f\u30b9\u30ad\u30c3\u30d7\u3059\u308b\u3082\u306e\u3068\u3057\u307e\u3059\u3002<\/p>\n<h3>\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306e\u8ffd\u52a0<\/h3>\n<p>UnityYAMLMerge\u306f\u5b9f\u884c\u6642\u306b\u30ab\u30ec\u30f3\u30c8\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306bauto\u3068\u3044\u3046\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u3053\u3068\u3092\u671f\u5f85\u3059\u308b\u3088\u3046\u3067\u3059\u3002<\/p>\n<p>\u5168\u304f\u8aac\u660e\u304c\u306a\u304f\u3066\u6700\u521d\u304b\u3089\u30cf\u30fc\u30c9\u30eb\u304c\u4e0a\u304c\u308b\u306e\u3067\u3059\u304c\u3001\u3088\u304f\u307f\u3066\u307f\u308b\u3068Tools\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306b\u3042\u308bmergespecfile.txt\u304cUnityYAMLMerge\u306efallbaack\u7528\u306e\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306e\u30b5\u30f3\u30d7\u30eb\u3068\u306a\u308b\u3088\u3046\u3067\u3059\u3002<\/p>\n<p>\u4eca\u56de\u306f\u7121\u511f\u3067\u4f7f\u3048\u308bP4Merge\u3092\u8a2d\u5b9a\u3057\u3088\u3046\u3068\u304a\u3082\u3046\u306e\u3067\u3001auto\u30d5\u30a1\u30a4\u30eb\uff08\u4e2d\u8eab\u306f\u305f\u3060\u306e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\uff09\u306b<\/p>\n<pre>\n* use \"%programs%\\Perforce\\p4merge.exe\" \"%b\" \"%l\" \"%r\" \"%d\"\n<\/pre>\n<p>\u3092\u8a2d\u5b9a\u3057\u307e\u3059\u3002\u304d\u3063\u3068\u30a2\u30b9\u30bf\u30ea\u30b9\u30af\u304c\u5148\u982d\u306b\u3064\u304f\u3088\u3046\u306a\u306e\u3067\u5fd8\u308c\u306a\u3044\u3088\u3046\u306b\u3057\u3066\u304f\u3060\u3055\u3044\u3002<\/p>\n<h2>\u5b9f\u9a13<\/h2>\n<p><a href=\"https:\/\/gist.github.com\/chobie\/c95fe0e05858b8819639\">https:\/\/gist.github.com\/chobie\/c95fe0e05858b8819639<\/a><\/p>\n<p>\u4e0a\u8a18\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u521d\u671f\u72b6\u614b\u306eQuad\u3092\u305d\u306e\u307e\u307ePrefab\u5316\u3057\u305f\u306e\u3082\u306e\u3092\u30b3\u30d4\u30fc\u3057\u3066Transform\u306e\u5024\u3092\u66f8\u304d\u63db\u3048\u305f\u30d5\u30a1\u30a4\u30eb\u9054\u3092\u7528\u610f\u3057\u307e\u3057\u305f\u3002\u3000<br \/>\nAncestor\u304c\u7956\u5148\u30d5\u30a1\u30a4\u30eb\u3067\u3001Local\u304c\u30ed\u30fc\u30ab\u30eb\u3067\u7de8\u96c6\u3057\u305f\u3082\u306e\u3068\u4eee\u5b9a\u3057\u3066\u304a\u308a\u3002Remote\u304cAncestor\u3092\u307b\u304b\u306e\u4eba\u304c\u66f4\u65b0\u3057\u3066Push\u6e08\u307f\u306e\u3082\u306e\u3067Local\u3068\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3059\u308b\u3082\u306e\u3068\u3057\u307e\u3059\u3002<\/p>\n<p>\u5185\u5bb9\u3092diff3\u3067\u78ba\u8a8d\u3057\u307e\u3059\u3068\u3053\u3093\u306a\u5177\u5408\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<pre>\n$ diff3 Local.prefab Ancestor.prefab Remote.prefab\n====3\n1:27c\n2:27c\n    m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}\n3:27c\n    m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07}\n====\n1:29c\n    m_LocalScale: {x: 1, y: 2, z: 1}\n2:29c\n    m_LocalScale: {x: 1, y: 1, z: 1}\n3:29c\n    m_LocalScale: {x: 1, y: 10, z: 1}\n<\/pre>\n<p>\u307e\u305a\u306f\u691c\u8a3c\u3068\u3044\u3046\u3053\u3068\u3067\u30b3\u30de\u30f3\u30c9\u30e9\u30a4\u30f3\u304b\u3089\u5b9f\u884c\u3092\u884c\u3044\u307e\u3059<\/p>\n<pre>\n> UnityYAMLMerge.exe merge -p .\\Ancestor.prefab .\\Remote.prefab .\\Local.prefab Output.prefab\n<\/pre>\n<p>-p\u3068\u3044\u3046\u30aa\u30d7\u30b7\u30e7\u30f3\u304c\u4f55\u304b\u3068\u3044\u3046\u3068<\/p>\n<blockquote><p>\nFor doing a normal premerge use the -p option. This will create a new left<br \/>\n  (theirs) file that contains all non-conflicting merges and the left side<br \/>\n  values for where there are conflicts. The same will be done the base file and<br \/>\n  right file and put into a temporary file unless [premerge base dest] \/<br \/>\n  [premerge right dest] is specified in which case that will be used instead.<br \/>\n  As a result the fallback merge tool will not show the original left,right or base<br \/>\n  files but the premerged ones which contains only conflicts that this tool<br \/>\n  could not handle.\n<\/p><\/blockquote>\n<p>\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u306a\u3044\u90e8\u5206\u306b\u95a2\u3057\u3066\u306f\u5148\u306bmerge\u3057\u305f\u3089Local\u3068Remote\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3057\u3001fallback\u30c4\u30fc\u30eb\u3067UnityYAMLMerge\u304c\u89e3\u6c7a\u3067\u304d\u306a\u3044\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u4eba\u9593\u306b\u9078\u3093\u3067\u3082\u3089\u3063\u3066\u89e3\u6c7a\u3059\u308b\u3068\u3044\u3046\u65b9\u5f0f\u3067\u3059\u3002\u7279\u306b\u7af6\u5408\u304c\u767a\u751f\u3057\u306a\u3044\u72b6\u6cc1\u3067\u3042\u308c\u3070\u30bb\u30de\u30f3\u30c6\u30a3\u30af\u30b9\u7684\u306b\u6b63\u3057\u304fMerge\u3092\u5b9f\u884c\u3057\u3066\u304f\u308c\u307e\u3059\u3002<\/p>\n<p>\u4eca\u56de\u306e\u3088\u3046\u306adiff\u306e\u5834\u5408\u3060\u3068\u5178\u578b\u7684\u306a3-way merge\u3067m_LocalRotation\u306f\u89e3\u6c7a\u3067\u304d\u307e\u3059\u304c\u3001m_LocalScale\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u307e\u3059\u3002<br \/>\n\u3053\u306e\u5834\u5408\u306bUnityYamlMerge\u306f\u3069\u306e\u3088\u3046\u306b\u52d5\u3044\u3066\u304f\u308c\u308b\u304b\u3068\u3044\u3046\u3068\u3001\u5148\u307b\u3069\u3064\u304f\u3063\u305fauto\u306e\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3067\u6307\u5b9a\u3057\u305fFallback\u30c4\u30fc\u30eb\u304c\u8d77\u52d5\u3057\u307e\u3059\u3002<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010614_AM.jpg\" alt=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010614_AM\" width=\"673\" height=\"609\" class=\"aligncenter size-full wp-image-13838\" srcset=\"https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010614_AM.jpg 673w, https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010614_AM-221x200.jpg 221w, https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010614_AM-442x400.jpg 442w\" sizes=\"auto, (max-width: 673px) 100vw, 673px\" \/><\/p>\n<p>\u898b\u3066\u308f\u304b\u308b\u901a\u308a\u3001\u554f\u984c\u306a\u3044\u90e8\u5206\u306f\u6b63\u3057\u304f\u5148\u306b\u30de\u30fc\u30b8\u3055\u308c\u3066\u3044\u307e\u3059\u306d\u3002<\/p>\n<p>\u3053\u306e\u3088\u3046\u306bUnityYAMLMerge\u306fauto\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u8a2d\u5b9a\u3092\u8aad\u307f\u8fbc\u307f\u3001\u6307\u5b9a\u3057\u305fFallback\u30c4\u30fc\u30eb\uff08P4Merge)\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u7b87\u6240\u3092\u6307\u5b9a\u3067\u304d\u308b\u3088\u3046\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u3002<br \/>\nOSX\u7248\u306eopendiff\u3067\u8a66\u3057\u305f\u5834\u5408\u306f\u7d42\u4e86\u5f85\u3061\u305b\u305a\u306b\u6570\u79d2\u3067exit\u3057\u3066\u304f\u308c\u3084\u304c\u3063\u305f\u3093\u3067\u3059\u304c\u3001Windows\u7248\u3067\u306f\u6b63\u3057\u304f\u52d5\u3044\u3066\u3044\u308b\u3088\u3046\u3067\u3059\u3002<\/p>\n<p>\u3072\u3068\u307e\u305a10\u3092\u9078\u629e\u3057\u3066\u4fdd\u5b58\u3057\u307e\u3059\u3002\u3064\u3065\u3044\u3066diff\u3092\u898b\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ diff -uAncestor.prefab Output.prefab\n---Ancestor.prefab     Thu Apr 16 00:21:22 2015\n+++ Output.prefab       Thu Apr 16 01:00:53 2015\n@@ -24,9 +24,9 @@\n   m_PrefabParentObject: {fileID: 0}\n   m_PrefabInternal: {fileID: 100100000}\n   m_GameObject: {fileID: 122172}\n-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}\n+  m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07}\n   m_LocalPosition: {x: 0, y: 0, z: -70}\n-  m_LocalScale: {x: 1, y: 1, z: 1}\n+  m_LocalScale: {x: 1, y: 10, z: 1}\n   m_Children: []\n   m_Father: {fileID: 0}\n   m_RootOrder: 0\n<\/pre>\n<p>(\u8a2d\u5b9a\u306b\u3088\u3063\u3066\u306f\u6539\u884c\u30b3\u30fc\u30c9\u306e\u554f\u984c\u3067\u3069\u3070\u3063\u3068diff\u304c\u3067\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u304c\u305d\u306e\u5834\u5408\u306f\u9069\u5ea6\u306b\u76f4\u3057\u3066\u304f\u3060\u3055\u3044\uff09<\/p>\n<p>Ancestor\u3068\u6700\u7d42\u7d50\u679c\u306ediff\u3092\u3068\u3063\u3066\u307f\u3066\u3082\u308f\u304b\u308b\u901a\u308a\u554f\u984c\u306a\u304fMerge\u304c\u884c\u3048\u3066\u3044\u308b\u3088\u3046\u3067\u3059\u306d\uff01<\/p>\n<p>\u3068\u306f\u3044\u3048\u3001\u3053\u308c\u306f\u3069\u3046\u307f\u3066\u3082\u901a\u5e38\u306e\u30b9\u30ea\u30fc\u30a6\u30a7\u30a4\u30de\u30fc\u30b8\u3067\u3082\u51e6\u7406\u3067\u304d\u308b\u5185\u5bb9\u3067\u304a\u3082\u3057\u308d\u304f\u3042\u308a\u307e\u305b\uff4e\u3002<br \/>\n\u7d9a\u3044\u3066\u3001\u5177\u4f53\u7684\u306bSemantics\u304c\u6b63\u3057\u3044Merge\u3068\u306f\u3069\u3046\u3044\u3046\u3082\u306e\u306a\u306e\u304b\u3092\u691c\u8a3c\u3057\u3066\u3044\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<h2>Semantics\u7684\u306b\u6b63\u3057\u3044YamlMerge<\/h2>\n<p>\u3061\u3087\u3063\u3068\u3044\u305f\u305a\u3089\u3092\u3057\u3066Local.prefab\u3068Remote.prefab\u306eTransform\u306e\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u9806\u756a\u3092\u3050\u3061\u3083\u3050\u3061\u3083\u306b\u3057\u307e\u3057\u305f\u3002<\/p>\n<pre>\n$ diff -u Local.prefab Remote.prefab\n--- Local.prefab        Thu Apr 16 01:03:07 2015\n+++ Remote.prefab       Thu Apr 16 01:03:28 2015\n@@ -21,15 +21,15 @@\n--- !u!4 &409072\nTransform:\n   m_ObjectHideFlags: 1\n+  m_Children: []\n   m_PrefabInternal: {fileID: 100100000}\n   m_GameObject: {fileID: 122172}\n+  m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07}\n   m_LocalPosition: {x: 0, y: 0, z: -70}\n-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}\n-  m_LocalScale: {x: 1, y: 2, z: 1}\n-  m_Children: []\n+  m_PrefabParentObject: {fileID: 0}\n   m_Father: {fileID: 0}\n   m_RootOrder: 0\n-  m_PrefabParentObject: {fileID: 0}\n+  m_LocalScale: {x: 1, y: 10, z: 1}\n--- !u!23 &2313158\nMeshRenderer:\n   m_ObjectHideFlags: 1\n<\/pre>\n<p>\u307f\u308b\u306e\u3082\u3044\u3084\u306adiff\u306b\u306a\u308b\u306e\u306f\u308f\u304b\u3063\u3066\u3044\u308b\u3093\u3067\u3059\u304c\u3001diff3\u3067\u898b\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ diff3 Local.prefabAncestor.prefab Remote.prefab\n====\n1:23a\n2:24c\n    m_PrefabParentObject: {fileID: 0}\n3:24c\n    m_Children: []\n====\n1:25a\n2:27c\n    m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}\n3:27c\n    m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07}\n====\n1:27,29c\n    m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}\n    m_LocalScale: {x: 1, y: 2, z: 1}\n    m_Children: []\n2:29,30c\n    m_LocalScale: {x: 1, y: 1, z: 1}\n    m_Children: []\n3:29c\n    m_PrefabParentObject: {fileID: 0}\n====\n1:32c\n    m_PrefabParentObject: {fileID: 0}\n2:32a\n3:32c\n    m_LocalScale: {x: 1, y: 10, z: 1}\n<\/pre>\n<p>\u3042\u30fc\u3082\u3046\u3084\u308b\u304d\u3067\u306a\u3044\u3067\u3059\u306d\u30fc\u3002\u5c0f\u3055\u306aPrefab\u3060\u3063\u305f\u3089\u307e\u3060\u3057\u3082\u30b7\u30fc\u30f3\u30d5\u30a1\u30a4\u30eb\u3067\u3053\u3089\u308c\u305f\u3089\u6ce3\u304f\u6ce3\u304f\u3084\u3063\u3066\u3044\u304f\u3057\u304b\u3042\u308a\u307e\u305b\u3093\u3002<\/p>\n<p>\u3067\u3082UnityYAMLMerge\u306a\u3089\u5927\u4e08\u592b\u3002Semantics\u7684\u306b\u6b63\u3057\u304fpremerge\u3057\u3066\u304b\u3089\u672c\u5f53\u306bConflict\u3057\u3066\u3044\u308b\u3068\u3053\u308d\u3060\u3051\u3092\u63d0\u6848\u3057\u3066\u304f\u308c\u307e\u3059\u3002<\/p>\n<pre>\n> rm Output.prefab\n> UnityYAMLMerge.exe merge -p .\\Ancestor.prefab .\\Remote.prefab .\\Local.prefab Output.prefab\n<\/pre>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_125641_AM.jpg\" alt=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_125641_AM\" width=\"680\" height=\"612\" class=\"aligncenter size-full wp-image-13839\" srcset=\"https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_125641_AM.jpg 680w, https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_125641_AM-222x200.jpg 222w, https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_125641_AM-444x400.jpg 444w\" sizes=\"auto, (max-width: 680px) 100vw, 680px\" \/><\/p>\n<p>\u3084\u3063\u305f\u306d\uff01<\/p>\n<p>\u5ff5\u306e\u305f\u3081diff\u3067\u78ba\u8a8d\u3057\u3066\u307f\u307e\u3057\u3087\u3046\u3002<\/p>\n<pre>\n$ diff -u Ancestor.prefab Output.prefab  Ancestor.prefab Remote\n--- Ancestor.prefab     Thu Apr 16 00:21:22 2015\n+++ Output.prefab       Thu Apr 16 01:22:53 2015\n@@ -24,9 +24,9 @@\n   m_PrefabParentObject: {fileID: 0}\n   m_PrefabInternal: {fileID: 100100000}\n   m_GameObject: {fileID: 122172}\n-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}\n+  m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07}\n   m_LocalPosition: {x: 0, y: 0, z: -70}\n-  m_LocalScale: {x: 1, y: 1, z: 1}\n+  m_LocalScale: {x: 1, y: 10, z: 1}\n   m_Children: []\n   m_Father: {fileID: 0}\n   m_RootOrder: 0\n<\/pre>\n<p>\u3050\u3063\uff01<\/p>\n<h2>UnityYAMLMerge\u306e\u8ab2\u984c<\/h2>\n<p>\u3068\u3001Semantics\u7684\u306b\u6b63\u3057\u304fMerge\u3057\u3066\u304f\u308c\u308bUnityYAMLMerge\u306a\u306e\u3067\u3059\u304c\u5927\u304d\u306a\u554f\u984c\u304c\u3042\u308a\u307e\u3057\u3066<\/p>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010731_AM.jpg\" alt=\"\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010731_AM\" width=\"737\" height=\"170\" class=\"aligncenter size-full wp-image-13840\" srcset=\"https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010731_AM.jpg 737w, https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010731_AM-276x64.jpg 276w, https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/\u30b9\u30af\u30ea\u30fc\u30f3\u30b7\u30e7\u30c3\u30c8_041615_010731_AM-600x138.jpg 600w\" sizes=\"auto, (max-width: 737px) 100vw, 737px\" \/><\/p>\n<p>\u5727\u5012\u7684\u3001\u4eba\u67f1\u611f\uff01\uff01\uff01\uff01<\/p>\n<p>UnityYAMLMerge\u3092\u5f15\u6570\u306a\u3057\u3067\u5b9f\u884c\u3059\u308b\u3068\u30d8\u30eb\u30d7\u51fa\u3057\u3066\u304f\u308c\u308b\u3093\u3067\u3059\u304c\u3001\u3069\u3046\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3057\u3066\u3044\u3044\u306e\u304b\u307e\u3063\u305f\u304f\u308f\u304b\u308a\u307e\u305b\u3093\u3002<br \/>\n\u7d44\u307f\u5408\u308f\u305b\u304c\u308f\u304b\u3089\u3093\u306e\u3060\u3088\u2026<\/p>\n<h2>\u3088\u304f\u3042\u308b\u8cea\u554f<\/h2>\n<p>Q: scene\u3084prefab\u306eyaml\u3092\u30de\u30fc\u30b8\u3059\u308b\u306a\u3093\u3066\u3053\u308f\u3044\u3088<br \/>\nA: \u3060\u3044\u3058\u3087\u3046\u3076\u3001\u3053\u308f\u304f\u306a\u3044\u3088\u3002<\/p>\n<h2>\u304a\u308f\u308a\u306b<\/h2>\n<p>\u307c\u304f\u3068\u3044\u3063\u3057\u3087\u306b\u30d0\u30b0\u3092\u8e0f\u307f\u629c\u3044\u3066\u304f\u308c\u308bUnity\u304a\u53cb\u9054\u52df\u96c6\u3057\u3066\u3044\u307e\u3059\u3002<\/p>\n<p>\u305c\u3093\u305c\u3093Shader\u3068\u304b\u3088\u304f\u308f\u304b\u3089\u306a\u3044\u3093\u3067\u3059\u304c\u3001ShaderLab\u306eProgram\u3068SubProgram\u3063\u3066\u3069\u3046\u3044\u3046\u5f79\u5272\u306a\u306e\u304b\uff1f\u3063\u3066\u3044\u3046\u306e\u304c\u6700\u8fd1\u306e\u60a9\u307f\u3067\u3059\u3002\u3060\u3044\u305f\u3044\u60f3\u50cf\u3064\u304f\u3051\u3069\u3001\u306f\u3063\u304d\u308a\u8aac\u660e\u3057\u3066\u3068\u8a00\u308f\u308c\u308b\u3068\u306a\u3093\u3068\u3082\u3002<\/p>\n<p>\u305d\u3044\u3067\u306f\u3001Happy Hacking\uff01<\/p>\n<h2>(\u8ffd\u8a18)\u3044\u307e\u306e\u304d\u3082\u3061<\/h2>\n<p><img loading=\"lazy\" decoding=\"async\" src=\"http:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/80846e9b037bb76cc1f2b003859456d6.png\" alt=\"80846e9b037bb76cc1f2b003859456d6\" width=\"363\" height=\"172\" class=\"aligncenter size-full wp-image-13851\" srcset=\"https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/80846e9b037bb76cc1f2b003859456d6.png 363w, https:\/\/labs.gree.jp\/blog\/wp-content\/uploads\/2015\/04\/80846e9b037bb76cc1f2b003859456d6-276x131.png 276w\" sizes=\"auto, (max-width: 363px) 100vw, 363px\" \/><\/p>\n<style type=\"text\/css\">\n#content p {\n  line-height: 1.6em;\n  letter-spacing: 1px;\n}\n<\/style>\n","protected":false},"excerpt":{"rendered":"<p>\u3053\u3093\u306b\u3061\u306f\u3002\u3061\u3087\u3073\u3048\u3067\u3059\u3002\u6700\u8fd1\u3072\u307e\u3064\u3076\u3057\u306bUnity\u3092\u306f\u3058\u3081\u3066\u307f\u307e\u3057\u305f\u3002 \u3068\u3044\u3046\u3053\u3068\u3067\u5c11\u3057\u524d\u306b\u9023\u8f09\u3057\u3066\u3044\u305fMySQL\u30d7\u30ed\u30c8\u30b3\u30eb\u306f\u3072\u3068\u3084\u3059\u307f\u3057\u3064\u3064\u3001\u4eca\u65e5\u306fUnity\u3089\u3078\u3093\u306e\u3053\u3068\u3067\u3082\u66f8\u3044\u3066\u307f\u3088\u3046\u304b\u306a\u3041\u3001\u3068\u601d\u3044\u307e\u3059\u3002 \u6700\u8fd1\u904a\u3093 [&hellip;]<\/p>\n","protected":false},"author":100,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"_jetpack_memberships_contains_paid_content":false,"footnotes":""},"categories":[],"tags":[40],"class_list":["post-13836","post","type-post","status-publish","format-standard","has-post-thumbnail","hentry","tag-unity"],"jetpack_featured_media_url":"","jetpack_sharing_enabled":true,"_links":{"self":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts\/13836","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/users\/100"}],"replies":[{"embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/comments?post=13836"}],"version-history":[{"count":3,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts\/13836\/revisions"}],"predecessor-version":[{"id":13853,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/posts\/13836\/revisions\/13853"}],"wp:attachment":[{"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/media?parent=13836"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/categories?post=13836"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/labs.gree.jp\/blog\/wp-json\/wp\/v2\/tags?post=13836"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}