mengchengzhen
|
74cc8d53b6
|
福利红包
|
2021-05-28 16:59:12 +08:00 |
duhui
|
df2d2bb6e6
|
福星高照刷新问题, 心愿抽奖免费抽奖次数优化
|
2021-06-02 00:01:58 +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
|
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
|
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 |
xuexinpeng
|
3811d59299
|
山河社稷gm
|
2021-05-24 15:33:48 +08:00 |
duhui
|
96a3844ccc
|
gm公会,信息不入库处理
|
2021-05-24 15:18:04 +08:00 |
mengchengzhen
|
afda78f8e0
|
灵兽礼包
|
2021-05-24 14:38:22 +08:00 |
mengchengzhen
|
e5c6a1723a
|
福利红包
|
2021-05-24 12:01:34 +08:00 |
mengchengzhen
|
2010a1a9ce
|
Merge branch 'master_test_mcz_redpacket' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2021-05-24 11:43:44 +08:00 |
xuexinpeng
|
c3034285d4
|
Merge branch 'master_test_mcz_hardstage' into master_test_gn
|
2021-05-24 11:10:47 +08:00 |
xuexinpeng
|
fe38e14a1c
|
Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
|
2021-05-24 11:06:17 +08:00 |
lvxinran
|
24e773aad9
|
无尽修改初版
|
2021-05-23 18:06:21 +08:00 |
mengchengzhen
|
4a2df26e2e
|
福利红包
|
2021-05-21 18:52:19 +08:00 |
xuexinpeng
|
30c1a61b62
|
社稷大典邮件内容修改
|
2021-05-21 18:25:03 +08:00 |
xuexinpeng
|
34cd899b6e
|
山河社稷等级限制数据初始化
|
2021-05-21 16:29:33 +08:00 |
duhui
|
9fced9ba25
|
gm.修改公会信息
|
2021-05-21 15:28:16 +08:00 |
duhui
|
eebf572d7d
|
自定义礼包码
|
2021-05-20 18:02:50 +08:00 |
xuexinpeng
|
133afbab21
|
组队类型限制
|
2021-05-20 17:08:06 +08:00 |
xuexinpeng
|
61c2b2b460
|
战斗lua脚本同步
|
2021-05-20 16:49:36 +08:00 |
xuexinpeng
|
7c7c3e6bb6
|
特权等级奖励
|
2021-05-20 15:41:33 +08:00 |
xuexinpeng
|
a0db7928bf
|
山河社稷图最小战力回放
|
2021-05-19 15:27:00 +08:00 |
mengchengzhen
|
97d32d93dd
|
福利红包
|
2021-05-19 11:18:46 +08:00 |
duhui
|
222c10252b
|
修行3.0
神印展示增加,替换神印逻辑完善
|
2021-05-19 09:35:00 +08:00 |
xuexinpeng
|
bc94b6290d
|
山河社稷图状态显示
|
2021-05-18 16:51:50 +08:00 |
xuexinpeng
|
8423d711dd
|
山河社稷图
|
2021-05-18 15:56:26 +08:00 |
xuexinpeng
|
30ebef6856
|
山河社稷图优化
|
2021-05-18 13:57:07 +08:00 |
xuexinpeng
|
9cb30eb9da
|
山河社稷图
|
2021-05-18 10:13:37 +08:00 |
lvxinran
|
78cb70af3a
|
物品数量修改
|
2021-05-17 21:09:21 +08:00 |
xuexinpeng
|
30115154eb
|
Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
|
2021-05-17 18:55:52 +08:00 |
xuexinpeng
|
bc9bb14dda
|
山河社稷技能buffer
|
2021-05-17 18:55:19 +08:00 |
duhui
|
b74e3525a7
|
修行名字颜色
|
2021-05-17 17:57:58 +08:00 |
xuexinpeng
|
c509ed8444
|
Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
|
2021-05-17 11:19:30 +08:00 |
xuexinpeng
|
41ba1e238c
|
山河社稷图
|
2021-05-17 10:28:37 +08:00 |
duhui
|
23d1b68080
|
修行2.0
|
2021-05-17 09:37:16 +08:00 |
xuexinpeng
|
e656ac4344
|
山河社稷
|
2021-05-15 17:04:02 +08:00 |
xuexinpeng
|
7e21e0df43
|
山河社稷
|
2021-05-15 15:05:11 +08:00 |
xuexinpeng
|
a8e76d24db
|
山河社稷图
|
2021-05-14 15:36:50 +08:00 |
lvxinran
|
d8e16aae9a
|
一键购买修改
|
2021-05-14 14:41:13 +08:00 |
lvxinran
|
89332f0d07
|
公会等级上限
|
2021-05-14 14:29:49 +08:00 |
lvxinran
|
442b550aa1
|
开服福利修改
|
2021-05-14 13:47:07 +08:00 |
duhui
|
b51cd010a3
|
修行功能1.0
|
2021-05-14 11:12:47 +08:00 |
lvxinran
|
c3749641b3
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-05-13 17:46:44 +08:00 |
lvxinran
|
e113ab430c
|
限时抽卡修改
|
2021-05-13 17:46:34 +08:00 |
xuexinpeng
|
972b6dde78
|
山河社稷
|
2021-05-13 17:33:19 +08:00 |
lvxinran
|
fc56f377a1
|
活动礼包刷新修改
|
2021-05-13 14:40:27 +08:00 |
xuexinpeng
|
885e0112ad
|
山河社稷
|
2021-05-13 14:39:44 +08:00 |
DESKTOP-98AVA47\Administrator
|
e7ea5f645e
|
工会副本修改
|
2021-05-13 01:33:12 +07:00 |
lvxinran
|
17e2d80685
|
邮件领取奖励上限
|
2021-05-17 21:34:40 +08:00 |
lvxinran
|
d3bcc1618f
|
限时抽卡的活动清除计数
|
2021-05-12 14:34:06 +08:00 |
mengchengzhen
|
8ab1fafc40
|
山河社稷图
|
2021-05-11 21:36:22 +08:00 |
mengchengzhen
|
f561f686e9
|
山河社稷图
|
2021-05-11 21:31:07 +08:00 |
duhui
|
1d8fea9f96
|
修行,未完成提交
|
2021-05-11 17:59:49 +08:00 |
mengchengzhen
|
ea4d1e03d6
|
山河社稷图
|
2021-05-11 16:25:00 +08:00 |
xuexinpeng
|
75e526697a
|
山河社稷更新星星事件
|
2021-05-11 15:48:59 +08:00 |
duhui
|
9457e48c5c
|
计算战力方法,部分注释旧逻辑删除,需要可回滚
|
2021-05-11 14:09:21 +08:00 |
xuexinpeng
|
e8a6617225
|
Merge branch 'master_test_mcz_hardstage' of http://60.1.1.230/backend/jieling_server into master_test_mcz_hardstage
|
2021-05-11 11:38:55 +08:00 |
xuexinpeng
|
b72978b56e
|
山河社稷图排行榜
|
2021-05-11 11:23:19 +08:00 |
mengchengzhen
|
fbceab8579
|
新礼包五星推送
|
2021-05-11 11:04:53 +08:00 |
mengchengzhen
|
3de5a18eb7
|
山河社稷图
|
2021-05-11 10:59:59 +08:00 |
mengchengzhen
|
79ffc31fa8
|
山河社稷图
|
2021-05-11 10:59:39 +08:00 |
duhui
|
9faf6cb267
|
等级
|
2021-05-10 16:30:45 +08:00 |