Commit Graph

75 Commits (82f9aca0d0f4ae6460aa4da778345b4ee10e6637)

Author SHA1 Message Date
gaojie 359b669a1e 系统邮件 2019-01-24 14:35:59 +08:00
gaojie afe89d4879 分页请求物品 2019-01-23 16:14:26 +08:00
gaojie 771ce8de89 fix 2019-01-23 10:41:10 +08:00
gaojie deec982cb9 GM添加卡牌 2019-01-22 16:30:21 +08:00
gaojie d17f20627c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-01-22 16:02:27 +08:00
gaojie 7ab8e61bbc 道具消耗 2019-01-22 16:02:24 +08:00
wangyuan 13ec95f093 删除hero属性 2019-01-22 14:44:02 +08:00
wangyuan a937b76400 抽卡beta 2019-01-21 15:31:02 +08:00
gaojie 713ecb6902 提交 2019-01-18 15:37:44 +08:00
wangyuan 68a9e3e38e Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-01-18 12:13:12 +08:00
wangyuan 6a096f78e9 根据配置文件自动生成java文件 2019-01-18 12:12:58 +08:00
mashiyu ec8c8ca7f6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java
2019-01-18 12:08:26 +08:00
mashiyu bab9eb98a8 提交 2019-01-18 12:06:45 +08:00
gaojie 8b26c4a73f Merge branch 'master' of http://60.1.1.230/backend/jieling_server
Conflicts:
	serverlogic/src/main/java/com/ljsd/jieling/handler/GetAllItemHandler.java
2019-01-18 10:13:59 +08:00
gaojie 7fb418baf6 用户物品 2019-01-18 10:10:12 +08:00
wangyuan cbd48c5097 hero 2019-01-18 09:58:37 +08:00
mashiyu ee1defd706 提交 2019-01-17 20:50:13 +08:00
gaojie e09fea0d76 fix 2019-01-16 17:19:17 +08:00
wangyuan 1b1495939a fix 2019-01-16 16:30:41 +08:00
wangyuan ecb8d8cc51 修改测试客户端 & 修改item 2019-01-16 16:19:44 +08:00
gaojie 62b82fe8e3 fix 2019-01-15 15:55:08 +08:00
gaojie 93fb410ee9 GM添加道具 2019-01-15 15:03:28 +08:00
gaojie c675a9f768 fix 2019-01-14 18:31:26 +08:00
gaojie eb9411c58c fix 2019-01-14 18:30:39 +08:00
gaojie 69c5314ff4 生成静态表数据 2019-01-14 18:19:40 +08:00