Commit Graph

1833 Commits (264540e796bdf9acbc740510a1c8027784e647f0)
 

Author SHA1 Message Date
wangyuan c1d9f8fdb0 fix 2019-07-24 14:25:48 +08:00
wangyuan 9943d08dba fix hero 2019-07-24 14:24:07 +08:00
wangyuan eca6706f75 item 2019-07-24 13:52:07 +08:00
wangyuan 672b7990c3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
2019-07-24 13:47:27 +08:00
wangyuan 030e0f728e mission & store 2019-07-24 13:46:40 +08:00
lvxinran 4fe6793c59 阵营光环当前生命值修复 2019-07-24 13:42:30 +08:00
lvxinran db732001aa 44行为类型 2019-07-23 21:52:07 +08:00
lvxinran d677a1066c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-23 21:01:46 +08:00
lvxinran d5c4168295 刷新次数修改 2019-07-23 21:01:41 +08:00
wangyuan 26270ae6da Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-23 20:35:29 +08:00
wangyuan 3e6b25bb3d 孙龙的任务 2019-07-23 20:35:15 +08:00
lvxinran f96932c50a 元素共鸣报错修改 2019-07-23 18:04:16 +08:00
wangyuan 34dac1a17f Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-23 18:03:01 +08:00
wangyuan 4c12b893da mission 2019-07-23 18:00:46 +08:00
lvxinran dda168c324 云梦祈福逻辑提交 2019-07-23 17:41:48 +08:00
lvxinran ea89394c70 云梦祈福结构修改 2019-07-23 11:18:44 +08:00
wangyuan 060e554809 item fresh 2019-07-23 10:01:43 +08:00
wangyuan 4a9d1812af storelogic 2019-07-22 18:18:47 +08:00
wangyuan fbcee502b6 buy goods 2019-07-22 17:42:49 +08:00
wangyuan f814586624 recharge 2019-07-25 07:16:34 +08:00
lvxinran cfbc1eb00e 光环提交 2019-07-22 16:13:15 +08:00
lvxinran 3e70a0384c 阵营光环上线 2019-07-22 15:53:50 +08:00
lvxinran b3db193d36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-07-22 15:33:49 +08:00
wangyuan 869c9ec15c conf 2019-07-25 06:08:30 +08:00
wangyuan 36acef4ac1 conf 2019-07-25 05:45:58 +08:00
wangyuan 2e49142f07 mision 2019-07-25 05:08:59 +08:00
wangyuan c113ff4481 fix 2019-07-23 13:51:43 +08:00
lvxinran 3b386e47b5 设置teamId 2019-07-22 15:33:45 +08:00
wangyuan e90e414522 buy goods 2019-07-22 13:45:47 +08:00
wangyuan 8ba85e72fc goods 2019-07-22 11:58:41 +08:00
wangyuan f6e9d89873 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-22 11:58:17 +08:00
wangyuan 4cac791acb mail 2019-07-22 11:36:58 +08:00
lvxinran 352472345b 12点事件,头像框提交 2019-07-22 11:11:06 +08:00
wangyuan 02c41f53ed Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-07-22 10:32:34 +08:00
lvxinran 2a13db9fe3 战斗时间 2019-07-23 05:12:58 +08:00
wangyuan a5438e7e5c fix goods 2019-07-22 10:32:19 +08:00
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