From 515d6439e79793dc903b249cfeb8fc2f217f2e4e Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 11 Nov 2020 18:57:47 +0800
Subject: [PATCH] Merge commit 'f2f4e1e45981bb294a5221ade7b4646cc3e29d35' into master

---
 Assets/StreamingAssets/Table/boss_skill.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/StreamingAssets/Table/boss_skill.json b/Assets/StreamingAssets/Table/boss_skill.json
index a713e81..06859f2 100644
--- a/Assets/StreamingAssets/Table/boss_skill.json
+++ b/Assets/StreamingAssets/Table/boss_skill.json
@@ -1 +1 @@
-[[10001,"泡泡炸弹",10002,15000,[3,1],[2],10001,2,[10,2]],[10002,"泡泡炸弹",10002,15000,[3,1],[2,4],10001,2,[10,2]],[10003,"泡泡炸弹",10002,15000,[3,1],[1,3,5],10001,2,[12,2]],[20001,"魔法护盾",10001,20000,[2,1],[1],10001,1,[0.3,0]],[30001,"召唤木桩",10003,20000,[3,1],[3],10001,3,[3,2.5]]]
\ No newline at end of file
+[[10001,"泡泡炸弹",10002,15000,[3,1],[3],10001,2,[10,2]],[10002,"泡泡炸弹",10002,15000,[3,1],[2,4],10001,2,[10,2]],[10003,"泡泡炸弹",10002,15000,[3,1],[1,3,5],10001,2,[12,2]],[20001,"魔法护盾",10001,20000,[2,1],[3],10001,1,[0.1,10]],[20002,"魔法护盾",10001,20000,[2,1],[2,4],10001,1,[0.2,10]],[20003,"魔法护盾",10001,20000,[2,1],[1,3,5],10001,1,[0.3,10]],[30001,"召唤木桩",10003,20000,[3,1],[3],10001,3,[2,2.5]],[30002,"召唤木桩",10003,20000,[3,1],[2,4],10001,3,[5,2.5]],[30003,"召唤木桩",10003,20000,[3,1],[1,3,5],10001,3,[8,2.5]]]
\ No newline at end of file

--
Gitblit v1.9.1