From 85f0d13945f3aef5aef1b3c1b47c77cea0514c17 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 22 Oct 2020 16:06:50 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Prefabs/UI/BulletUI.prefab |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Assets/Prefabs/UI/BulletUI.prefab b/Assets/Prefabs/UI/BulletUI.prefab
index d690f05..10bfa0d 100644
--- a/Assets/Prefabs/UI/BulletUI.prefab
+++ b/Assets/Prefabs/UI/BulletUI.prefab
@@ -91,6 +91,7 @@
   m_EditorClassIdentifier: 
   bulletScaleMask: {fileID: 4636030447972189695}
   fAdjValue: 0.008
+  maxBulletNum: 6
 --- !u!1 &4636030447972189693
 GameObject:
   m_ObjectHideFlags: 0

--
Gitblit v1.9.1