From 47998dc6daec5da4562ed23d51af65990e9cf3af Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 20:18:06 +0800
Subject: [PATCH] Merge commit 'f7c9c6db1c194233d15fdd848721b2d47b8dd11e' into master

---
 Assets/Scenes/Levels/Battle/Endless2D.unity |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Assets/Scenes/Levels/Battle/Endless2D.unity b/Assets/Scenes/Levels/Battle/Endless2D.unity
index bc12c76..5fed32c 100644
--- a/Assets/Scenes/Levels/Battle/Endless2D.unity
+++ b/Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -4805,6 +4805,12 @@
       propertyPath: m_Camera
       value: 
       objectReference: {fileID: 1340671930}
+    - target: {fileID: 7048995018697131114, guid: 29da21b318f42054db30c52123aa4dbf,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 243c7c03ef72a5b45bc1b772d1639260,
+        type: 3}
     - target: {fileID: 7240404797452539631, guid: 29da21b318f42054db30c52123aa4dbf,
         type: 3}
       propertyPath: Panel

--
Gitblit v1.9.1