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

---
 GemBattle/宝石塔防_Data/StreamingAssets/Table/endless_boss.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json"
index 61382b8..e8481c6 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_boss.json"
@@ -1 +1 @@
-[[1,"1_3",1,1,[]],[2,"4_7",1,1,[10001]],[3,"8_10",1,1,[10002]],[4,"11_15",1,1,[10003]]]
\ No newline at end of file
+[[1,"鲨鱼lv1",1,1,[]],[2,"鲨鱼lv2",1,1,[10001]],[3,"鲨鱼lv3",1,1,[10002]],[4,"鲨鱼lv4",1,1,[10003]],[5,"木妖lv1",1,1,[]],[6,"木妖lv2",1,1,[10001]],[7,"木妖lv3",1,1,[10002]],[8,"木妖lv4",1,1,[10003]]]
\ No newline at end of file

--
Gitblit v1.9.1