duhui
|
726c98f3ab
|
【恢复100档首充奖励】
|
2022-05-16 15:23:21 +08:00 |
duhui
|
7ed2d5c896
|
1.添加重载开服时间gm命令功能
2.聊天信息完善
|
2022-05-10 18:37:06 +08:00 |
xuexinpeng
|
9da9ef5bb3
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-10 14:10:53 +08:00 |
xuexinpeng
|
0e4d5f5558
|
山河社稷图分页
|
2022-05-10 13:59:30 +08:00 |
xuexinpeng
|
64b06e4c89
|
山河社稷图分页 新分页新章节
|
2022-05-10 13:49:09 +08:00 |
xuexinpeng
|
357a955689
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-09 18:05:02 +08:00 |
duhui
|
e7659a1b08
|
爱玩信息上报修改
|
2022-05-07 13:31:13 +08:00 |
jiahuiwen
|
c90aeb4c89
|
宗门排行榜bug
|
2022-05-06 18:20:35 +08:00 |
xuexinpeng
|
0d13709c18
|
山河社稷图分页
|
2022-05-05 17:31:42 +08:00 |
duhui
|
9c0af37bcf
|
神印合成bug修改2
|
2022-04-29 18:05:36 +08:00 |
duhui
|
25b4abd436
|
神印合成bug修改
|
2022-04-29 15:50:16 +08:00 |
duhui
|
5bb162590f
|
爱玩上报
|
2022-04-28 17:07:27 +08:00 |
jiahuiwen
|
7f7c729752
|
公会战力排行榜先不跨服
|
2022-04-28 15:31:35 +08:00 |
duhui
|
3ecfc2b88f
|
助战,神印修改
|
2022-04-27 16:27:50 +08:00 |
duhui
|
a614979ef8
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-04-27 16:24:38 +08:00 |
duhui
|
325bb8b789
|
助战,神印
|
2022-04-27 16:24:28 +08:00 |
xuexinpeng
|
a2b9e1fe5a
|
跨服身外化身技能
|
2022-04-29 16:04:13 +08:00 |
xuexinpeng
|
d589cfc104
|
化身之力
|
2022-04-29 15:32:39 +08:00 |
xuexinpeng
|
3f138b516f
|
优化超20回合显示
|
2022-04-27 15:45:59 +08:00 |
duhui
|
b97b400182
|
队伍战力存储到mongo,优化一下
|
2022-04-26 14:39:31 +08:00 |
duhui
|
c8e8e644df
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-04-26 14:20:15 +08:00 |
duhui
|
9a8bfa15ed
|
队伍战力存储到mongo
|
2022-04-26 14:20:04 +08:00 |
jiahuiwen
|
4ebae18d07
|
优化日志
|
2022-04-26 14:12:09 +08:00 |
duhui
|
4ac1800a01
|
探索商店解锁问题
|
2022-04-26 11:03:59 +08:00 |
xuexinpeng
|
d4fec7f545
|
变身卡原有逻辑修改
|
2022-04-26 10:42:03 +08:00 |
xuexinpeng
|
a62f66c27e
|
变身卡逻辑修改
|
2022-04-25 20:23:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
d4abf2e27e
|
挑战副本精度
|
2022-04-27 19:03:20 +08:00 |
yuanshuai
|
ccbb37e20b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 18:18:44 +08:00 |
yuanshuai
|
da68cc9465
|
开天上报修改
|
2022-04-25 18:18:35 +08:00 |
xuexinpeng
|
0814ed225c
|
挑战精度问题
|
2022-04-25 18:12:36 +08:00 |
jiahuiwen
|
2518c0821d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 17:46:05 +08:00 |
xuexinpeng
|
4a083edf92
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 17:41:04 +08:00 |
xuexinpeng
|
e94cef02a9
|
挑战副本 身外化身之力
|
2022-04-25 17:39:53 +08:00 |
duhui
|
cddb0f0935
|
探索商店解锁问题
|
2022-04-25 16:48:17 +08:00 |
jiahuiwen
|
309ac36c9b
|
关闭 tapdb 充值上报
|
2022-04-25 15:40:09 +08:00 |
jiahuiwen
|
da292b31ab
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 15:36:56 +08:00 |
jiahuiwen
|
d2a4a19be9
|
上报bug
|
2022-04-25 15:36:50 +08:00 |
jiahuiwen
|
3dcfb73ec2
|
开天上报
|
2022-04-25 15:14:45 +08:00 |
duhui
|
6f069c79a9
|
屏蔽点将台心愿招募,策划表屏蔽,代码先不改了,寻仙招募活动也会用
|
2022-04-25 11:28:32 +08:00 |
jiahuiwen
|
abbad4070b
|
优化代码
|
2022-04-24 18:12:45 +08:00 |
xuexinpeng
|
c7715e7a87
|
身外化身
|
2022-04-24 18:10:34 +08:00 |
jiahuiwen
|
eef6b5ca8e
|
数数上报 改 开天上报
|
2022-04-24 18:08:08 +08:00 |
jiahuiwen
|
9d99aaaee8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-24 16:44:57 +08:00 |
jiahuiwen
|
7c806e5a27
|
找回开天上报,注释数数上报
|
2022-04-24 16:44:51 +08:00 |
xuexinpeng
|
b3d35a15a3
|
身外化身
|
2022-04-24 13:54:31 +08:00 |
xuexinpeng
|
28e4676e90
|
消耗打开
|
2022-04-22 19:18:02 +08:00 |
duhui
|
b12d63788b
|
神印功能提交,补充
|
2022-04-22 18:27:39 +08:00 |
duhui
|
6ce4c11c7d
|
神印功能提交
|
2022-04-22 18:27:17 +08:00 |
xuexinpeng
|
913af67528
|
身外化身
|
2022-04-22 17:26:59 +08:00 |
jiahuiwen
|
a45d00b522
|
还原 LogHashMap
|
2022-04-22 17:25:53 +08:00 |
xuexinpeng
|
9a73862291
|
化身之力
|
2022-04-22 11:26:52 +08:00 |
jiahuiwen
|
94c86cb370
|
Merge branch 'master_guild_cross' into master_test_gn
|
2022-04-21 18:36:06 +08:00 |
jiahuiwen
|
779647bea4
|
Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross
|
2022-04-21 18:35:26 +08:00 |
jiahuiwen
|
04d0c57a1a
|
解散公会bug
|
2022-04-21 18:35:20 +08:00 |
xuexinpeng
|
699836479c
|
身外化身
|
2022-04-21 18:08:16 +08:00 |
jiahuiwen
|
9a48f5e62f
|
Merge branch 'master_test_gn' into master_guild_cross
|
2022-04-21 16:55:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
2ceaa10726
|
四灵试炼次数问题
|
2022-05-30 01:03:23 +08:00 |
duhui
|
695de90a50
|
四灵试炼次数修改
|
2022-04-21 15:44:54 +08:00 |
jiahuiwen
|
1e9dc84c64
|
车迟斗法退公会 删个人排行榜
|
2022-04-21 15:31:12 +08:00 |
jiahuiwen
|
e2974bfc0d
|
跨服加公会
|
2022-04-21 14:26:52 +08:00 |
duhui
|
f86f4e5676
|
四灵试炼开启天数管理
|
2022-04-21 14:06:25 +08:00 |
duhui
|
232fc4efeb
|
开服就跨服分组
|
2022-04-21 13:18:12 +08:00 |
jiahuiwen
|
9e754d5a2f
|
计算车迟挑战人数
|
2022-04-21 11:41:58 +08:00 |
duhui
|
665b993e21
|
开服就跨服分组
|
2022-04-21 11:35:05 +08:00 |
duhui
|
b58df88870
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-04-21 11:30:40 +08:00 |
xuexinpeng
|
9b38690f93
|
无尽副本类型变化
|
2022-04-23 10:34:51 +08:00 |
xuexinpeng
|
401889401c
|
森罗幻境
|
2022-04-21 18:34:29 +08:00 |
xuexinpeng
|
b64879f4b2
|
挑战副本 幻境达人 计数
|
2022-04-21 17:54:48 +08:00 |
duhui
|
a4c7a3b74b
|
屏蔽点将台心愿招募
|
2022-04-21 11:30:09 +08:00 |
jiahuiwen
|
2cfdee74c1
|
车迟斗法退出公会删排行
|
2022-04-20 18:06:48 +08:00 |
xuexinpeng
|
ea6899e50b
|
挑战副本
|
2022-04-20 16:24:42 +08:00 |
jiahuiwen
|
176d829f61
|
Merge branch 'master_test_gn' into master_guild_cross
|
2022-04-20 15:27:39 +08:00 |
jiahuiwen
|
d32b041372
|
踢出公会
|
2022-04-20 14:45:43 +08:00 |
jiahuiwen
|
6ebbd502df
|
Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross
|
2022-04-20 14:44:19 +08:00 |
jiahuiwen
|
e634933431
|
踢出公会
|
2022-04-20 14:44:14 +08:00 |
jiahuiwen
|
6d0db1f341
|
优化跨服公会代码
|
2022-04-20 14:43:38 +08:00 |
jiahuiwen
|
d48bd0883e
|
Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross
|
2022-04-20 13:46:59 +08:00 |
jiahuiwen
|
f5d18d2575
|
公会跨服
|
2022-04-20 13:46:48 +08:00 |
jiahuiwen
|
c6997d8f1a
|
干掉 LogHashMap
|
2022-04-20 13:45:33 +08:00 |
jiahuiwen
|
f81cfe230d
|
公会援助
|
2022-04-20 11:40:17 +08:00 |
duhui
|
169d89e47a
|
关闭紫府神印功能
|
2022-04-20 11:23:49 +08:00 |
jiahuiwen
|
0ec32ba9e6
|
Merge branch 'master_jhw' of http://60.1.1.230/backend/jieling_server into master_jhw
|
2022-04-20 10:45:52 +08:00 |
jiahuiwen
|
0188b69fb5
|
注释错误代码
|
2022-04-20 10:45:38 +08:00 |
jiahuiwen
|
676f4c9c17
|
公会援助
|
2022-04-20 10:44:01 +08:00 |
jiahuiwen
|
24b50bc573
|
公会公报
|
2022-04-20 10:39:25 +08:00 |
jiahuiwen
|
143a0cd124
|
公会红包
|
2022-04-19 17:30:05 +08:00 |
jiahuiwen
|
7c2d23e460
|
公会红包
|
2022-04-19 17:22:27 +08:00 |
jiahuiwen
|
73d3c5c780
|
公会红包
|
2022-04-19 17:15:59 +08:00 |
jiahuiwen
|
318b1505eb
|
公会日志
|
2022-04-19 17:11:20 +08:00 |
jiahuiwen
|
bdf6666064
|
跨服公会
|
2022-04-19 16:05:10 +08:00 |
xuexinpeng
|
29dace7812
|
挑战副本
|
2022-04-19 15:48:58 +08:00 |
xuexinpeng
|
8564d36577
|
添加战斗结果
|
2022-04-18 18:19:06 +08:00 |
xuexinpeng
|
794fd34895
|
无尽副本判断输赢
|
2022-04-18 17:25:08 +08:00 |
xuexinpeng
|
9f00eeed00
|
挑战副本编队类型
|
2022-04-18 16:49:59 +08:00 |
jiahuiwen
|
30175a75c2
|
跨服加公会
|
2022-04-18 15:17:35 +08:00 |
duhui
|
e26b1e18ae
|
【探索玩法增加探索商店】
|
2022-04-18 15:05:46 +08:00 |
jiahuiwen
|
360e6c846d
|
Revert "跨服加公会"
This reverts commit 122d7836f7 .
|
2022-04-18 09:50:03 +08:00 |
xuexinpeng
|
9e3f87cbd0
|
规范代码
|
2022-04-15 17:06:03 +08:00 |
xuexinpeng
|
efc3368d0a
|
挑战副本
|
2022-04-15 14:52:04 +08:00 |
jiahuiwen
|
122d7836f7
|
跨服加公会
|
2022-04-15 10:37:23 +08:00 |
xuexinpeng
|
a325ba0451
|
挑战副本
|
2022-04-14 18:23:30 +08:00 |
duhui
|
df7006924b
|
爱玩信息上报
|
2022-04-12 18:03:13 +08:00 |
duhui
|
20f22de280
|
爱玩信息上报
|
2022-04-12 17:59:17 +08:00 |
duhui
|
8b655778b9
|
爱玩信息上报
|
2022-04-12 17:55:10 +08:00 |
duhui
|
1354ec8bf3
|
爱玩信息上报
|
2022-04-12 17:42:58 +08:00 |
xuexinpeng
|
deebea6ab1
|
删除注释的代码
|
2022-04-12 14:38:18 +08:00 |
xuexinpeng
|
3dab8ba9a3
|
功能注释
|
2022-04-12 10:18:12 +08:00 |
duhui
|
0399861e6b
|
协议去除无用参数
|
2022-04-11 13:06:25 +08:00 |
xuexinpeng
|
fbd3281ca6
|
探索优化
|
2022-04-08 18:29:30 +08:00 |
duhui
|
6f805a716f
|
协议去除无用参数
|
2022-04-08 10:56:41 +08:00 |
duhui
|
16a1f881dd
|
爱玩信息上报
|
2022-04-08 10:45:13 +08:00 |
jiahuiwen
|
921fbf9cc7
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-07 18:31:04 +08:00 |
jiahuiwen
|
42d5e3a6db
|
修改redis地址
|
2022-04-07 18:30:50 +08:00 |
xuexinpeng
|
814d5d6cd9
|
探索优化
|
2022-04-07 11:32:31 +08:00 |
duhui
|
77679ba892
|
家园强化修改
|
2022-04-07 11:09:30 +08:00 |
xuexinpeng
|
77a87f7ccd
|
探索优化
|
2022-04-07 10:51:34 +08:00 |
jiahuiwen
|
2bd61083e2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-06 15:43:00 +08:00 |
jiahuiwen
|
cb3ebd6372
|
玉虚论道 赋值职业
|
2022-04-06 15:42:50 +08:00 |
duhui
|
26d5114213
|
rpc链接socket设置超时时间
|
2022-04-06 14:58:57 +08:00 |
jiahuiwen
|
ce712afeac
|
神魔 卸下魂宝灵宝
|
2022-04-06 14:05:03 +08:00 |
jiahuiwen
|
cc668d9147
|
神魔 卸下魂宝灵宝
|
2022-04-06 13:43:50 +08:00 |
jiahuiwen
|
6b81fc069a
|
玉虚论道 增加职业
|
2022-04-02 16:02:42 +08:00 |
jiahuiwen
|
f945915126
|
HARD_STAGE_FIGHT_START_REQUEST 怪物职业赋值
|
2022-04-02 15:19:52 +08:00 |
jiahuiwen
|
2d2dba9374
|
神魔职业遗漏
|
2022-04-02 14:47:52 +08:00 |
yuanshuai
|
b48082bbab
|
神魔遗漏代码添加
|
2022-04-02 14:01:53 +08:00 |
duhui
|
2791d19ee0
|
【山河设计图每日玉衡龙魂丹领取调整】
|
2022-04-02 13:48:21 +08:00 |
xuexinpeng
|
f22b7b0c94
|
探索注释打开
|
2022-04-01 17:58:46 +08:00 |
yuanshuai
|
434366cdd3
|
神魔阵营转职功能bug修改
|
2022-03-31 17:16:57 +08:00 |
yuanshuai
|
38de0cae30
|
神魔bug修改
|
2022-03-31 16:35:51 +08:00 |
yuanshuai
|
4d0ff71928
|
神魔遗漏代码
|
2022-03-31 15:07:08 +08:00 |
yuanshuai
|
a991708d8e
|
Merge branch 'master_test_gn' into master_test_gn_GodDevil
|
2022-03-31 09:59:58 +08:00 |
xuexinpeng
|
cb85945e06
|
功能注释
|
2022-03-29 11:27:44 +08:00 |
duhui
|
257205b847
|
车迟斗法挑战人数问题处理,修改完善2
|
2022-03-29 11:23:22 +08:00 |
duhui
|
c2bd8a261a
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-03-29 11:21:36 +08:00 |
duhui
|
8aeef0695d
|
车迟斗法挑战人数问题处理,修改完善
|
2022-03-29 11:21:22 +08:00 |
xuexinpeng
|
59f4fa0077
|
注释探索功能
|
2022-03-29 11:16:45 +08:00 |
duhui
|
eb8327464a
|
车迟斗法挑战人数问题处理,补充
|
2022-03-29 10:52:44 +08:00 |
duhui
|
b0918e4071
|
车迟斗法挑战人数问题处理
|
2022-03-29 10:51:10 +08:00 |
duhui
|
fe4e985187
|
【车迟斗法调整为开服7日后开启】
|
2022-04-20 14:10:06 +08:00 |
jiahuiwen
|
02134b84c8
|
战力前后端不一致 bug
|
2022-03-29 10:10:06 +08:00 |
yuanshuai
|
18c2ef0b7b
|
Merge branch 'master_test_gn' into master_test_gn_GodDevil
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
|
2022-03-25 18:15:15 +08:00 |
yuanshuai
|
cb1558f309
|
脚本修改提交
|
2022-03-25 18:12:26 +08:00 |
yuanshuai
|
a53c1d8f97
|
新增字段赋值
|
2022-03-25 16:55:00 +08:00 |
yuanshuai
|
9bbcb33469
|
脚本修改提交
|
2022-03-25 16:14:06 +08:00 |
xuexinpeng
|
d2c5355948
|
探索事件
|
2022-03-25 10:17:27 +08:00 |
xuexinpeng
|
d3da540689
|
探索事件
|
2022-03-24 13:39:39 +08:00 |
xuexinpeng
|
73ad9d7c4c
|
探索事件
|
2022-03-24 10:47:39 +08:00 |
xuexinpeng
|
3bc2c1df69
|
探索事件
|
2022-03-23 16:08:10 +08:00 |
xuexinpeng
|
86a91c0c2a
|
探索事件
|
2022-03-23 13:47:18 +08:00 |
xuexinpeng
|
c15ab64462
|
探索事件
|
2022-03-22 17:20:23 +08:00 |
duhui
|
b64c22c7a9
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-03-22 10:23:08 +08:00 |
duhui
|
8e1795eb33
|
东海寻仙,活动报错处理
|
2022-03-22 10:21:52 +08:00 |
yuanshuai
|
e29efe8a19
|
修行技能战力加成脚本提交
|
2022-03-21 17:38:05 +08:00 |
duhui
|
9095583374
|
备用任务类型
|
2022-03-21 16:57:37 +08:00 |
xuexinpeng
|
293e9869b4
|
探索事件
|
2022-03-21 16:33:26 +08:00 |
yuanshuai
|
cc06e2f19b
|
新增神魔转职功能相关修改
|
2022-03-21 15:03:40 +08:00 |
duhui
|
204c7e9d0c
|
东海寻仙活动:bug修改
|
2022-03-21 10:21:08 +08:00 |
yuanshuai
|
dc0c9819bd
|
神魔阵营功能脚本提交
|
2022-03-18 16:45:25 +08:00 |
xuexinpeng
|
738ef9c1e2
|
探索事件
|
2022-03-18 11:50:59 +08:00 |
duhui
|
f588bc7c36
|
东海寻仙活动:bug修改
|
2022-03-17 16:01:22 +08:00 |
yuanshuai
|
87680c4a56
|
主角被动技能bug修改(修复前后端战斗不一致)
|
2022-03-17 14:30:47 +08:00 |
duhui
|
f7848be28d
|
东海寻仙活动:初版未测试
|
2022-03-16 14:35:28 +08:00 |
yuanshuai
|
927cbee86c
|
主角被动技能bug修改
|
2022-03-16 13:40:15 +08:00 |
yuanshuai
|
822aea186f
|
主角技能改被动技能代码修改提交
|
2022-03-11 17:13:54 +08:00 |
duhui
|
3e10197728
|
车迟斗法公会人数问题处理
|
2022-03-11 15:25:04 +08:00 |
duhui
|
7f4f430602
|
车迟斗法积分超过int上限问题处理3
|
2022-03-11 13:25:04 +08:00 |
duhui
|
2769559f0c
|
车迟斗法积分超过int上限问题处理2
|
2022-03-10 18:30:50 +08:00 |
duhui
|
2f4fcd21cc
|
车迟斗法积分超过int上限问题处理
|
2022-03-10 18:22:03 +08:00 |
duhui
|
66580a4055
|
网页支付特殊处理刷新时间单位问题处理
|
2022-03-10 18:04:53 +08:00 |
duhui
|
97598cb7a8
|
跨服排行榜刷新时间单位问题处理
|
2022-03-10 17:53:44 +08:00 |
duhui
|
71b403e608
|
车迟斗法积分显示和排行榜转圈优化
|
2022-03-10 11:00:53 +08:00 |
duhui
|
aa24961454
|
车迟斗法,公会人数问题处理
|
2022-03-08 18:25:06 +08:00 |
xuexinpeng
|
fe1f6b59d8
|
rpc活动数据报错
|
2022-03-08 17:02:18 +08:00 |
duhui
|
b01fa4c67f
|
rpc,活动数据报错问题处理
|
2022-03-08 16:58:40 +08:00 |
xuexinpeng
|
9ccb9e12da
|
活动结束未领奖励发邮件
|
2022-03-09 22:25:09 +08:00 |
xuexinpeng
|
ba4f2e87bb
|
达标任务在活动结束后的展示阶段也不能完成
|
2022-03-07 15:15:44 +08:00 |
xuexinpeng
|
160a26e109
|
达标任务在活动结束后的展示阶段也不能完成
|
2022-03-10 21:39:30 +08:00 |
duhui
|
ea003bf9ce
|
【车迟斗法改为跨服玩法】挑战记录显示问题
|
2022-03-04 17:56:32 +08:00 |
duhui
|
1ca7f410b3
|
【车迟斗法改为跨服玩法】公会名无法显示问题
|
2022-03-04 14:37:33 +08:00 |
duhui
|
fa9d396051
|
【车迟斗法改为跨服玩法】跨服战斗报错,和无积分问题
|
2022-03-04 13:31:35 +08:00 |
duhui
|
95da9033b8
|
车迟斗法改为跨服玩法,清除上期数据
|
2022-03-04 11:25:54 +08:00 |
duhui
|
f42013ba08
|
车迟斗法改为跨服玩法,优化
|
2022-03-03 18:27:22 +08:00 |
xuexinpeng
|
0d50b13db8
|
1.探索结束后得邮件加入你本次队伍一共击杀了多少敌人,死亡多少次
2.战力冲刺任务按钮完成状态按最高战力判断,实际领取按当前战力校验
.
|
2022-03-03 18:33:12 +08:00 |
duhui
|
8d7b7bdeb3
|
车迟斗法改为跨服玩法
|
2022-03-05 15:39:20 +08:00 |
jiahuiwen
|
85b48640cd
|
删除无用代码
|
2022-03-03 11:56:43 +08:00 |
duhui
|
00b6a93c53
|
四灵试炼战斗记录从redis转移到mongodb
|
2022-03-02 13:13:06 +08:00 |
xuexinpeng
|
837174f0cd
|
周礼包根据不同等级推不同的礼包
|
2022-03-01 14:48:39 +08:00 |
jiahuiwen
|
74463746c4
|
减少聊天信息缓存
|
2022-03-01 13:16:09 +08:00 |
jiahuiwen
|
1dafc96c7c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-03-01 11:34:13 +08:00 |
jiahuiwen
|
6df96edad6
|
优化redis key
|
2022-03-01 11:34:01 +08:00 |
xuexinpeng
|
bb2d555e64
|
排行榜
|
2022-02-28 11:55:59 +08:00 |
xuexinpeng
|
2ada704ba3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-28 10:46:29 +08:00 |
xuexinpeng
|
cb76090d01
|
排行榜
|
2022-02-28 10:45:06 +08:00 |
jiahuiwen
|
5227b6ea0c
|
USER_LOGIN_URL 设置过期时间
|
2022-02-28 10:39:54 +08:00 |
jiahuiwen
|
186ed8f82c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-28 10:37:46 +08:00 |
jiahuiwen
|
f53ddd0d59
|
WORLD_ARENA_RRECORD 巅峰赛战斗记录设置过期时间
|
2022-02-28 10:37:35 +08:00 |
xuexinpeng
|
4c92ff6135
|
战力冲刺
|
2022-02-25 14:56:07 +08:00 |
xuexinpeng
|
4982b2c70d
|
战力冲刺邮件奖励
|
2022-02-25 14:34:58 +08:00 |
xuexinpeng
|
84d5015304
|
战力冲刺排行榜修改
|
2022-02-25 13:37:49 +08:00 |
xuexinpeng
|
4ce354caa5
|
战力冲刺排行榜调整
|
2022-02-25 11:52:23 +08:00 |
jiahuiwen
|
163a14fe36
|
修仙增加日志
|
2022-02-24 13:56:43 +08:00 |
duhui
|
e6ba9c0ac4
|
至尊降世活动提高1000档
|
2022-02-23 18:06:38 +08:00 |
duhui
|
9836cab7a7
|
补充2:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:37:00 +08:00 |
duhui
|
803280eaf0
|
补充:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:17:35 +08:00 |
duhui
|
dc0eacd113
|
跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:12:37 +08:00 |
xuexinpeng
|
900412365d
|
战力冲刺
|
2022-02-22 21:02:47 +08:00 |
duhui
|
1368922c6d
|
跨服分组改为gm上手动分组,去除自动分组
|
2022-02-21 00:11:00 +08:00 |
jiahuiwen
|
51b0872905
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-20 10:05:13 +08:00 |
jiahuiwen
|
7df22af548
|
规范日志
|
2022-02-20 10:04:18 +08:00 |
jiahuiwen
|
af4b08c3d2
|
重复购买礼包算成功
|
2022-02-20 09:37:51 +08:00 |
xuexinpeng
|
54f6e06a74
|
活动:战力冲刺
|
2022-02-18 22:57:40 +08:00 |
jiahuiwen
|
6b88e120cd
|
_oaid _imei赋值 deviceid
|
2022-02-18 16:46:27 +08:00 |
jiahuiwen
|
8f7ca009a9
|
上报增加 _androidid
|
2022-02-18 16:34:46 +08:00 |
jiahuiwen
|
df28c22959
|
上报增加默认值
|
2022-02-18 13:35:01 +08:00 |
jiahuiwen
|
980477b790
|
上报修改
|
2022-02-17 20:46:33 +08:00 |
jiahuiwen
|
f2e2835076
|
增加报送的头信息
|
2022-02-17 19:26:02 +08:00 |
jiahuiwen
|
283439f860
|
改post
|
2022-02-17 19:18:34 +08:00 |
jiahuiwen
|
a906ad4712
|
增加字段
|
2022-02-17 18:53:30 +08:00 |
jiahuiwen
|
fb94ec7526
|
金额改字符串
|
2022-02-17 18:48:36 +08:00 |
jiahuiwen
|
e9238bd713
|
openId赋值错误
|
2022-02-17 18:40:42 +08:00 |
jiahuiwen
|
f579fbf20c
|
开天上报打印参数
|
2022-02-17 18:17:55 +08:00 |
jiahuiwen
|
831722996d
|
开天上报 价格 改为 元
|
2022-02-17 18:05:36 +08:00 |
jiahuiwen
|
5ec60747ef
|
开天增加充值上报
|
2022-02-17 17:34:09 +08:00 |
yuanshuai
|
4af6f92c99
|
超值返利兼容老数据bug修改
|
2022-02-21 16:27:25 +08:00 |
yuanshuai
|
0d5a19339b
|
超值返利兼容老数据bug修改
|
2022-02-17 16:28:27 +08:00 |
duhui
|
1210a30798
|
【补充】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:43:08 +08:00 |
duhui
|
0b1295cb61
|
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:14:19 +08:00 |
jiahuiwen
|
91be761235
|
删除多余代码
|
2022-02-15 17:54:42 +08:00 |
jiahuiwen
|
e1a5cd8db8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-15 11:34:35 +08:00 |
jiahuiwen
|
802a85021e
|
神将可控制进入版本时间优化
|
2022-02-15 11:34:25 +08:00 |
duhui
|
b0a1347ddf
|
特权刷新日志添加
|
2022-02-15 10:33:03 +08:00 |
jiahuiwen
|
b4f4c43a0e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-14 17:11:01 +08:00 |
jiahuiwen
|
cc1f777372
|
神将可控制进入版本时间
|
2022-02-14 17:10:51 +08:00 |
yuanshuai
|
45d0438456
|
每日豪礼活动重新开启
|
2022-02-11 16:59:12 +08:00 |
jiahuiwen
|
9b7c9af1cc
|
大圣升星活动添加判断
|
2022-02-11 15:25:48 +08:00 |
yuanshuai
|
e2fc3f54cd
|
超值返利活动修改提交
|
2022-02-26 00:05:29 +08:00 |
xuexinpeng
|
92b7b7ee82
|
每日特惠
|
2022-02-11 11:25:49 +08:00 |
xuexinpeng
|
1ccd802b2d
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-10 16:46:56 +08:00 |
xuexinpeng
|
647882cd4e
|
注释掉每日特惠中60元七天特惠活动
|
2022-02-10 16:19:55 +08:00 |
yuanshuai
|
cafea7ce46
|
大闹天宫开战报错bug修改
|
2022-02-10 15:05:13 +08:00 |
yuanshuai
|
3544b10c47
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 15:04:05 +08:00 |
yuanshuai
|
4443ac1bf2
|
大闹天宫开战报错bug修改
|
2022-02-10 15:03:52 +08:00 |
jiahuiwen
|
63cf33f5d4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 11:28:36 +08:00 |
jiahuiwen
|
6053cf9db9
|
神将可控制进入版本时间
|
2022-02-10 11:28:33 +08:00 |
duhui
|
b3b7ce5ed7
|
日志级别调整
|
2022-02-08 18:26:13 +08:00 |
jiahuiwen
|
acb0dcb9d3
|
探索优化
|
2022-01-26 15:06:16 +08:00 |
xuexinpeng
|
36e8abdb61
|
探索相关报错
|
2022-01-26 13:44:38 +08:00 |
xuexinpeng
|
6f9a1ee82c
|
log相关
|
2022-01-25 13:43:02 +08:00 |
DESKTOP-98AVA47\Administrator
|
0c84030817
|
超值基金bug修改
|
2022-01-18 01:10:52 +08:00 |
duhui
|
b94adebdc7
|
超值基金活动修改,线上兼容2
|
2022-01-24 18:03:13 +08:00 |
duhui
|
a29f8a08c2
|
超值基金活动修改,线上兼容
|
2022-01-24 17:31:49 +08:00 |
duhui
|
121bd7924f
|
超值基金活动修改
|
2022-01-24 17:10:11 +08:00 |
jiahuiwen
|
a7c5616dbf
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-24 10:58:53 +08:00 |
duhui
|
73687ceeaa
|
新增主角时装类型
(cherry picked from commit e2c331f840 )
|
2022-01-22 14:27:54 +08:00 |
xuexinpeng
|
fe971df10d
|
探索公会重置
|
2022-01-22 11:31:16 +08:00 |
xuexinpeng
|
09efdc1b7a
|
探索退出公会重置个人数
|
2022-02-10 01:00:05 +08:00 |
xuexinpeng
|
02f41921ab
|
探索达人
|
2022-02-04 16:38:47 +08:00 |
xuexinpeng
|
9310dcfc4f
|
探索达人
|
2022-02-10 00:04:06 +08:00 |
xuexinpeng
|
85969b7acf
|
探索bug
|
2022-01-21 17:19:47 +08:00 |
yuanshuai
|
1f3fce5ece
|
战斗力不一致bug修复(总好感度属性加成导致的)
|
2022-01-20 15:17:00 +08:00 |
duhui
|
12600a3bed
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-19 17:05:44 +08:00 |
duhui
|
df9f1501c2
|
家园特权,重复购买问题解决
|
2022-01-19 17:04:52 +08:00 |
yuanshuai
|
19ab726801
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2022-01-19 16:31:10 +08:00 |
yuanshuai
|
925b06352f
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-22 11:14:33 +08:00 |
jiahuiwen
|
64fc286053
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-18 16:32:14 +08:00 |
yuanshuai
|
89152453e6
|
节日登录活动提交
|
2022-02-13 23:59:56 +08:00 |
jiahuiwen
|
2203e54375
|
优化代码
|
2022-01-18 16:31:48 +08:00 |
duhui
|
3e3e5ee1bf
|
牛气冲天任务优化
|
2022-01-18 10:06:09 +08:00 |
jiahuiwen
|
351909d5f3
|
鸿蒙阵推送
|
2022-01-18 09:56:28 +08:00 |
jiahuiwen
|
ff3c81bfbe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-17 18:59:05 +08:00 |
jiahuiwen
|
fc6bf6f613
|
家园任务bug
|
2022-01-17 18:58:56 +08:00 |
xuexinpeng
|
4bbf743013
|
断线重连探索
|
2022-01-17 18:34:22 +08:00 |
xuexinpeng
|
6bd1bb83ee
|
规范部分log
|
2022-01-17 11:16:47 +08:00 |
xuexinpeng
|
2aecb022a6
|
探索冲突
|
2022-01-15 18:46:26 +08:00 |
jiahuiwen
|
c3075fadb4
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java
|
2022-01-15 18:44:15 +08:00 |
xuexinpeng
|
eb9ed25093
|
探索报空
|
2022-01-15 18:33:19 +08:00 |
xuexinpeng
|
3a1a61171a
|
SExplore判空
|
2022-01-15 18:27:25 +08:00 |
xuexinpeng
|
315083312d
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-15 16:38:31 +08:00 |
jiahuiwen
|
ee98e74895
|
类型转换错误
|
2022-01-15 11:43:57 +08:00 |
jiahuiwen
|
cf6c9cc9ff
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-15 11:08:09 +08:00 |
jiahuiwen
|
5cecf52687
|
森罗幻境阵容bug
|
2022-01-15 11:07:23 +08:00 |
duhui
|
70d69c58b4
|
每日特惠活动
|
2022-01-15 10:09:18 +08:00 |
xuexinpeng
|
129e31c61f
|
断线重连玩家处理/log
|
2022-01-14 13:56:52 +08:00 |
xuexinpeng
|
8aa8865f42
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-14 11:41:57 +08:00 |
xuexinpeng
|
8dd658edc5
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-13 18:32:39 +08:00 |
yuanshuai
|
f5ea9a3b8c
|
天地洪炉脚本抽奖脚本完善
|
2022-01-13 15:12:29 +08:00 |
yuanshuai
|
144ea73fa0
|
代码整理
|
2022-01-12 10:15:53 +08:00 |
jiahuiwen
|
996169647e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-11 14:00:08 +08:00 |
duhui
|
f305dea91f
|
修改注释
|
2022-03-14 00:01:18 +08:00 |
jiahuiwen
|
d352dbb972
|
Merge branch 'master_test_gn' into master_test_gn_upStarHeroActiviry
|
2022-01-11 11:09:46 +08:00 |
yuanshuai
|
813ca52e63
|
英雄升星活动选择英雄限制
|
2022-01-22 16:30:21 +08:00 |
yuanshuai
|
bb15b379ea
|
升星活动脚本修改提交
|
2022-01-22 16:20:41 +08:00 |
yuanshuai
|
c532cad640
|
多提交的内容还原
|
2022-01-22 10:53:53 +08:00 |
yuanshuai
|
2594a30e6a
|
新版升星活动脚本提交
|
2022-01-20 18:36:25 +08:00 |
duhui
|
6f35e726a0
|
家园建筑gm,修改1
|
2022-01-10 18:21:28 +08:00 |
duhui
|
f0a19957b2
|
家园建筑gm
|
2022-01-10 18:18:27 +08:00 |
yuanshuai
|
69166c0950
|
天地洪炉抽卡特殊处理
|
2022-01-22 16:24:57 +08:00 |
yuanshuai
|
1367f81092
|
天地洪炉bug修改
|
2022-01-10 13:44:39 +08:00 |
yuanshuai
|
058cb045ce
|
天地洪炉bug修改提交
|
2022-01-10 13:42:45 +08:00 |
yuanshuai
|
e9b492ee5d
|
天地洪炉抽奖bug修改
|
2022-01-10 12:07:44 +08:00 |
duhui
|
c03ae4a02f
|
易经宝库gm
|
2022-01-06 18:14:26 +08:00 |
xuexinpeng
|
a7c2a5a71f
|
森罗幻境自动挂机返回掉落展示清除
|
2022-01-06 16:25:22 +08:00 |
duhui
|
718ca61a46
|
Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# tablemanager/src/main/java/config/SHomeLand.java
# tablemanager/src/main/java/config/SHomeLandLevel.java
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-06 16:15:00 +08:00 |
xuexinpeng
|
5031f7d9e8
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2022-01-06 16:08:27 +08:00 |
xuexinpeng
|
a58b5f8948
|
删除没用引用
|
2022-01-06 16:07:45 +08:00 |
duhui
|
8946f22d57
|
【法宝聚灵&跨服rpc】
1、聚灵表添加新列
2、rpc方法添加catch,简化log
|
2022-01-06 14:59:08 +08:00 |
duhui
|
c82267c4ea
|
【法宝聚灵】
1、添加总星级属性
|
2022-01-06 13:45:37 +08:00 |
duhui
|
91c2a4bf0c
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-06 11:20:07 +08:00 |
duhui
|
06bdbf2a78
|
法宝聚灵优化,添加总星级属性加成
|
2022-01-06 11:12:26 +08:00 |
xuexinpeng
|
a1fbed11b2
|
单笔充值领奖活动
|
2022-01-05 18:34:53 +08:00 |
duhui
|
0689f52cbe
|
【家园功能1.1.16】
1、建筑升级,解决特权加速时间bug2
|
2022-01-05 16:07:50 +08:00 |
duhui
|
ff205bd900
|
【家园功能1.1.15】
1、建筑升级,解决特权加速时间bug
|
2022-01-05 15:46:22 +08:00 |
duhui
|
a0de4fd484
|
【家园功能1.1.14】
1、处理装备强化逻辑bug2
|
2022-01-05 15:03:28 +08:00 |
duhui
|
1e11b909fc
|
【家园功能1.1.13】
1、处理装备强化逻辑bug
|
2022-01-05 14:28:35 +08:00 |
duhui
|
e912f389ca
|
【家园功能1.1.12】
1、代码优化,防止空指针
|
2022-01-05 13:38:55 +08:00 |
duhui
|
fb9f074c17
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-05 10:18:43 +08:00 |
duhui
|
215cc76897
|
【家园功能1.1.11】
1、装备升级优化
|
2022-01-05 10:15:17 +08:00 |
duhui
|
2707c018f0
|
【家园功能1.1.10】
1、zhuang bei sheng ji
|
2022-01-04 18:34:57 +08:00 |
duhui
|
bd9c2e002a
|
【家园功能1.1.9】
1、特权收益加成修改
|
2022-01-04 15:55:50 +08:00 |
jiahuiwen
|
567a46b4ad
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-04 14:33:01 +08:00 |
jiahuiwen
|
5e51e9c8dc
|
删除多余代码
|
2022-01-04 14:27:28 +08:00 |
duhui
|
6870645ea4
|
代码格式处理,不影响逻辑
|
2022-01-04 11:50:35 +08:00 |
duhui
|
a6595b054e
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2022-01-04 11:45:13 +08:00 |
duhui
|
e9b526e61b
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:44:43 +08:00 |
jiahuiwen
|
e4e4715543
|
竞技试炼发奖励bug
|
2022-01-04 11:44:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
29dc23ed4e
|
跨服战斗,身外化身技能
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
6074368c60
|
删除多余代码
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
925b9688c0
|
神将回退突破等级归 0
|
2022-01-04 11:44:41 +08:00 |
jiahuiwen
|
71ecc1510a
|
超值返利删除容错代码
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
454388b731
|
神将回退卸下魂印bug
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
70ce7e3446
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
812f8ac7d1
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
7642a5b5fb
|
神将回退增加上报
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
8d014c2269
|
减少玩家数据在内存时间
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
9284eb0e48
|
删除无用代码
|
2022-01-04 11:44:37 +08:00 |
yuanshuai
|
352a586ae2
|
超值返利网页支付重复购买礼包问题修改
|
2022-01-04 11:44:36 +08:00 |
yuanshuai
|
b870b9afa2
|
命石快速合成bug修改
|
2022-01-04 11:44:36 +08:00 |
jiahuiwen
|
61b3a6113e
|
逐胜商店刷新错误
|
2022-01-04 11:44:35 +08:00 |
yuanshuai
|
c8f9014741
|
命石一键合成bug修改
|
2022-01-04 11:44:34 +08:00 |
yuanshuai
|
b8de92f98c
|
添加批量删除道具GM
|
2022-01-04 11:44:12 +08:00 |
yuanshuai
|
93555c633d
|
命石快速合成脚本修改提交
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
0414793568
|
命石快速合成脚本优化
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
d17c6cdec9
|
命格脚本修改
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
2028b3cfe2
|
命格脚本优化
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
f06acc6801
|
命格脚本优化
|
2022-01-04 11:43:21 +08:00 |
yuanshuai
|
946d97a7d4
|
脚本优化
|
2022-01-04 11:43:20 +08:00 |
yuanshuai
|
4a2f7fc95e
|
整理代码
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
a66ff0d2ba
|
添加命格计算战斗力逻辑
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
487722d6ac
|
命格脚本提交
|
2022-01-04 11:43:05 +08:00 |
yuanshuai
|
a58adbbb18
|
超值返利网页支付bug修改
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
7c21b147a0
|
返还道具bug
|
2022-01-04 11:41:54 +08:00 |
xuexinpeng
|
ebae30feef
|
战斗星级
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
64f4f644de
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
30111415c0
|
补充
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
eb504fd20c
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
17242edf01
|
获取活动开启时间
|
2022-01-04 11:41:53 +08:00 |
jiahuiwen
|
6e3b1b5be9
|
升星配方调整补偿
|
2022-01-04 11:41:53 +08:00 |
duhui
|
5312fc728c
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:40:52 +08:00 |
jiahuiwen
|
458b8a8165
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-04 11:05:02 +08:00 |
jiahuiwen
|
affe194539
|
竞技试炼发奖励bug
|
2022-01-04 11:02:41 +08:00 |
xuexinpeng
|
f6ac2a88bd
|
探索时间戳进位
|
2021-12-31 17:33:31 +08:00 |
xuexinpeng
|
3b14b27161
|
探索
|
2021-12-31 14:03:07 +08:00 |
xuexinpeng
|
64df199aee
|
探索
|
2021-12-31 13:49:24 +08:00 |
duhui
|
a56918a674
|
【家园功能1.1.8】
1、装备强化增加战力修改
|
2021-12-31 13:39:41 +08:00 |
jiahuiwen
|
50d5195692
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-31 10:49:12 +08:00 |
jiahuiwen
|
ffb0488e50
|
赠送好友友情点bug
|
2021-12-31 10:49:04 +08:00 |
xuexinpeng
|
82dde4cdb8
|
森罗幻境自动挂机奖励展示
|
2021-12-31 10:36:32 +08:00 |
duhui
|
b1c4e0ba35
|
【家园功能1.1.7】
1、装备方法bug修改
|
2021-12-31 10:22:49 +08:00 |
duhui
|
3dab8bf18c
|
【家园功能1.1.6】
1、家园装备强化展示
|
2021-12-30 18:34:43 +08:00 |
xuexinpeng
|
188ea389e6
|
森罗幻境自动挂机奖励展示
|
2021-12-30 18:19:24 +08:00 |
yuanshuai
|
c3553579e2
|
新增被动技能注释
|
2021-12-30 17:40:47 +08:00 |
duhui
|
6cbd8104e7
|
云游商人,装备升级逻辑修改
|
2021-12-30 17:09:45 +08:00 |
yuanshuai
|
8ac39917af
|
牛魔王4火不生效bug修改(添加了一个被动技能)
|
2021-12-30 16:23:13 +08:00 |
duhui
|
9e433e1969
|
【家园功能1.1.5】
1、家园特权功能添加
|
2021-12-30 16:09:24 +08:00 |
duhui
|
a61999d664
|
【家园功能1.1.4(特殊)】
1、删除栖云阁一键领取代码,之后有需要可以从本次提交找回
|
2021-12-30 15:21:27 +08:00 |
duhui
|
6b139b482e
|
【家园功能1.1.3】
1、装备强化验证bug修改
|
2021-12-30 13:51:29 +08:00 |
xuexinpeng
|
16fc0ffbbb
|
离线探索
|
2021-12-30 13:34:34 +08:00 |
xuexinpeng
|
bb1bea214f
|
探索
|
2021-12-30 10:26:22 +08:00 |
xuexinpeng
|
f4f027c40c
|
探索
|
2021-12-29 18:24:24 +08:00 |
duhui
|
7c19af673d
|
【家园功能1.1.2】
1、装备强化表数据修改
|
2021-12-29 18:20:43 +08:00 |
xuexinpeng
|
35c2547c89
|
探索
|
2021-12-29 17:44:51 +08:00 |
xuexinpeng
|
b816997e38
|
探索
|
2021-12-29 19:16:02 +08:00 |
xuexinpeng
|
dae028d07f
|
探索
|
2021-12-29 19:05:13 +08:00 |
xuexinpeng
|
28e984d9e9
|
探索
|
2021-12-29 19:01:26 +08:00 |
xuexinpeng
|
4ea6f544cb
|
探索
|
2021-12-29 17:26:42 +08:00 |
duhui
|
dc71d70ad2
|
【家园功能1.1.1】
1、建筑解锁修改
|
2021-12-29 17:08:18 +08:00 |
yuanshuai
|
e8fd75b925
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2021-12-29 15:17:19 +08:00 |
duhui
|
07dfc01d30
|
【家园功能1.1.0】
1、任务功能完善
2、添加装备突破功能
3、装备强化信息添加到英雄信息
4、跨服添加家园装备强化信息
|
2021-12-29 15:12:02 +08:00 |
yuanshuai
|
455cccd059
|
飞升跑马灯脚本提交
|
2021-12-29 14:55:38 +08:00 |
xuexinpeng
|
5e811fb9aa
|
探索血量更新
|
2021-12-28 18:25:41 +08:00 |
xuexinpeng
|
eab1eb0b89
|
探索
|
2021-12-28 18:02:46 +08:00 |
duhui
|
e5fc1ea28c
|
【家园功能1.0.9】建筑升级只允许一次升级一个建筑,装备强化bug优化
|
2021-12-28 17:39:20 +08:00 |
xuexinpeng
|
705e81c629
|
探索
|
2021-12-28 16:32:49 +08:00 |
jiahuiwen
|
973c2b9ce8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-28 15:24:45 +08:00 |
jiahuiwen
|
bf85dfec3c
|
超值返利删除容错代码
|
2021-12-28 15:24:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
97bd55af89
|
跨服战斗,身外化身技能
|
2021-12-28 15:21:14 +08:00 |
yuanshuai
|
9b31eeadc9
|
飞升脚本修改提交
|
2021-12-28 15:07:39 +08:00 |
duhui
|
ee97a40004
|
【家园功能1.0.8】建筑解锁推送修改,只推送解锁的建筑
|
2021-12-28 14:59:59 +08:00 |
xuexinpeng
|
3c5f29e2e5
|
探索 测试 不扣消耗
|
2021-12-28 14:33:23 +08:00 |
ZhangBiao
|
304d1da7ef
|
[家园功能1.0.7]建筑解锁Indication修改
|
2021-12-28 11:52:54 +08:00 |
ZhangBiao
|
c7a22e0787
|
[家园功能1.0.6]建筑收益bug修改
|
2021-12-28 11:12:31 +08:00 |
xuexinpeng
|
6b07593757
|
探索
|
2021-12-27 18:36:31 +08:00 |
jiahuiwen
|
71eb51d017
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:18:57 +08:00 |
jiahuiwen
|
89f4eae73e
|
删除多余代码
|
2021-12-27 17:18:31 +08:00 |
jiahuiwen
|
313053ed5d
|
神将回退突破等级归 0
|
2021-12-27 17:17:56 +08:00 |
jiahuiwen
|
811d67c536
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:00:18 +08:00 |
duhui
|
937c740ebd
|
【家园功能1.0.5】建筑升级前置条件判断,添加长度验证
|
2021-12-27 16:56:32 +08:00 |
jiahuiwen
|
7ebd8878de
|
神将回退卸下魂印bug
|
2021-12-27 16:55:11 +08:00 |
xuexinpeng
|
87bcc6d5d7
|
探索
|
2021-12-27 16:33:32 +08:00 |
yuanshuai
|
6faac1d034
|
超值返利网页支付bug修改
|
2021-12-27 16:24:46 +08:00 |
jiahuiwen
|
ac30e70c2e
|
神将回退bug
|
2021-12-27 16:11:51 +08:00 |
jiahuiwen
|
5f04e68e3d
|
神将回退bug
|
2021-12-27 16:09:56 +08:00 |
jiahuiwen
|
9c998b86e6
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 16:01:30 +08:00 |
jiahuiwen
|
4ee0f7b5f2
|
神将回退bug
|
2021-12-27 15:57:09 +08:00 |
duhui
|
bee333690e
|
【家园功能1.0.4】无用代码删除,不影响原有逻辑
|
2021-12-27 14:57:24 +08:00 |
jiahuiwen
|
ecd017281d
|
神将回退增加上报
|
2021-12-27 14:25:21 +08:00 |
duhui
|
fed5fcf59b
|
【家园功能1.0.4】日志完善内容
|
2021-12-27 14:01:55 +08:00 |
duhui
|
ad1cf08eae
|
【家园功能1.0.3】建筑升级添加前置建筑等级验证,建筑解锁逻辑优化
|
2021-12-27 13:45:47 +08:00 |
duhui
|
4e852db95b
|
【家园功能1.0.2】生产建筑存储总上限修改,部分建筑生产无总上限,只有领取上限
|
2021-12-27 11:47:40 +08:00 |
jiahuiwen
|
b88a69ef3a
|
减少玩家数据在内存时间
|
2021-12-27 10:25:35 +08:00 |
xuexinpeng
|
8f0010b1be
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2021-12-27 10:04:54 +08:00 |
xuexinpeng
|
6a6cbaca50
|
探索
|
2021-12-27 10:02:59 +08:00 |
duhui
|
20b1c958e5
|
【家园功能1.0.1】任务优化,添加升级取消功能
|
2021-12-24 18:20:10 +08:00 |
jiahuiwen
|
c6d13b6685
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-12-24 17:52:59 +08:00 |
jiahuiwen
|
4132cd1f80
|
删除无用代码
|
2021-12-24 17:52:09 +08:00 |
duhui
|
6f3c8768bf
|
【家园功能1.0】待联调
|
2021-12-24 17:07:57 +08:00 |
jiahuiwen
|
8f47418546
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-24 13:55:10 +08:00 |
jiahuiwen
|
0602b9f003
|
逐胜商店刷新错误
|
2021-12-24 13:55:03 +08:00 |
xuexinpeng
|
b9cc3dec5f
|
探索
|
2021-12-24 11:29:51 +08:00 |
yuanshuai
|
93596965dd
|
超值返利网页支付重复购买礼包问题修改
|
2021-12-24 09:49:28 +08:00 |
yuanshuai
|
540e61d512
|
超值返利网页支付bug修改
|
2021-12-23 16:05:15 +08:00 |
yuanshuai
|
5cedfa6e4e
|
命石快速合成bug修改
|
2021-12-23 15:14:43 +08:00 |
yuanshuai
|
9b545e5eea
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
|
2021-12-23 09:53:52 +08:00 |
yuanshuai
|
4de94d16ea
|
飞升脚本提交
|
2021-12-23 09:51:48 +08:00 |
xuexinpeng
|
503ef57f57
|
探索
|
2021-12-22 18:04:05 +08:00 |
jiahuiwen
|
a9df7aa7e0
|
返还道具bug
|
2021-12-22 10:54:44 +08:00 |
xuexinpeng
|
49811877fa
|
战斗星级
|
2021-12-21 19:07:26 +08:00 |
xuexinpeng
|
e683d993d5
|
探索 战斗
|
2021-12-21 19:04:56 +08:00 |
jiahuiwen
|
90e98f6355
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2021-12-21 17:48:01 +08:00 |
xuexinpeng
|
9253e775f0
|
探索
|
2021-12-21 16:46:24 +08:00 |
xuexinpeng
|
db7dbb84c2
|
探索
|
2021-12-23 17:19:54 +08:00 |
jiahuiwen
|
d3b35d55d0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 10:50:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
8aba14dbe2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-23 19:13:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
5421882672
|
补充
|
2021-12-23 19:13:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b6f5a8e0c
|
获取活动开启时间
|
2021-12-23 19:01:57 +08:00 |
jiahuiwen
|
bd15f69616
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-21 10:50:43 +08:00 |
jiahuiwen
|
cf91ff167b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 09:55:23 +08:00 |
jiahuiwen
|
a97bca5c9b
|
升星配方调整补偿
|
2021-12-21 09:55:12 +08:00 |
yuanshuai
|
b473c1a6ca
|
旧版积天豪礼bug修改
|
2021-12-20 18:52:08 +08:00 |
xuexinpeng
|
048c240cb4
|
礼包刷新
|
2021-12-23 17:21:26 +08:00 |