Merge branch 'develop' of https://scm.osdn.net/gitroot/mindgames/Mindgames_main into...

diff --cc Mindgames/Library/CurrentLayout-default.dwlt
index 9f09daa,1d7d531..9a1b0fc
--- 1/Mindgames/Library/CurrentLayout-default.dwlt
--- 2/Mindgames/Library/CurrentLayout-default.dwlt
+++ b/Mindgames/Library/CurrentLayout-default.dwlt
@@@ -38,15 -38,15 +38,15 @@@ MonoBehaviour
    m_Children: []
    m_Position:
      serializedVersion: 2
-     x: 999
+     x: 1008
      y: 0
-     width: 529
-     height: 947
+     width: 504
+     height: 376
    m_MinSize: {x: 234, y: 272}
    m_MaxSize: {x: 10004, y: 10022}
 -  m_ActualView: {fileID: 17}
 +  m_ActualView: {fileID: 16}
    m_Panes:
 -  - {fileID: 17}
 +  - {fileID: 16}
    m_Selected: 0
    m_LastSelected: 0
  --- !u!114 &3
@@@ -69,13 -93,13 +94,13 @@@ MonoBehaviour
      serializedVersion: 2
      x: 0
      y: 30
 -    width: 1904
 +    width: 1920
      height: 947
-   m_MinSize: {x: 917, y: 344}
-   m_MaxSize: {x: 22012, y: 10022}
+   m_MinSize: {x: 683, y: 494}
+   m_MaxSize: {x: 18008, y: 14044}
    vertical: 0
    controlID: 12
 ---- !u!114 &5
 +--- !u!114 &4
  MonoBehaviour:
    m_ObjectHideFlags: 52
    m_CorrespondingSourceObject: {fileID: 0}
@@@ -96,14 -120,14 +121,14 @@@
      height: 947
    m_MinSize: {x: 277, y: 72}
    m_MaxSize: {x: 4002, y: 4022}
-   m_ActualView: {fileID: 17}
+   m_ActualView: {fileID: 18}
    m_Panes:
 -  - {fileID: 18}
 -  - {fileID: 15}
 +  - {fileID: 17}
    - {fileID: 14}
 +  - {fileID: 13}
    m_Selected: 0
    m_LastSelected: 2
- --- !u!114 &5
+ --- !u!114 &6
  MonoBehaviour:
    m_ObjectHideFlags: 52
    m_CorrespondingSourceObject: {fileID: 0}
@@@ -120,16 -144,16 +145,16 @@@
      serializedVersion: 2
      x: 0
      y: 0
-     width: 250
+     width: 374
      height: 571
-   m_MinSize: {x: 202, y: 222}
-   m_MaxSize: {x: 4002, y: 4022}
-   m_ActualView: {fileID: 18}
+   m_MinSize: {x: 200, y: 200}
+   m_MaxSize: {x: 4000, y: 4000}
+   m_ActualView: {fileID: 19}
    m_Panes:
 -  - {fileID: 19}
 +  - {fileID: 18}
    m_Selected: 0
    m_LastSelected: 0
 ---- !u!114 &7
 +--- !u!114 &6
  MonoBehaviour:
    m_ObjectHideFlags: 52
    m_CorrespondingSourceObject: {fileID: 0}
@@@ -175,11 -199,11 +200,11 @@@ MonoBehaviour
      serializedVersion: 2
      x: 0
      y: 0
 -    width: 1904
 +    width: 1920
      height: 997
-   m_MinSize: {x: 950, y: 394}
+   m_MinSize: {x: 950, y: 300}
    m_MaxSize: {x: 10000, y: 10000}
 ---- !u!114 &9
 +--- !u!114 &8
  MonoBehaviour:
    m_ObjectHideFlags: 52
    m_CorrespondingSourceObject: {fileID: 0}
@@@ -241,13 -265,13 +266,13 @@@ MonoBehaviour
      serializedVersion: 2
      x: 0
      y: 0
-     width: 999
+     width: 1512
      height: 947
 -  m_MinSize: {x: 406, y: 494}
 -  m_MaxSize: {x: 14006, y: 14044}
 +  m_MinSize: {x: 406, y: 344}
 +  m_MaxSize: {x: 8006, y: 8044}
    vertical: 1
    controlID: 13
 ---- !u!114 &12
 +--- !u!114 &11
  MonoBehaviour:
    m_ObjectHideFlags: 52
    m_CorrespondingSourceObject: {fileID: 0}
@@@ -293,14 -317,14 +318,14 @@@ MonoBehaviour
      height: 571
    m_MinSize: {x: 204, y: 222}
    m_MaxSize: {x: 4004, y: 4022}
 -  m_ActualView: {fileID: 20}
 +  m_ActualView: {fileID: 19}
    m_Panes:
 +  - {fileID: 19}
    - {fileID: 20}
 -  - {fileID: 21}
 -  - {fileID: 16}
 +  - {fileID: 15}
    m_Selected: 0
-   m_LastSelected: 2
- --- !u!114 &13
+   m_LastSelected: 1
+ --- !u!114 &14
  MonoBehaviour:
    m_ObjectHideFlags: 52
    m_CorrespondingSourceObject: {fileID: 0}
@@@ -468,12 -491,12 +493,12 @@@ MonoBehaviour
          y: 0
          width: 0
          height: 0
-       m_UserData: 0
+       m_UserData: 24674
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
 -      m_OriginalEventType: 0
 +      m_OriginalEventType: 11
        m_IsRenamingFilename: 1
 -      m_ClientGUIView: {fileID: 2}
 +      m_ClientGUIView: {fileID: 0}
      m_SearchString: 
      m_CreateAssetUtility:
        m_EndAction: {fileID: 0}
@@@ -807,8 -830,33 +832,33 @@@ MonoBehaviour
      m_Tooltip: 
    m_Pos:
      serializedVersion: 2
+     x: 16
+     y: 654
+     width: 1008
+     height: 357
+   m_ViewDataDictionary: {fileID: 0}
+ --- !u!114 &23
+ MonoBehaviour:
+   m_ObjectHideFlags: 52
+   m_CorrespondingSourceObject: {fileID: 0}
+   m_PrefabInstance: {fileID: 0}
+   m_PrefabAsset: {fileID: 0}
+   m_GameObject: {fileID: 0}
+   m_Enabled: 1
+   m_EditorHideFlags: 0
+   m_Script: {fileID: 12059, guid: 0000000000000000e000000000000000, type: 0}
+   m_Name: 
+   m_EditorClassIdentifier: UnityEditor:UnityEditor.Experimental.TerrainAPI:PaintTextureTool
+   m_MinSize: {x: 100, y: 100}
+   m_MaxSize: {x: 4000, y: 4000}
+   m_TitleContent:
+     m_Text: Failed to load
+     m_Image: {fileID: 0}
+     m_Tooltip: 
+   m_Pos:
+     serializedVersion: 2
      x: 0
 -    y: 0
 -    width: 320
 -    height: 550
 +    y: 644
 +    width: 999
 +    height: 357
    m_ViewDataDictionary: {fileID: 0}

diff --cc Mindgames/Library/StateCache/SceneView/42052b-mainStage.json
index 1f36367,07a96f3..cc6e41b
--- 1/Mindgames/Library/StateCache/SceneView/42052b-mainStage.json
--- 2/Mindgames/Library/StateCache/SceneView/42052b-mainStage.json
+++ b/Mindgames/Library/StateCache/SceneView/42052b-mainStage.json
@@@ -1,1 -1,1 +1,1 @@@
- {"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":694.4274291992188,"y":-2.758319854736328,"z":428.1668701171875},"rotation":{"x":-0.07563795894384384,"y":0.853330135345459,"z":-0.12923884391784669,"w":-0.49942439794540408},"size":416.05718994140627,"orthographic":false}
 -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-621.120361328125,"y":-210.20770263671876,"z":196.4742431640625},"rotation":{"x":-0.07474423199892044,"y":0.6662986874580383,"z":-0.06739392131567002,"w":-0.7388892769813538},"size":1093.1429443359375,"orthographic":false}
++{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-621.120361328125,"y":-210.20770263671876,"z":196.4742431640625},"rotation":{"x":-0.07474423199892044,"y":0.6662986874580383,"z":-0.06739392131567002,"w":-0.7388892769813538},"size":1093.1429443359375,"orthographic":false}