Merge remote-tracking branch 'origin/xjr'

# Conflicts:
#	BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab

BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs

@@ -8,16 +8,20 @@ public class PropSelectUI : MonoBehaviour
     public GameObject m_strengthObj;
     public GameObject m_doubleObj;
     public GameObject m_coinObj;
+    public GameObject m_bulletObj;
     public GameObject m_strengthSymbolObj;
     public GameObject m_doubleSymbolObj;
     public GameObject m_coinSymbolObj;
+    public GameObject m_bulletSymbolObj;
     public GameObject m_strengthMaskObj;
     public GameObject m_doubleMaskObj;
     public GameObject m_coinMaskObj;
+    public GameObject m_bulletMaskObj;
 
     public Button m_strengthButton;
     public Button m_doubleButton;
     public Button m_coinButton;
+    public Button m_bulletButton;
 
     private bool m_bIsBuyOne;
     private bool m_bIsBuyTwo;