Commit Graph

1058 Commits (f30caed97d7bb0b2c2c2396a6820965cd2ab1beb)
 

Author SHA1 Message Date
wangyuan f81c78a1d4 fightdata 2020-05-08 10:53:31 +08:00
wangyuan e7d245c9d8 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-07 18:02:27 +08:00
wangyuan 96fd9f5f43 车迟排序 2020-05-07 18:02:15 +08:00
zhangshanxue 5bb1ca6b9e 祭祀 2020-05-07 17:14:16 +08:00
zhangshanxue 88d9f17f20 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 16:42:38 +08:00
zhangshanxue 494ba6acbb 祭祀 2020-05-07 16:42:33 +08:00
wangyuan e247a91d6d 车轮时间 2020-05-07 16:13:22 +08:00
wangyuan 7ea1b9478c fix 2020-05-07 15:36:55 +08:00
wangyuan 284cfa6fab fix 2020-05-07 15:14:07 +08:00
wangyuan 4666c9f48f Merge branch 'master' of 60.1.1.230:backend/jieling_protocol
# Conflicts:
#	protos/Family.proto
2020-05-07 14:59:07 +08:00
wangyuan e72a9aa305 车迟玩法 2020-05-07 14:38:07 +08:00
zhangshanxue 62c9606cce Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 14:09:32 +08:00
zhangshanxue 6fc05450d3 祭祀 2020-05-07 14:09:10 +08:00
lvxinran 6be35e8116 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 14:01:27 +08:00
lvxinran ba7ebe0435 十绝阵协议号 2020-05-07 14:01:23 +08:00
zhangshanxue aad86e1794 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/Family.proto
2020-05-06 16:26:25 +08:00
zhangshanxue 548ddeeeec 祭祀 2020-05-06 16:25:38 +08:00
lvxinran 6d032dc6eb 十绝阵加入掉落 2020-05-06 16:20:09 +08:00
lvxinran 6699297335 十绝阵协议 2020-05-06 16:19:06 +08:00
lvxinran de480c5dcb 公会技能修改 2020-05-05 11:32:00 +08:00
lvxinran 2217310993 公会技能协议提交 2020-05-05 10:54:39 +08:00
wangyuan f9147f5006 hero position 2020-05-01 10:15:39 +08:00
lvxinran 09a6117269 宝器强化精炼协议 2020-04-26 16:46:53 +08:00
lvxinran 0ab1d34640 日常副本协议修改 2020-04-26 15:40:22 +08:00
lvxinran 5fce690941 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-26 14:59:46 +08:00
lvxinran ca2c652db2 宝器相关注释 2020-04-26 14:59:41 +08:00
wangyuan c49aaf01ac Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-04-26 13:58:56 +08:00
wangyuan 853bfa93f1 获取指定活动信息 2020-04-26 13:58:43 +08:00
lvxinran d431836781 战斗结果协议 2020-04-26 13:41:11 +08:00
lvxinran 3eb8dbf292 英雄身上宝器协议 2020-04-26 11:33:08 +08:00
lvxinran 65105fb39c 日常协议修改 2020-04-24 14:59:54 +08:00
lvxinran cb44c2f3cf 日常副本 协议 2020-04-24 14:12:23 +08:00
lvxinran f16efb6999 宝器协议 2020-04-24 11:04:29 +08:00
wangyuan eed27144f8 fight position 2020-04-16 14:11:44 +08:00
wangyuan f838f6e0b7 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-04-13 11:06:29 +08:00
wangyuan 87cf461653 soul merge response 2020-04-10 17:16:35 +08:00
wangyuan d749537e0a soul equip merge 2020-04-09 20:37:14 +08:00
wangyuan 3435d2f7b7 soul 2020-04-07 17:09:10 +08:00
wangyuan d771e0daaf soul 2020-04-07 14:55:44 +08:00
zhangshanxue bf6f1603bd Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-02 15:42:26 +08:00
zhangshanxue 26120b6bea Task 【ID1006033】【新战斗版本】后端装备合成系统 2020-04-02 15:42:08 +08:00
lvxinran 54adff8768 法宝协议删除,修改 2020-04-01 14:54:58 +08:00
lvxinran 1071da720c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-04-01 14:17:52 +08:00
lvxinran 037e5b9324 法宝系统修改 2020-04-01 14:17:48 +08:00
zhangshanxue 203e661dae 月卡修改 2020-03-30 18:20:46 +08:00
zhangshanxue fe09b0eb49 月卡修改 2020-03-30 16:27:17 +08:00
zhangshanxue a4de374ae0 月卡修改 2020-03-30 16:14:04 +08:00
zhangshanxue 2819a37b08 月卡修改 2020-03-30 16:02:14 +08:00
zhangshanxue 6316d19184 月卡修改 2020-03-30 15:50:53 +08:00
zhangshanxue 0ca8a426b3 月卡修改 2020-03-30 14:42:22 +08:00