zhangshanxue
|
d74dbde124
|
幸运转盘抽奖限制
|
2020-07-18 21:03:54 +08:00 |
lvxinran
|
deb08dbaf7
|
战斗 表增加列
|
2020-07-14 17:24:41 +08:00 |
lvxinran
|
3d68803fd1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-14 17:09:44 +08:00 |
lvxinran
|
a3682f79ca
|
被动技能129类型添加
|
2020-07-14 17:09:39 +08:00 |
zhangshanxue
|
edd814a97d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-14 15:40:16 +08:00 |
zhangshanxue
|
e3d2812944
|
keyset 删除原有集合
|
2020-07-14 15:40:04 +08:00 |
zhangshanxue
|
c8a9c873c9
|
添加公会经验
|
2020-07-17 21:28:26 +08:00 |
lvxinran
|
f999e84929
|
数据上报异步处理
|
2020-07-14 14:21:28 +08:00 |
lvxinran
|
a8a46da07b
|
英雄归元,被动技能战力增加
|
2020-07-13 18:31:42 +08:00 |
lvxinran
|
3a8d9cc527
|
数据基础类提交
|
2020-07-13 17:20:41 +08:00 |
lvxinran
|
50bc669250
|
归元修改,打点修改
|
2020-07-13 17:20:27 +08:00 |
lvxinran
|
a15ae6e4bb
|
登录信息添加
|
2020-07-13 16:14:06 +08:00 |
lvxinran
|
da8d764a75
|
抽卡活动修改,部分打点类型修改
|
2020-07-13 14:30:47 +08:00 |
lvxinran
|
cefd6ba749
|
日志关联配置文件
|
2020-07-10 11:43:09 +08:00 |
lvxinran
|
db63d5f3ae
|
数据上报
|
2020-07-09 20:21:51 +08:00 |
lvxinran
|
1c5f015c33
|
数据上报 提交
|
2020-07-09 14:50:53 +08:00 |
zhangshanxue
|
2498e48c1a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server into dev_champion
|
2020-07-08 19:27:40 +08:00 |
zhangshanxue
|
9aef38cdc7
|
下线清除
|
2020-07-08 19:27:13 +08:00 |
lvxinran
|
0854536e34
|
数据上报 ,限时抽卡活动修改
|
2020-07-08 15:21:19 +08:00 |
lvxinran
|
558c784472
|
穿戴宝器修改
|
2020-07-08 10:15:09 +08:00 |
lvxinran
|
ef04e7f413
|
数据对接相关
|
2020-07-08 10:14:50 +08:00 |
lvxinran
|
ac75b947d8
|
Merge branch 'master' into equip_develop
|
2020-07-07 22:01:49 +08:00 |
zhangshanxue
|
33c1de80b8
|
生成英雄bug
|
2020-07-07 23:57:15 +08:00 |
lvxinran
|
bb70007bbc
|
远征装备修改
|
2020-07-07 22:01:19 +08:00 |
lvxinran
|
7acbce59c5
|
Merge branch 'master' into equip_develop
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2020-07-07 19:01:08 +08:00 |
zhangshanxue
|
5043f26ac6
|
TASK【ID1008168】【大闹天宫】招募神将的等级,跟文档描述的不一样
|
2020-07-06 20:43:10 +08:00 |
zhangshanxue
|
8253bdcc6a
|
打点配置
|
2020-07-06 18:13:57 +08:00 |
lvxinran
|
4109833298
|
装备优化修改
|
2020-07-06 18:08:37 +08:00 |
lvxinran
|
3934507fe8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-05 05:56:07 +08:00 |
lvxinran
|
217713bbdb
|
副本修改
|
2020-07-05 05:56:01 +08:00 |
zhangshanxue
|
4459f03ce0
|
【ID1008162】挂机奖励bug
|
2020-07-04 22:54:40 +08:00 |
zhangshanxue
|
61d614eaff
|
五星成长礼bug
|
2020-07-04 22:17:32 +08:00 |
lvxinran
|
db72cde86e
|
商店免费刷新次数注册添加
|
2020-07-04 06:19:05 +08:00 |
lvxinran
|
21b5709798
|
副本buff机制修改
|
2020-07-04 06:18:45 +08:00 |
lvxinran
|
c715f31468
|
英雄穿装备错误校验删除
|
2020-07-04 06:18:21 +08:00 |
lvxinran
|
0d0acca185
|
日常本战力校验添加
|
2020-07-04 06:17:57 +08:00 |
lvxinran
|
4971fced7b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-03 12:04:26 +08:00 |
lvxinran
|
3d1aeb4e0f
|
挂机时常特权增加
|
2020-07-03 12:04:21 +08:00 |
lvxinran
|
87a619edf2
|
试炼副本buff修改
|
2020-07-03 12:04:03 +08:00 |
zhangshanxue
|
e76c60958d
|
Merge branch 'dev_champion'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2020-07-03 09:56:32 +08:00 |
zhangshanxue
|
47595e498f
|
竞技场奖励
|
2020-07-03 09:54:09 +08:00 |
zhangshanxue
|
2c5348131d
|
公会援助
|
2020-07-02 18:18:32 +08:00 |
zhangshanxue
|
bcee7dc40f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-02 16:17:02 +08:00 |
zhangshanxue
|
1f8108b5bb
|
公会援助
|
2020-07-02 16:16:52 +08:00 |
zhangshanxue
|
cab91587d8
|
公会援助
|
2020-07-02 15:25:28 +08:00 |
zhangshanxue
|
9532f3e6a8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-02 11:30:23 +08:00 |
zhangshanxue
|
3e8ddecbb2
|
公会援助bug
|
2020-07-02 11:28:45 +08:00 |
zhangshanxue
|
2511018c53
|
Merge branch 'dev_champion'
|
2020-07-01 18:27:28 +08:00 |
zhangshanxue
|
eba32c1b52
|
TASK【ID1006427】【ID1006428】【大闹天宫优化】 BUG【ID1008042】【大闹天宫】招募的四星卡,初始是五星,没技能
|
2020-07-01 18:25:35 +08:00 |
lvxinran
|
cc1d26d842
|
试炼游戏等级限制修改、战斗回合数修改
|
2020-06-30 20:52:09 +08:00 |
lvxinran
|
10208681e5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-29 18:11:06 +08:00 |
lvxinran
|
bb7deac072
|
排行榜显示修改
|
2020-06-29 18:10:55 +08:00 |
lvxinran
|
6fbc6cd9eb
|
魂印分解种类修改
|
2020-07-05 16:20:06 +08:00 |
lvxinran
|
3fc7f6db20
|
天宫秘宝修改
|
2020-07-05 16:19:51 +08:00 |
lvxinran
|
61c1706d5c
|
魂印分解提交,异常添加
|
2020-07-05 16:19:24 +08:00 |
zhangshanxue
|
a38165efef
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-29 18:10:44 +08:00 |
zhangshanxue
|
805745fdfa
|
添加圣物
|
2020-06-29 18:09:30 +08:00 |
zhangshanxue
|
0caf4ddadc
|
选拔赛添加竞猜阶段
|
2020-06-29 17:38:26 +08:00 |
zhangshanxue
|
c4c03a12d8
|
删除远征圣物缓存
|
2020-07-02 16:05:49 +08:00 |
zhangshanxue
|
8f8dc0e631
|
TASK【ID1006424】竞猜结果赔率、显示、信息保留修改
|
2020-07-01 22:44:08 +08:00 |
zhangshanxue
|
12b7cc9c0e
|
TASK【ID1006423】竞猜币获取规则和转化
|
2020-06-29 18:00:12 +08:00 |
lvxinran
|
0703b8ced5
|
加入魂印战力
|
2020-06-28 13:49:17 +08:00 |
lvxinran
|
54778137a2
|
英雄图鉴修改
|
2020-06-24 18:21:38 +08:00 |
zhangshanxue
|
77907afc30
|
重新load内存数据gm
|
2020-06-27 23:41:19 +08:00 |
zhangshanxue
|
798e1b4c08
|
错存
|
2020-06-27 23:39:36 +08:00 |
zhangshanxue
|
7177eb9e38
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-27 21:09:25 +08:00 |
zhangshanxue
|
7a3d99580c
|
猎妖英雄血量更新bug
|
2020-06-27 21:07:29 +08:00 |
lvxinran
|
25ff3772e9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-24 20:27:15 +08:00 |
zhangshanxue
|
303749246e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-07-11 05:06:42 +08:00 |
lvxinran
|
52eb8e895a
|
挂机获得装备自动合成
|
2020-07-02 17:32:39 +08:00 |
zhangshanxue
|
6ab7e8beee
|
竞技场和猎妖之路刷新时间
|
2020-07-01 05:00:38 +08:00 |
lvxinran
|
f42827869a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-25 22:08:01 +08:00 |
lvxinran
|
a238a0b9a6
|
升级好礼活动修复领奖之后bug
|
2020-06-25 22:07:53 +08:00 |
lvxinran
|
beb23ae312
|
日常本修改
|
2020-06-25 20:14:51 +08:00 |
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 |
wangyuan
|
e428c0059a
|
修复未给前端发送天空秘宝信息
|
2020-05-27 10:00:26 +08:00 |
zhangshanxue
|
e931d53f5c
|
类型转换漏写
|
2020-05-27 00:23:34 +08:00 |
lvxinran
|
1e5645e21f
|
删除无用注释
|
2020-05-26 14:45:31 +08:00 |
lvxinran
|
b6760d596a
|
商店时间推送修改
|
2020-05-27 09:00:39 +08:00 |
lvxinran
|
58d6738ca0
|
点石成金商店修改、无用代码注释
|
2020-05-26 12:01:47 +08:00 |
wangyuan
|
d99ef36335
|
fix 修复天空秘宝周期不对
|
2020-05-26 10:06:56 +08:00 |
wangyuan
|
9d16af655c
|
fix round
|
2020-05-26 09:51:43 +08:00 |
zhangshanxue
|
983234701d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-26 00:03:34 +08:00 |
zhangshanxue
|
7b6bbefa22
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-06-01 23:59:58 +08:00 |
zhangshanxue
|
2e97a23f31
|
点金bug
|
2020-06-01 23:59:39 +08:00 |
lvxinran
|
30e252118f
|
Merge branch 'master' into develop
|
2020-05-25 19:31:46 +08:00 |
lvxinran
|
b8a99d8662
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-25 19:31:20 +08:00 |
lvxinran
|
b9a0eabd4f
|
十绝阵修改
|
2020-05-25 19:31:15 +08:00 |
wangyuan
|
940625d330
|
【车迟斗法】没有收到前公会的排行奖励
|
2020-05-25 14:42:55 +08:00 |
wangyuan
|
e8307d5664
|
资质修改
|
2020-05-25 14:24:51 +08:00 |
wangyuan
|
1753fba53e
|
fix 【车迟斗法】挑战和抢夺按钮共同冷却,挑战冷却时过渡到抢夺阶段 【车迟斗法】挑战和抢夺按钮共同冷却,挑战冷却时过渡到抢夺阶段
【车迟斗法】规则是更早到达的排名在前
|
2020-05-25 14:14:46 +08:00 |
wangyuan
|
bfa0c6416c
|
fix 周期获取错误
|
2020-05-25 12:11:30 +08:00 |
zhangshanxue
|
9ead3452d4
|
协议类型分配有问题
|
2020-05-23 03:05:22 +08:00 |
zhangshanxue
|
e94cd2d5c4
|
协议类型分配有问题
|
2020-05-23 01:03:07 +08:00 |
zhangshanxue
|
f91f204848
|
应该是重连上的session
|
2020-05-23 00:33:06 +08:00 |
zhangshanxue
|
eda4141f3b
|
BUG【ID1007627】【剑影仙踪】激活豪华月卡后,需要领取一次奖励,才会显示完成条件
|
2020-05-23 00:18:30 +08:00 |
zhangshanxue
|
d34556c29c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-22 23:46:11 +08:00 |
lvxinran
|
8485c18b7f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-25 11:54:29 +08:00 |
lvxinran
|
31150361c1
|
十绝阵推送提交
|
2020-05-25 11:54:25 +08:00 |
lvxinran
|
142dcb6970
|
战斗位置修改
|
2020-05-25 12:36:02 +08:00 |
lvxinran
|
1bd3275e5a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-25 11:29:13 +08:00 |
lvxinran
|
08b1bd06cf
|
vip修改
|
2020-05-25 11:29:08 +08:00 |
zhangshanxue
|
03a0cb9d51
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)
|
2020-05-22 23:45:59 +08:00 |
zhangshanxue
|
6302d70fed
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-22 19:08:45 +08:00 |
zhangshanxue
|
09cf77fae8
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)时间推送
|
2020-05-22 19:08:36 +08:00 |
zhangshanxue
|
dc7bb1a89a
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)
|
2020-05-22 05:53:33 +08:00 |
zhangshanxue
|
094d64f8ad
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)
|
2020-05-22 05:13:25 +08:00 |
zhangshanxue
|
a6767eb7bf
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)
|
2020-05-21 14:07:46 +08:00 |
lvxinran
|
4aea1763c8
|
试炼副本提交
|
2020-05-20 15:31:08 +08:00 |
zhangshanxue
|
c332a9b8c3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-20 10:31:39 +08:00 |
zhangshanxue
|
e20be3b89b
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)
|
2020-05-20 10:31:31 +08:00 |
wangyuan
|
463ea511fa
|
fix 【开服狂欢】福利礼包报错 初始化user,未放入内存中,初始化活动获取user报错
|
2020-05-19 17:42:52 +08:00 |
wangyuan
|
5b3937b093
|
成长礼金 & 猎妖之路战斗特殊被动传输数据 & 车迟玩法排行榜问题
|
2020-05-19 17:18:08 +08:00 |
lvxinran
|
4d284c5b50
|
Merge branch 'master' into develop
|
2020-05-18 20:43:17 +08:00 |
lvxinran
|
41b67cfefb
|
兽潮来袭删除消耗道具
|
2020-05-18 20:39:48 +08:00 |
lvxinran
|
19e59de463
|
副本修改
|
2020-05-18 20:28:54 +08:00 |
wangyuan
|
e4bca61851
|
车迟排行榜 个人和工会反了
|
2020-05-18 18:37:03 +08:00 |
wangyuan
|
5632169a45
|
车迟上次玩的时间
|
2020-05-18 14:34:40 +08:00 |
zhangshanxue
|
f4170fc273
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-18 13:44:53 +08:00 |
zhangshanxue
|
bc0d2c5f6e
|
战斗位置
|
2020-05-18 13:44:38 +08:00 |
wangyuan
|
7e360f4d71
|
【任务】参与日常副本次数,完不成
|
2020-05-18 11:25:26 +08:00 |
wangyuan
|
9c373c3b2a
|
rollback application.properties
|
2020-05-18 10:24:40 +08:00 |
wangyuan
|
f48920d5bc
|
1.修复活动关闭没有推送新活动开始
2.猎妖之路加被动技能
3.删除无效领取抽卡宝箱奖励
|
2020-05-16 18:46:14 +08:00 |
zhangshanxue
|
cfb504dfe8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-16 17:52:02 +08:00 |
zhangshanxue
|
a7fd42b00a
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)
|
2020-05-16 17:51:44 +08:00 |
zhangshanxue
|
24c347f308
|
Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)
|
2020-05-16 17:51:15 +08:00 |
wangyuan
|
7ad319cd7e
|
random card
|
2020-05-16 16:56:15 +08:00 |
zhangshanxue
|
74eb0a0aea
|
Task【新战斗版本】公会援助
|
2020-05-16 11:28:46 +08:00 |
zhangshanxue
|
903d5d2944
|
Task【新战斗版本】公会援助
|
2020-05-18 05:04:36 +08:00 |
zhangshanxue
|
783120f7eb
|
公会奖励补发 及 机器人编队位置添加
|
2020-05-16 15:35:32 +08:00 |
zhangshanxue
|
feaa5fb4f5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-16 10:33:02 +08:00 |
zhangshanxue
|
238e940beb
|
Task【新战斗版本】公会援助
|
2020-05-16 10:32:50 +08:00 |
lvxinran
|
c81995c849
|
十绝阵掉落修改
|
2020-05-16 08:36:20 +08:00 |
lvxinran
|
17f1f0a639
|
indication修改
|
2020-05-15 21:11:26 +08:00 |
lvxinran
|
94681e4b9d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-15 21:04:47 +08:00 |
lvxinran
|
297bb65445
|
十绝阵 跑马灯添加 领奖修改
|
2020-05-15 21:04:42 +08:00 |
lvxinran
|
48e362291c
|
排名奖励修改
|
2020-05-22 16:20:22 +08:00 |
lvxinran
|
886474443e
|
十绝阵奖励随机提交
|
2020-05-22 15:51:17 +08:00 |
lvxinran
|
bab6d9a004
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-18 22:39:22 +08:00 |
lvxinran
|
4408cd4a17
|
十绝阵奖励相关
|
2020-05-18 22:39:17 +08:00 |
lvxinran
|
1f9756dd59
|
合并
|
2020-05-14 13:43:46 +08:00 |
wangyuan
|
501f5e9d70
|
fix 车迟工会排行没有获取到我的工会排行
|
2020-05-13 15:29:11 +08:00 |
wangyuan
|
324b413a31
|
fix 【开服狂欢】寻宝次数任务,不能完成
|
2020-05-13 15:27:03 +08:00 |
wangyuan
|
e82caddb52
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-05-12 16:06:33 +08:00 |
wangyuan
|
73e7d662aa
|
开活动送充值购买权
|
2020-05-12 16:02:37 +08:00 |
lvxinran
|
89c8a68f3a
|
十绝阵数量级处理、开服3天限制添加
|
2020-05-12 14:55:10 +08:00 |
lvxinran
|
e60facdc36
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-15 00:08:14 +08:00 |
lvxinran
|
633cf81ee6
|
十绝阵 时间 阶段修改
|
2020-05-15 00:07:41 +08:00 |
lvxinran
|
26b0aff262
|
特权到期时间修改
|
2020-05-13 03:49:02 +08:00 |
lvxinran
|
44d7fbbc52
|
十绝阵修改
|
2020-05-11 21:50:11 +08:00 |
lvxinran
|
233d52d1c8
|
BIReanson提交
|
2020-05-11 20:41:19 +08:00 |