Commit Graph

962 Commits (3cf9a1dd10bd9ff7ca2a43a6f774860fd86f4a95)
 

Author SHA1 Message Date
wangyuan 3cf9a1dd10 fix 2019-06-05 17:06:08 +08:00
wangyuan f16ca67657 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 16:37:46 +08:00
wangyuan 9de7dac303 add 2019-06-05 16:34:03 +08:00
wangyuan 0b4ff12894 竞技场 2019-06-05 16:29:48 +08:00
wangyuan 3d32285959 fix抽卡次数限制 2019-06-05 15:29:15 +08:00
wangyuan c3ba340c11 fix 2019-06-05 15:25:06 +08:00
gaojie 39a340d99a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-06-05 14:37:08 +08:00
gaojie 9b10c7705b 聊天 2019-06-05 14:37:03 +08:00
wangyuan c16ce68134 data 2019-06-05 13:38:33 +08:00
wangyuan 43103c2138 取消秘盒抽取次数 2019-06-05 11:56:33 +08:00
wangyuan dafe5073cc battle 2019-06-05 11:29:24 +08:00
wangyuan 68ce55cd67 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 11:22:51 +08:00
wangyuan 0699b42f27 删除vip特权 秘盒 2019-06-05 11:22:33 +08:00
wangyuan 682d33f6cd Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 11:20:09 +08:00
wangyuan 36461a5521 fix equip 2019-06-05 11:19:56 +08:00
wangyuan 25af037afd fix 离线时间 2019-06-05 11:18:45 +08:00
wangyuan 1367a2e731 fix gm 2019-06-04 18:27:26 +08:00
wangyuan de7faf0af4 battle 2019-06-04 17:48:01 +08:00
wangyuan 60916bfbf4 fix 2019-06-04 15:53:19 +08:00
wangyuan 80d5a64bbe fix data 2019-06-04 15:27:07 +08:00
wangyuan 1d5a206c2c fix 2019-06-04 14:40:33 +08:00
wangyuan e354951bf7 充值活动 2019-06-04 10:12:11 +08:00
wangyuan c70d69a187 fix 2019-06-04 10:07:06 +08:00
wangyuan 70e8b3c16b fix 2019-06-03 20:00:53 +08:00
wangyuan 90de216e64 关卡数据 2019-06-03 17:26:20 +08:00
wangyuan 454ec22a61 容错 2019-06-03 17:19:31 +08:00
wangyuan 73dcc75efd boss刷新时间 2019-06-03 14:43:43 +08:00
wangyuan 5429baf7a3 luafight打印日志 2019-06-03 13:43:32 +08:00
wangyuan 3069ff56e1 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-05 10:47:28 +08:00
wangyuan 453b0f58ad 修复扣除道具为0情况 2019-06-05 10:47:15 +08:00
wangyuan 41c2435f5f fix item 2019-06-05 10:25:55 +08:00
wangyuan 7f0b05baec force 2019-06-02 18:47:34 +08:00
jiahuiwen f48f51cc61 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-31 18:24:22 +08:00
wangyuan 72d2caef50 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-02 17:35:35 +08:00
wangyuan e7a38b5243 fix 2019-06-02 17:35:19 +08:00
wangyuan dfa25dc50e vip mission 2019-06-02 17:30:17 +08:00
wangyuan 3b6c11b70f vip mission 2019-06-02 17:23:56 +08:00
jiahuiwen 2897ad08ba 类型10 特殊处理 2019-05-31 18:24:09 +08:00
jiahuiwen 93239139c1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-31 17:30:55 +08:00
jiahuiwen b229e02637 行为10 支持 快速战斗 2019-05-31 17:30:41 +08:00
jiahuiwen e4c1867bae 参数 2019-05-31 17:01:05 +08:00
jiahuiwen 124272a244 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-05-31 16:58:46 +08:00
wangyuan 77f1968fba function control 2019-06-02 16:39:14 +08:00
wangyuan d9e33c228a data 2019-06-02 16:19:12 +08:00
wangyuan e0237b7a93 门票校验 2019-06-02 16:16:04 +08:00
wangyuan 5afccd1843 data 2019-06-02 15:25:21 +08:00
wangyuan 6eee4f5688 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-06-02 15:23:42 +08:00
wangyuan 5d699a9770 fix bug 2019-06-02 15:23:25 +08:00
wangyuan 562ccc2913 item 2019-06-02 15:22:09 +08:00
jiahuiwen d2107490de 增加新行为 10 2019-05-31 16:58:40 +08:00