From dbba876a044dca9b3cadf7380d3a61a597f10a5d Mon Sep 17 00:00:00 2001 From: CeHua_ZWJ <ceh@163.com> Date: 星期二, 04 十二月 2018 19:42:05 +0800 Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3 --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc | 0 db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 186 +++++++++++++++++++++++----------------------- 8 files changed, 93 insertions(+), 93 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index b4a7807..19fa819 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc index a11ba19..797a271 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearFruitAttr.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc index 108fc0b..9587397 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc index 66a786b..7d62acb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc index 95b0a98..709d4a7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc index 59114f8..cd0de25 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc index 5e363b6..ec0eb43 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt index 5265e67..4eac50a 100644 --- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt +++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt @@ -1,93 +1,93 @@ -ID FuncID MaxUseCnt RecycleExp -4181 0 500 100 -4182 0 300 100 -4183 0 20 500 -4184 0 200 100 -4185 0 20 500 -4186 0 60 100 -4187 0 15 100 -4188 0 15 100 -4189 0 1 100 -4190 0 1 100 -4191 0 1 100 -4192 0 1 100 -4699 0 1 100 -4700 0 1 100 -4701 0 1 100 -191 1 50 100 -192 1 50 100 -193 1 50 100 -194 1 60 100 -195 1 60 100 -196 1 10 100 -197 1 999 100 -198 1 300 100 -199 1 100 100 -200 1 10 500 -201 1 10 500 -204 1 1 100 -205 1 1 100 -206 1 1 100 -202 1 1 100 -203 1 1 100 -4696 1 1 100 -4697 1 1 100 -4698 1 1 100 -4702 1 1 100 -4703 1 1 100 -4704 1 1 100 -207 1 1 100 -208 1 1 100 -209 1 1 100 -4706 2 5 125 -4707 2 5 175 -4716 2 10 175 -4708 2 5 250 -4712 2 15 250 -4717 2 10 250 -4721 2 6 250 -4709 2 10 375 -4713 2 30 375 -4718 2 20 375 -4722 2 12 375 -4725 2 15 375 -4710 2 15 500 -4714 2 45 500 -4719 2 30 500 -4723 2 18 500 -4726 2 20 500 -4728 2 15 500 -4711 2 30 625 -4715 2 90 625 -4720 2 40 625 -4724 2 36 625 -4727 2 35 625 -4729 2 30 625 -4780 2 45 625 -4781 2 150 625 -4782 2 50 625 -4783 2 48 625 -4784 2 50 625 -4785 2 45 625 -4786 2 60 625 -4787 2 180 625 -4788 2 60 625 -4789 2 60 625 -4790 2 60 625 -4791 2 60 625 -4740 2 2 1000 -4730 2 2 1000 -4731 2 2 1000 -4732 2 5 1000 -4733 2 5 1000 -4742 2 5 1000 -4655 2 99 675 -4687 2 99 1250 -4688 2 99 10625 -4691 2 99 750 -4692 2 99 1375 -4660 2 50 2875 -4661 2 50 3000 -4676 2 5 10625 -4677 2 5 10625 -4741 2 50 100 +ID FuncID MaxUseCnt RecycleExp FightPowerEx +4181 0 500 100 0 +4182 0 300 100 0 +4183 0 20 500 0 +4184 0 200 100 0 +4185 0 20 500 0 +4186 0 60 100 0 +4187 0 15 100 0 +4188 0 15 100 0 +4189 0 1 100 0 +4190 0 1 100 3000 +4191 0 1 100 0 +4192 0 1 100 0 +4699 0 1 100 5000 +4700 0 1 100 0 +4701 0 1 100 0 +191 1 50 100 0 +192 1 50 100 0 +193 1 50 100 0 +194 1 60 100 0 +195 1 60 100 0 +196 1 10 100 0 +197 1 999 100 0 +198 1 300 100 0 +199 1 100 100 0 +200 1 10 500 0 +201 1 10 500 0 +204 1 1 100 0 +205 1 1 100 0 +206 1 1 100 0 +202 1 1 100 0 +203 1 1 100 1000 +4696 1 1 100 4000 +4697 1 1 100 0 +4698 1 1 100 0 +4702 1 1 100 6000 +4703 1 1 100 0 +4704 1 1 100 0 +207 1 1 100 2000 +208 1 1 100 0 +209 1 1 100 0 +4706 2 5 125 0 +4707 2 5 175 0 +4716 2 10 175 0 +4708 2 5 250 0 +4712 2 15 250 0 +4717 2 10 250 0 +4721 2 6 250 0 +4709 2 10 375 0 +4713 2 30 375 0 +4718 2 20 375 0 +4722 2 12 375 0 +4725 2 15 375 0 +4710 2 15 500 0 +4714 2 45 500 0 +4719 2 30 500 0 +4723 2 18 500 0 +4726 2 20 500 0 +4728 2 15 500 0 +4711 2 30 625 0 +4715 2 90 625 0 +4720 2 40 625 0 +4724 2 36 625 0 +4727 2 35 625 0 +4729 2 30 625 0 +4780 2 45 625 0 +4781 2 150 625 0 +4782 2 50 625 0 +4783 2 48 625 0 +4784 2 50 625 0 +4785 2 45 625 0 +4786 2 60 625 0 +4787 2 180 625 0 +4788 2 60 625 0 +4789 2 60 625 0 +4790 2 60 625 0 +4791 2 60 625 0 +4740 2 2 1000 0 +4730 2 2 1000 0 +4731 2 2 1000 0 +4732 2 5 1000 0 +4733 2 5 1000 0 +4742 2 5 1000 0 +4655 2 99 675 0 +4687 2 99 1250 0 +4688 2 99 10625 0 +4691 2 99 750 0 +4692 2 99 1375 0 +4660 2 50 2875 0 +4661 2 50 3000 0 +4676 2 5 10625 0 +4677 2 5 10625 0 +4741 2 50 100 0 -- Gitblit v1.8.0