Commit Graph

1233 Commits (2a13db9fe35c72c8fe36f9f27413e933ed8c3854)

Author SHA1 Message Date
wangyuan cf00d2c7de Merge branch 'online1.0' 2019-07-22 10:19:16 +08:00
wangyuan a142e3d3d8 fix goods 2019-07-22 10:16:47 +08:00
wangyuan 5dde031242 blood fix 2019-07-19 16:59:35 +08:00
wangyuan 3b950da80e fix conf 2019-07-19 15:46:09 +08:00
wangyuan a8104095d0 扫荡要加个精英怪信息 2019-07-19 14:53:35 +08:00
wangyuan dd612ca743 秘境奖励首次免费领取 2019-07-19 13:33:41 +08:00
wangyuan c70999553a fix activity 2019-07-18 19:17:36 +08:00
wangyuan d9f193c552 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
2019-07-18 19:06:35 +08:00
wangyuan 416f0153b4 gift & battle 2019-07-18 19:04:04 +08:00
lvxinran 35cacefab0 修改 2019-07-18 18:43:15 +08:00
lvxinran 124b7b5e0f 头像框修改、初始化提交 2019-07-18 17:46:17 +08:00
lvxinran a25dc800dc 元素类提交 2019-07-18 12:13:19 +08:00
lvxinran f0e926a3f9 精英本功绩修改,元素共鸣代码提交 2019-07-17 20:15:48 +08:00
wangyuan bed7997dcc Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-17 15:15:41 +08:00
wangyuan eab4d85aa3 礼包 & 血战 2019-07-17 15:15:29 +08:00
lvxinran a4bc032cf2 试炼层级奖励领取 2019-07-17 10:21:11 +08:00
lvxinran 8381fd8008 装备图鉴 2019-07-17 10:14:03 +08:00
wangyuan 07ddd2c06a skip fight snap 2019-07-16 20:24:33 +08:00
wangyuan 885bdebaff match & drop hero per 2019-07-16 18:31:32 +08:00
lvxinran 195535617e 商店修改、表格结构修改 2019-07-16 18:07:23 +08:00
lvxinran bbf6b94cba 功绩类新添加、图鉴添加 2019-07-16 17:39:34 +08:00
wangyuan eaa9ffcd43 血战 2019-07-16 15:21:13 +08:00
wangyuan 96bf0a392e Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-16 13:40:17 +08:00
wangyuan 63e131e40f 云游商店 2019-07-16 13:40:05 +08:00
lvxinran aa5d85b68a 战斗逻辑错误修改 2019-07-16 11:26:54 +08:00
wangyuan 63d3168ffa 抽卡送宝箱 2019-07-16 10:58:11 +08:00
wangyuan 405da77bb0 根据数组索引就行随机 2019-07-15 17:41:36 +08:00
wangyuan 28914e672c fix 7 2019-07-15 17:29:51 +08:00
lvxinran 89affcf6c1 位置修改 2019-07-15 17:20:05 +08:00
gaojie 63a9dcbf5e fix 2019-07-15 16:59:48 +08:00
lvxinran c919681cc2 无关注释删除 2019-07-15 16:37:43 +08:00
lvxinran 8e727965dd 精英本扫荡 2019-07-15 16:34:26 +08:00
wangyuan bbbd5d2344 Merge branch 'online1.0' 2019-07-15 15:16:45 +08:00
wangyuan 36b1071efc 行为类型7 2019-07-15 14:35:38 +08:00
wangyuan 534886c920 Merge branch 'online1.0' 2019-07-15 11:00:49 +08:00
wangyuan fb2b2ff379 修改计算 2019-07-15 10:41:36 +08:00
lvxinran 4dfc832ca2 Merge branch 'online1.0' 2019-07-12 18:26:07 +08:00
gaojie 6add54c66b 好友推送状态 2019-07-12 17:29:49 +08:00
gaojie 55c7f19b45 Merge branch 'online1.0' of http://60.1.1.230/backend/jieling_server into online1.0 2019-07-12 16:54:31 +08:00
gaojie 934185db65 删除好友保留之前赠送体力状态 2019-07-12 16:54:27 +08:00
gaojie d73d77c28e 好友赠送体力 2019-07-13 11:56:36 +08:00
wangyuan 956e689396 mission 2019-07-12 16:48:38 +08:00
lvxinran 84654cb0fd Merge branch 'online1.0' 2019-07-12 14:45:56 +08:00
wangyuan 242be06ec4 fix daily mission 2019-07-12 14:44:31 +08:00
lvxinran 6fb6390d60 随机数修改 2019-07-12 13:33:56 +08:00
lvxinran 24eca20b07 功绩事件类型添加 2019-07-12 11:21:33 +08:00
lvxinran 98e2309523 装备特性随机提交 2019-07-12 10:19:23 +08:00
lvxinran 3b2ebae2c5 试炼最高层处理 2019-07-11 17:12:11 +08:00
wangyuan e88a8fd3b5 thread 2019-07-15 16:50:54 +08:00
lvxinran 1e572b1142 日志修改 2019-07-11 15:14:46 +08:00