Merge remote-tracking branch 'origin/master_mapDev'

Assets/Scripts/Game/Component/SceneProp/GreenProp.cs

@@ -48,8 +48,10 @@ namespace Game.Component.SceneProp
 
         public void OnTriggerEnterAction (Collider2D other)
         {
+            
             if (other.gameObject.CompareTag ("Enemy"))
             {
+                
                 var entity = other.gameObject.GetComponent<EnemyEntity> ();
                 OnSubEnemySpeed (entity , this._buffSpeedOffset , this._buffDuration);
             }

Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat

@@ -46,7 +46,7 @@ Material:
     m_Ints: []
     m_Floats:
     - Vector1_c9f2135c9d254951b22c018d295f8558: 0.003
-    - _blurOffset: 0.35
+    - _blurOffset: 0.013190931
     m_Colors: []
   m_BuildTextureStacks: []
 --- !u!114 &268278646524644520