lvxinran
|
b36466de0b
|
战力实时排行榜提交、十绝阵无用代码修改、限时抽卡修改、试炼本炸弹小游戏修改、试炼本小游戏删除点、日常本战力限制去掉
|
2020-06-25 16:36:48 +08:00 |
lvxinran
|
29d97d6793
|
挂机修改提交
|
2020-06-24 20:26:44 +08:00 |
lvxinran
|
70bfdfa3d1
|
更新线程池修改
|
2020-06-24 11:06:03 +08:00 |
lvxinran
|
1fd7f1d348
|
实时战力排行榜抛事件提交
|
2020-06-25 10:52:28 +08:00 |
lvxinran
|
9153efbc62
|
挂机合成装备最大循环数修改提交
|
2020-06-25 10:51:54 +08:00 |
lvxinran
|
a7346c0837
|
森罗环境游戏等级限制加入提交
|
2020-06-25 10:51:28 +08:00 |
zhangshanxue
|
1abdf0bcb7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-23 15:35:17 +08:00 |
zhangshanxue
|
84cfe0d238
|
猎妖bug
|
2020-06-23 15:19:45 +08:00 |
zhangshanxue
|
95abc6698d
|
漏存
|
2020-06-22 20:03:11 +08:00 |
lvxinran
|
d649320af8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-22 13:40:12 +08:00 |
lvxinran
|
8d1c28db85
|
活动判空修改
|
2020-06-22 13:40:03 +08:00 |
zhangshanxue
|
73b6bdaa8a
|
猎妖之路状态推送
|
2020-06-22 10:33:00 +08:00 |
lvxinran
|
e190010e72
|
公会排名修改、抽卡必出逻辑修改
|
2020-06-19 19:29:18 +08:00 |
lvxinran
|
5de5f47e0e
|
点金金币数量修改
|
2020-06-19 18:17:23 +08:00 |
lvxinran
|
c39f041f21
|
回合数修改、活动开启判断修改
|
2020-06-19 18:06:44 +08:00 |
lvxinran
|
eb124879c8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-19 15:56:57 +08:00 |
lvxinran
|
c98c5f1741
|
抽卡宝箱修改、十绝阵回合数限制、公会技能重置修改
|
2020-06-19 15:56:51 +08:00 |
zhangshanxue
|
a10139ed30
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-19 14:06:11 +08:00 |
zhangshanxue
|
95d58e8ac2
|
gm限制
|
2020-06-19 14:05:50 +08:00 |
lvxinran
|
ae4d30761e
|
关闭旧公会战
|
2020-06-19 13:57:45 +08:00 |
lvxinran
|
f8a2ad6a32
|
抽卡修改
|
2020-06-19 13:33:19 +08:00 |
lvxinran
|
1e7bea7b90
|
Merge branch 'master' into develop
|
2020-06-19 09:49:20 +08:00 |
zhangshanxue
|
24a6f83184
|
活动状态
|
2020-06-21 02:37:16 +08:00 |
zhangshanxue
|
c92cc85695
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-21 02:21:50 +08:00 |
zhangshanxue
|
cd046d2d43
|
数据漏存和日志
|
2020-06-21 02:21:40 +08:00 |
zhangshanxue
|
f934ae4c12
|
TASK【ID1006384】【活动优化】8日登录活动奖励领取机制修改
|
2020-06-21 00:09:13 +08:00 |
lvxinran
|
af59909390
|
抽卡修改
|
2020-06-19 09:48:52 +08:00 |
lvxinran
|
06ba20787b
|
抽卡逻辑修改
|
2020-06-18 20:39:09 +08:00 |
lvxinran
|
7c0e200d18
|
装备任务获得更改
|
2020-06-18 17:04:00 +08:00 |
zhangshanxue
|
8b3cb929e2
|
猎妖之路 通关流程修改
|
2020-06-18 15:02:38 +08:00 |
zhangshanxue
|
3944abddeb
|
猎妖之路 通关流程修改
|
2020-06-18 14:54:14 +08:00 |
zhangshanxue
|
93a48fc5f7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-18 14:07:33 +08:00 |
lvxinran
|
564e0cfc12
|
森罗环境表结构修改,英雄信息添加公会技能等级
|
2020-06-26 04:49:30 +08:00 |
zhangshanxue
|
3cbf610c92
|
战斗同步
|
2020-06-19 02:19:55 +08:00 |
zhangshanxue
|
c61fb855a4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-19 02:18:39 +08:00 |
lvxinran
|
dec66f3ee5
|
bug修改,从第二位刷新时间开始算
|
2020-06-25 02:01:46 +08:00 |
lvxinran
|
a07730eec9
|
点金活动修改
|
2020-06-21 09:03:27 +08:00 |
zhangshanxue
|
c5e88c9d73
|
大闹天宫等级浮动加上配置上限
|
2020-06-19 02:10:12 +08:00 |
zhangshanxue
|
5ab554b662
|
TASK【ID1006384】【活动优化】8日登录活动奖励领取机制修改
|
2020-06-18 14:07:12 +08:00 |
lvxinran
|
bc08a7f1e5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-17 19:09:16 +08:00 |
lvxinran
|
717088c994
|
试炼游戏判空修改
|
2020-06-17 19:09:04 +08:00 |
lvxinran
|
aad4c60747
|
寻宝首次多个任务
|
2020-06-17 19:08:50 +08:00 |
zhangshanxue
|
cad5b5bc26
|
TASK【ID1006397】【活动优化】成长礼金活动邮件删除
|
2020-06-17 14:48:46 +08:00 |
zhangshanxue
|
6519567756
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-17 09:40:45 +08:00 |
zhangshanxue
|
7225ca8ab4
|
TASK 【ID1006352】【活动需求】升级礼包推送
|
2020-06-17 09:40:33 +08:00 |
lvxinran
|
fb1f04ea98
|
装备bug修改,恢复代码
|
2020-06-16 06:27:21 +08:00 |
lvxinran
|
014e56d37d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-15 18:20:16 +08:00 |
lvxinran
|
480259edf8
|
商店刷新机制修改提交
|
2020-06-15 18:20:03 +08:00 |
zhangshanxue
|
908fdb1d5b
|
猎妖之路时间和boss节点圣物取消
|
2020-06-15 16:11:15 +08:00 |
zhangshanxue
|
5264ddcb83
|
猎妖之路招募节点bug
|
2020-06-13 16:58:08 +08:00 |
zhangshanxue
|
344501791f
|
道具掉落 类型判断和返回
|
2020-06-13 16:57:06 +08:00 |
lvxinran
|
4bcac2e1d8
|
点金排行提交
|
2020-06-12 18:16:15 +08:00 |
lvxinran
|
724a3b0fb4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# tablemanager/src/main/java/config/SRechargeCommodityConfig.java
|
2020-06-12 17:08:42 +08:00 |
lvxinran
|
2670dcd04a
|
等级礼包暂时提交
|
2020-06-12 17:04:47 +08:00 |
lvxinran
|
531770178a
|
森罗环境游戏代码提交
|
2020-06-12 17:03:59 +08:00 |
zhangshanxue
|
99a2b0f0c2
|
客户端新增了一个道具类型
|
2020-06-12 16:35:22 +08:00 |
zhangshanxue
|
0e6c65163e
|
客户端新增了一个道具类型
|
2020-06-12 16:19:01 +08:00 |
zhangshanxue
|
6ad732f6f2
|
去掉远征临时装备背包
|
2020-06-12 15:37:29 +08:00 |
zhangshanxue
|
5dd612ce1a
|
奖励组拼接bug
|
2020-06-12 10:46:32 +08:00 |
zhangshanxue
|
ffee38af5b
|
内存检查工具 及内纯漏存
|
2020-06-11 15:42:18 +08:00 |
zhangshanxue
|
fd7e47ff65
|
新增消耗道具任务类型
|
2020-06-11 11:23:07 +08:00 |
zhangshanxue
|
c015b1ea18
|
属性计算 目标属性也是万分比计算 (bug多了万分比加成于同一个一级属性 只会有一个生效)
|
2020-06-11 10:55:25 +08:00 |
zhangshanxue
|
0f430e6a09
|
pvp加成没加上 因为表没配一级属性id
|
2020-06-10 18:11:30 +08:00 |
zhangshanxue
|
4fdf720e84
|
点将台任务类型更新失败
|
2020-06-10 17:50:10 +08:00 |
zhangshanxue
|
7d53e2c06e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-10 17:38:57 +08:00 |
zhangshanxue
|
4c9f8e4965
|
pvp加成没加上
|
2020-06-10 17:38:49 +08:00 |
zhangshanxue
|
df707a8d8e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-10 15:17:40 +08:00 |
zhangshanxue
|
484a6e9445
|
TASK【ID1006322】【宝箱优化】增加自选宝箱
|
2020-06-10 15:17:30 +08:00 |
lvxinran
|
88ee5cb6ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-10 14:12:34 +08:00 |
lvxinran
|
ea57ee2cf7
|
特权商城修改、点金排行榜添加
|
2020-06-10 14:12:28 +08:00 |
lvxinran
|
97782999d1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-17 10:28:17 +08:00 |
lvxinran
|
3dafe6bbad
|
公会技能重置消耗修改
|
2020-06-17 10:28:13 +08:00 |
lvxinran
|
264df27d8a
|
宝器入库修改,判空处理
|
2020-06-17 10:28:00 +08:00 |
lvxinran
|
1e56edce3a
|
试炼buff提交
|
2020-06-17 10:27:20 +08:00 |
lvxinran
|
f161ac1e08
|
车迟时间修改
|
2020-06-14 20:01:16 +08:00 |
zhangshanxue
|
5e550150ae
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-10 11:47:48 +08:00 |
zhangshanxue
|
3c5b576b0a
|
TASK【ID1006322】【宝箱优化】增加自选宝箱
|
2020-06-10 11:47:39 +08:00 |
lvxinran
|
0f21f209d4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-10 05:49:18 +08:00 |
lvxinran
|
3a1e16feb6
|
试炼本重置功能,任务提交
|
2020-06-10 05:49:14 +08:00 |
zhangshanxue
|
5e4368aa77
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-10 05:25:14 +08:00 |
lvxinran
|
18b2d6c57a
|
迷宫寻宝随机方式修改
|
2020-06-10 02:42:54 +08:00 |
lvxinran
|
96a44a023f
|
十绝阵死循环修改
|
2020-06-10 01:49:22 +08:00 |
zhangshanxue
|
761fb9901d
|
【ID1007808】【ID1007804】【ID1007810】【公会援助】公会援助报错 和猎妖之路圣物不生效
|
2020-06-09 15:43:19 +08:00 |
zhangshanxue
|
4b2c5f5373
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-08 16:57:33 +08:00 |
zhangshanxue
|
7f0313a164
|
BUG【ID1007804】【公会援助】收到的援助不领取,重启服务器就没了
|
2020-06-08 16:51:38 +08:00 |
lvxinran
|
979348dde1
|
十绝阵时间判断修改
|
2020-06-08 15:41:23 +08:00 |
zhangshanxue
|
30c54bead0
|
被动技配置bug
|
2020-06-08 15:35:47 +08:00 |
zhangshanxue
|
019c9e9db2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-08 10:51:04 +08:00 |
zhangshanxue
|
a71818e1b5
|
功能bug
|
2020-06-08 10:50:50 +08:00 |
lvxinran
|
50831bbee2
|
功能判空处理
|
2020-06-08 10:38:07 +08:00 |
zhangshanxue
|
0de940f9d0
|
功能bug
|
2020-06-08 10:30:58 +08:00 |
zhangshanxue
|
758817d5f3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-08 10:27:23 +08:00 |
zhangshanxue
|
d66bee14fc
|
时间屏蔽 被动技bug
|
2020-06-08 10:26:22 +08:00 |
lvxinran
|
ce44abc594
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-08 10:12:37 +08:00 |
lvxinran
|
b3d6343f95
|
公会添加条件提交
|
2020-06-08 10:12:33 +08:00 |
zhangshanxue
|
336ec10895
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-05 20:50:12 +08:00 |
zhangshanxue
|
27a29f771b
|
去掉注释
|
2020-06-05 20:49:15 +08:00 |
zhangshanxue
|
ff485d97c7
|
//商店刷新
|
2020-06-06 05:02:15 +08:00 |
zhangshanxue
|
6c9dfab0cc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-21 05:42:29 +08:00 |
zhangshanxue
|
c705182c02
|
bug每分钟推送道具信息
|
2020-06-21 05:42:18 +08:00 |
lvxinran
|
789afff18c
|
公会排行榜
|
2020-06-09 00:54:32 +08:00 |
lvxinran
|
f47764b1da
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-08 22:28:33 +08:00 |
lvxinran
|
2b0607a26a
|
车迟发奖bug修改,排行榜第一名bug修改
|
2020-06-08 22:28:28 +08:00 |
zhangshanxue
|
cdacaa402a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-08 16:59:12 +08:00 |
zhangshanxue
|
dc5792aa0f
|
BUG【ID1007767】【特权】迷宫寻宝未解锁,刷新迷宫寻宝任务完成
|
2020-06-08 16:59:02 +08:00 |
zhangshanxue
|
177454ffed
|
战斗修改 点金bug 猎妖之路bug
|
2020-06-08 15:00:20 +08:00 |
zhangshanxue
|
78905f7b0b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-08 11:15:49 +08:00 |
zhangshanxue
|
bd7e3f4749
|
活动类型不存在 天宫密宝逻辑待查
|
2020-06-08 11:15:40 +08:00 |
zhangshanxue
|
bc00118998
|
TASK 【ID1006339】日常任务及戒灵秘宝调整
|
2020-06-07 19:21:41 +08:00 |
zhangshanxue
|
03b5acec1d
|
Bug【ID1007757】【礼包】每日礼包不刷新 商店刷新时机不对
|
2020-06-07 16:02:46 +08:00 |
lvxinran
|
f3c36df669
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-05 20:37:04 +08:00 |
lvxinran
|
bcf043facc
|
无工会修改
|
2020-06-05 20:36:59 +08:00 |
lvxinran
|
886ac0c143
|
抽卡恢复之前逻辑
|
2020-06-05 16:49:00 +08:00 |
lvxinran
|
b2ffa3e799
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-05 15:17:43 +08:00 |
lvxinran
|
e6f8b3973d
|
排行榜优化,抽卡代码回滚
|
2020-06-05 15:17:22 +08:00 |
lvxinran
|
ecdf7cebf1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-05 10:16:15 +08:00 |
lvxinran
|
47ad4f8c1c
|
回春散逻辑提交
|
2020-06-05 10:16:09 +08:00 |
lvxinran
|
f60bca059e
|
十绝阵时间bug修改
|
2020-06-05 10:13:42 +08:00 |
zhangshanxue
|
118b2156f2
|
任务进度获取bug
|
2020-06-03 20:40:32 +08:00 |
zhangshanxue
|
a472f6c553
|
公会漏存
|
2020-06-03 19:49:56 +08:00 |
zhangshanxue
|
ea7f866fbe
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-03 17:02:38 +08:00 |
zhangshanxue
|
d28a826f38
|
新增任务类型
|
2020-06-03 17:02:26 +08:00 |
lvxinran
|
9fe73ad43e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-03 16:13:31 +08:00 |
lvxinran
|
86b864fc45
|
森罗幻境提交,部分任务添加
|
2020-06-03 16:13:26 +08:00 |
zhangshanxue
|
01e0b812e9
|
新增任务类型
|
2020-06-03 12:02:15 +08:00 |
zhangshanxue
|
4defdf8aca
|
新增任务类型
|
2020-06-03 11:12:16 +08:00 |
zhangshanxue
|
189674d9ca
|
新增任务类型
|
2020-06-03 10:25:06 +08:00 |
zhangshanxue
|
9942b4abb3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-03 09:53:13 +08:00 |
zhangshanxue
|
c98f0a985b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-05 01:05:54 +08:00 |
lvxinran
|
c012389b87
|
试炼副本福利层提交
|
2020-06-09 05:59:01 +08:00 |
lvxinran
|
7c36842867
|
签到优化提交
|
2020-06-09 05:55:56 +08:00 |
zhangshanxue
|
e553272029
|
新增任务类型 戒灵秘宝积分
|
2020-06-04 19:10:32 +08:00 |
lvxinran
|
7e239b888f
|
错误修改
|
2020-06-02 11:18:40 +08:00 |
lvxinran
|
c3eb254132
|
分支合并提交
|
2020-06-02 10:57:56 +08:00 |
lvxinran
|
173458590b
|
Merge branch 'master' into develop
|
2020-06-01 21:10:48 +08:00 |
lvxinran
|
f132000e65
|
vip商店调整
|
2020-06-01 21:09:24 +08:00 |
lvxinran
|
407a161831
|
试炼副本提交
|
2020-06-01 21:03:48 +08:00 |
zhangshanxue
|
26c1259480
|
任务系统梳理和注释
|
2020-06-01 15:26:12 +08:00 |
zhangshanxue
|
2e3a64205b
|
缺少判null
|
2020-06-01 15:19:32 +08:00 |
zhangshanxue
|
69a4ac5423
|
BUG【ID1007698】【成员】进阶弹了恭喜获得
|
2020-05-30 17:56:51 +08:00 |
zhangshanxue
|
778d1f07cf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-29 13:40:37 +08:00 |
zhangshanxue
|
32962c32d4
|
猎妖和数据库检查bug
|
2020-05-29 13:40:21 +08:00 |
wangyuan
|
41f90ab191
|
对手数据判空处理
|
2020-05-28 11:39:03 +08:00 |
zhangshanxue
|
79daca78ee
|
猎妖和数据库检查bug
|
2020-05-28 11:28:57 +08:00 |
zhangshanxue
|
5ef80fab01
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-28 19:04:31 +08:00 |
zhangshanxue
|
e20c183619
|
定期抽查数据
|
2020-05-28 18:57:30 +08:00 |
zhangshanxue
|
67930da50f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-27 19:25:07 +08:00 |
zhangshanxue
|
c5edd276e4
|
数据库对象初始化bug 点金刷新修改
|
2020-05-27 19:24:58 +08:00 |
wangyuan
|
3edf0c609f
|
抽卡保底修改多次触发保底只触发一次
|
2020-05-27 11:22:01 +08:00 |
wangyuan
|
58444ae61d
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-05-27 10:01:00 +08:00 |