From 3d3862c1a06bc5930bbd1ce414a1757871241918 Mon Sep 17 00:00:00 2001 From: CeHua_TRX <526616766@qq.com> Date: 星期二, 11 十二月 2018 15:40:55 +0800 Subject: [PATCH] 5405 神兵数值优化调整 --- db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt index 78d0619..f96f94b 100644 --- a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt +++ b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt @@ -1,22 +1,10 @@ type level notifycode fightPower attr -<<<<<<< origin/master -1 100 GetMagicEffect4 0 6_100|7_200 -1 200 GetMagicEffect5 0 6_200|7_300 -1 400 GetMagicEffect6 0 6_100|7_201 -2 100 GetMagicEffect7 0 6_200|7_301 -2 200 GetMagicEffect8 0 6_100|7_202 -2 400 GetMagicEffect9 0 6_200|7_302 -4 100 GetMagicEffect10 0 6_100|7_203 -4 200 GetMagicEffect11 0 6_200|7_303 -4 400 GetMagicEffect12 0 6_100|7_204 -======= 1 100 GetMagicEffect4 22540 7_1127 1 200 GetMagicEffect5 53800 7_2690 -1 400 GetMagicEffect6 169344.0 7_8467 +1 400 GetMagicEffect6 169344 7_8467 2 100 GetMagicEffect7 22540 26_1127 2 200 GetMagicEffect8 53800 26_2690 -2 400 GetMagicEffect9 169344.0 26_8467 +2 400 GetMagicEffect9 169344 26_8467 4 100 GetMagicEffect10 22540 27_1127 4 200 GetMagicEffect11 53800 27_2690 -4 400 GetMagicEffect12 169344.0 27_8467 ->>>>>>> local +4 400 GetMagicEffect12 169344 27_8467 -- Gitblit v1.8.0