Commit Graph

1082 Commits (1f9144ceefac65bd4a928a2d99c48b6bed96790c)
 

Author SHA1 Message Date
jiahuiwen 1f9144ceef Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 17:33:26 +08:00
jiahuiwen fa7c397e5d 领取副本星级奖励 2019-06-21 17:33:19 +08:00
gaojie 4c6485abb8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 15:07:19 +08:00
gaojie 2aa329e4d6 聊天 2019-06-21 15:07:11 +08:00
wangyuan 9c30a38abe conf 2019-06-21 14:27:08 +08:00
wangyuan 73f8598948 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-21 13:28:49 +08:00
wangyuan fb1dc92445 conf 2019-06-21 13:27:51 +08:00
jiahuiwen 02e2cff56b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-21 11:40:57 +08:00
jiahuiwen 11e377d066 行为39 2019-06-21 11:40:42 +08:00
wangyuan d0aa5e79a5 lua fight 2019-06-21 11:22:35 +08:00
wangyuan 49c5ac8bc1 conf 2019-06-21 10:34:12 +08:00
wangyuan 4fc3cd92c1 fix 2019-06-20 21:07:26 +08:00
wangyuan f1ac732b56 conf 2019-06-20 21:03:59 +08:00
jiahuiwen 4ece82248c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 19:42:21 +08:00
jiahuiwen 3d6690ccab 二维数组赋值 2019-06-20 19:42:17 +08:00
wangyuan 32480ab936 room 2019-06-20 18:17:29 +08:00
gaojie 97241f0f5b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 18:12:24 +08:00
gaojie 17d072baa2 fix 2019-06-20 18:12:09 +08:00
wangyuan 97ce706ddf 精英怪奖励 & 充值通过邮件发送道具 2019-06-20 17:26:39 +08:00
wangyuan 02d683718c s 2019-06-20 16:28:07 +08:00
wangyuan ef76a6fff9 前置节点&修改精英怪战斗结束 2019-06-20 16:26:58 +08:00
wangyuan 1046bcfb85 消耗道具 2019-06-20 16:03:26 +08:00
wangyuan 9836927645 fight 2019-06-20 15:47:36 +08:00
jiahuiwen 6433dc032f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-20 15:28:28 +08:00
wangyuan 689d3ae255 精英怪 2019-06-20 19:11:00 +08:00
jiahuiwen 17fdfbd6e4 新行为 39 战斗,推任务,生成新的事件点。15 16修改 2019-06-20 15:28:21 +08:00
wangyuan 0983abb99c fix fight key 2019-06-20 11:37:12 +08:00
wangyuan 5b1e55b61e 精英怪 2019-06-20 11:13:55 +08:00
wangyuan eb2c08c614 修复VIP错误 & 精英怪 2019-06-20 10:21:11 +08:00
wangyuan 7b38c5206c 科技树重置 2019-06-19 17:27:55 +08:00
gaojie d6c569bdf4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-19 16:49:34 +08:00
gaojie 178f56bbe5 fix 2019-06-19 16:49:16 +08:00
wangyuan 0913f47f9a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-19 16:43:27 +08:00
wangyuan 8ec551cfc4 battle 2019-06-19 16:43:02 +08:00
gaojie da43de4742 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-19 15:47:23 +08:00
gaojie b156df6fb0 聊天 2019-06-19 15:47:19 +08:00
wangyuan 72bbe0d046 跑马灯 & 工坊科技树 2019-06-19 14:48:51 +08:00
wangyuan aeba5f5237 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-19 12:34:41 +08:00
wangyuan 04f439579e 工坊科技树升级 2019-06-19 12:34:19 +08:00
gaojie 2f2d597546 获得卡牌跑马灯 2019-06-18 20:24:57 +08:00
gaojie 58e335b60e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-18 20:06:40 +08:00
gaojie 359c250098 跑马灯 2019-06-18 20:06:37 +08:00
lvxinran 011d2dba36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-18 15:45:53 +08:00
lvxinran 396c8be30c 工坊升级材料方式 2019-06-18 15:45:12 +08:00
gaojie c1c3b15fc9 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-18 14:44:58 +08:00
gaojie b621f90eb9 系统消息 2019-06-18 14:44:53 +08:00
wangyuan 5f2d97cd7a fix 2019-06-18 11:50:37 +08:00
wangyuan aeb701dc14 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-18 11:33:42 +08:00
wangyuan 6513469c64 修复天赋 & match 2019-06-18 11:33:21 +08:00
gaojie 13c81629c6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java
2019-06-18 11:06:23 +08:00