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_enemy.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_enemy.json" "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_enemy.json"
index 0f4b520..41a760f 100644
--- "a/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_enemy.json"
+++ "b/GemBattle/\345\256\235\347\237\263\345\241\224\351\230\262_Data/StreamingAssets/Table/endless_enemy.json"
@@ -1 +1 @@
-[[1,"小怪_火",1,1.1,1.8,1,101],[2,"小怪_水",1,5,1,3,102],[3,"小怪_木",1,0.8,1.2,1,103]]
\ No newline at end of file
+[[1,"小怪_火",1,1.1,1.8,1,101,10],[2,"小怪_水",1,5,1,3,102,20],[3,"小怪_木",1,0.8,1.2,1,103,5]]
\ No newline at end of file

--
Gitblit v1.9.1