먼가를 고치긴 했는데 딱히 쓸만한 커밋제목이 없어서 쓰는 커밋제목

DefDabDev · Aug 19, 2017 · 962af1d · 962af1d
1 parent 7af4238
commit 962af1d
Show file tree

Hide file tree

Showing 4,305 changed files with 18,068 additions and 14,272 deletions.
diff --git a/Assets/Scene/InGame/Animation/BulletInterface_On.anim b/Assets/Scene/InGame/Animation/BulletInterface_On.anim
@@ -290,6 +290,38 @@ AnimationClip:
     path: CancelSelectBT
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: CenterImg
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: BG
+    classID: 1
+    script: {fileID: 0}
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -389,6 +421,20 @@ AnimationClip:
       typeID: 1
       customType: 0
       isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1041054376
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 1798237003
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -1085,6 +1131,38 @@ AnimationClip:
     path: CancelSelectBT
     classID: 1
     script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: CenterImg
+    classID: 1
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 2
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: BG
+    classID: 1
+    script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2

diff --git a/Assets/Scene/InGame/InGame.unity b/Assets/Scene/InGame/InGame.unity
@@ -42,7 +42,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -54,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 0
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 8
+    serializedVersion: 9
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
@@ -87,7 +87,7 @@ LightmapSettings:
     m_PVRFilteringAtrousNormalSigma: 1
     m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -226,6 +226,7 @@ LineRenderer:
     numCapVertices: 0
     alignment: 0
     textureMode: 0
+    generateLightingData: 0
   m_UseWorldSpace: 1
   m_Loop: 0
 --- !u!114 &29740680
@@ -2767,7 +2768,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &986093396
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3726,7 +3727,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1484841885
 RectTransform:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scene/InGame/Scripts/Manager/MonsterManager.cs b/Assets/Scene/InGame/Scripts/Manager/MonsterManager.cs
@@ -42,6 +42,15 @@ public class MonsterManager : MonoBehaviour
 
         void Awake()
         {
+            GameTime.timeScale = 1;
+            v_RectMonster.Clear();
+            v_PentaMonster.Clear();
+            v_HexaMonster.Clear();
+            v_RectBabyMonster.Clear();
+            v_PentaBabyMonster.Clear();
+            v_HexaBabyMonster.Clear();
+            v_Monster.Clear();
+
             v_Monster.Add(v_RectMonster);
             v_Monster.Add(v_PentaMonster);
             v_Monster.Add(v_HexaMonster);

diff --git a/Library/AssetImportState b/Library/AssetImportState
@@ -1 +1 @@
-13;537460736;2099456;0;0
+5;0;6;0;0
diff --git a/Library/AssetServerCacheV3 b/Library/AssetServerCacheV3
diff --git a/Library/AtlasCache/c0/c02e33d8db27f8105c63ede0ad5ab3fa b/Library/AtlasCache/c0/c02e33d8db27f8105c63ede0ad5ab3fa
diff --git a/Library/AtlasCache/de/ded6e59fab89d44462a86ddb9a262b13 b/Library/AtlasCache/de/ded6e59fab89d44462a86ddb9a262b13