浏览代码

Merge branch 'master' of http://git.dashgame.com/gsgundam/garden_client

# Conflicts:
#	Assets/Script/Editor/PostProcessor.cs
LiuQilin 8 年之前
父节点
当前提交
1e26ff4334
共有 1 个文件被更改,包括 18 次插入0 次删除
  1. 18 0
      Assets/Resource/Logo.unity

+ 18 - 0
Assets/Resource/Logo.unity

@@ -427,6 +427,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1833966245}
   - component: {fileID: 1833966244}
+  - component: {fileID: 1833966246}
   m_Layer: 0
   m_Name: ManagerGame
   m_TagString: Untagged
@@ -460,3 +461,20 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1833966246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1833966243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef3c42f14ba649d4aaf2ea3afe194ba7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Sprite: {fileID: 0}
+  Graphic: {fileID: 0}
+  TextAsset1: {fileID: 0}
+  TextAsset2: {fileID: 0}
+  Texture2D: {fileID: 0}
+  SpriteRenderer: {fileID: 0}