mengchengzhen
|
c29b7a25cd
|
福利红包
|
2021-05-28 18:50:18 +08:00 |
duhui
|
f2e84cceac
|
心愿抽奖,消耗物品bug
|
2021-05-28 18:02:50 +08:00 |
duhui
|
0c8b8e5f71
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-05-28 18:02:08 +08:00 |
duhui
|
36796f01b8
|
Revert "心愿抽奖,消耗物品bug"
This reverts commit 4d5cb820e0 .
|
2021-05-28 18:01:58 +08:00 |
duhui
|
4d5cb820e0
|
心愿抽奖,消耗物品bug
|
2021-05-28 18:01:34 +08:00 |
duhui
|
df2d2bb6e6
|
福星高照刷新问题, 心愿抽奖免费抽奖次数优化
|
2021-06-02 00:01:58 +08:00 |
mengchengzhen
|
74cc8d53b6
|
福利红包
|
2021-05-28 16:59:12 +08:00 |
xuexinpeng
|
bf54d94986
|
山河社稷图一些优化
|
2021-05-28 14:41:28 +08:00 |
mengchengzhen
|
87463b9b15
|
自动封禁
|
2021-05-28 10:58:57 +08:00 |
lvxinran
|
7144d5fcd6
|
敏感词
|
2021-05-28 10:51:24 +08:00 |
duhui
|
d4dc257d0e
|
注释
|
2021-05-28 10:14:21 +08:00 |
duhui
|
a8a013ec5c
|
Merge branch 'dh_dev_activiyDraw' into master_test_gn
|
2021-05-28 10:10:59 +08:00 |
duhui
|
ce512050b3
|
Merge branch 'master_test_gn' into dh_dev_activiyDraw
|
2021-05-28 10:10:39 +08:00 |
xuexinpeng
|
c617212ba7
|
山河社稷
|
2021-05-27 23:08:20 +08:00 |
xuexinpeng
|
1f7ba67aa4
|
山河社稷
|
2021-05-31 02:17:18 +08:00 |
lvxinran
|
4e969510f5
|
Merge branch 'master_test_gn' into master_test_gn_endless
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java
|
2021-07-03 01:25:41 +08:00 |
lvxinran
|
99cd3246f2
|
无尽副本最后修改
|
2021-07-03 00:05:36 +08:00 |
lvxinran
|
de1432222f
|
无尽提交
|
2021-06-09 03:46:51 +08:00 |
lvxinran
|
dfd2bdc968
|
无尽修改第三版
|
2021-06-01 00:06:40 +08:00 |
duhui
|
ab885c392a
|
心愿抽奖,后端自测完成
|
2021-05-27 19:35:53 +08:00 |
xuexinpeng
|
fecbddb920
|
山河社稷任务
|
2021-05-27 18:24:07 +08:00 |
mengchengzhen
|
d01dcff730
|
灵兽礼包
|
2021-05-27 17:08:47 +08:00 |
duhui
|
8e37bd922c
|
牛气冲天, 活动结束发送未领取奖励
|
2021-05-27 16:10:19 +08:00 |
duhui
|
2a5d149ac6
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-05-27 16:07:17 +08:00 |
duhui
|
839eb2af4f
|
修行,名字颜色
|
2021-05-27 16:06:07 +08:00 |
mengchengzhen
|
cd49002893
|
福利红包
|
2021-05-27 15:52:33 +08:00 |
xuexinpeng
|
e1dbce80cf
|
山河社稷图排行榜
|
2021-05-27 14:48:39 +08:00 |
duhui
|
2bfb6228b0
|
牛气冲天活动结束,未发送未领取奖励问题处理
|
2021-05-27 11:48:59 +08:00 |
duhui
|
6214e3d8b8
|
修行bug处理: 附身神将分解
|
2021-05-27 10:31:11 +08:00 |
duhui
|
829bfccf16
|
修行: 系统消息添加玩家名字颜色
|
2021-05-26 18:31:33 +08:00 |
lvxinran
|
1d7e46ee36
|
玩家经验修改
|
2021-05-26 16:23:24 +08:00 |
xuexinpeng
|
62e5fac672
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-05-26 16:18:33 +08:00 |
xuexinpeng
|
945a238748
|
山河战斗记录修行等级
|
2021-05-26 16:14:49 +08:00 |
lvxinran
|
a597b3545e
|
无尽副本第二版
|
2021-05-26 16:14:29 +08:00 |
duhui
|
ee63e36511
|
修行bug处理, 编队展示错误和不入库问题处理
|
2021-05-26 16:09:10 +08:00 |
xuexinpeng
|
072001f402
|
前端战斗数据
|
2021-05-26 13:32:34 +08:00 |
xuexinpeng
|
98ee42fb6c
|
Merge branch 'master_test_mcz_hardstage' into master_test_gn
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2021-05-26 11:20:11 +08:00 |
xuexinpeng
|
202b170cd5
|
心魔试炼扫荡,一键扫荡
|
2021-05-26 11:09:58 +08:00 |
mengchengzhen
|
69462d976d
|
怪物战力计算
|
2021-05-26 10:38:31 +08:00 |
mengchengzhen
|
7da6f963ba
|
新礼包优化
|
2021-05-25 20:13:42 +08:00 |
mengchengzhen
|
f1776030ef
|
新红包优化
|
2021-05-25 20:13:30 +08:00 |
duhui
|
d1a2849a56
|
心愿抽奖初版,未联调
|
2021-05-25 18:05:56 +08:00 |
duhui
|
66d10040d3
|
Merge branch 'dh_dev_gm' into master_test_gn
(cherry picked from commit b404814382 )
|
2021-05-25 14:07:59 +08:00 |
lvxinran
|
6d76941d51
|
Merge branch 'master_test_gn' into master_test_gn_endless
|
2021-05-25 13:37:39 +08:00 |
lvxinran
|
7978510f02
|
分支合并
|
2021-05-25 11:56:06 +08:00 |
xuexinpeng
|
e74314c6c7
|
山河社稷成就任务 心魔试炼扫荡
|
2021-05-25 11:40:43 +08:00 |
duhui
|
3030bb501f
|
修行: 附身神印展示使用中全部
|
2021-05-25 11:09:25 +08:00 |
duhui
|
b404814382
|
Merge branch 'dh_dev_gm' into master_test_gn
|
2021-05-25 10:25:12 +08:00 |
xuexinpeng
|
e74a860a80
|
特权等级奖励
|
2021-05-24 18:49:46 +08:00 |
mengchengzhen
|
276f842d5c
|
福利红包
|
2021-05-24 18:28:24 +08:00 |