zhangshanxue
|
07595796fa
|
合分支
|
2020-08-24 23:36:16 +08:00 |
zhangshanxue
|
23ade886ae
|
Merge branch 'master' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
# tablemanager/src/main/java/config/SRechargeCommodityConfig.java
|
2020-08-24 23:16:18 +08:00 |
zhangshanxue
|
e77644359d
|
充值价格
|
2020-08-24 23:14:03 +08:00 |
lvxinran
|
a57bdbc37f
|
五星成长礼修改
|
2020-09-01 22:11:12 +08:00 |
lvxinran
|
10858c2606
|
剑影仙踪活动修改
|
2020-09-01 18:30:29 +08:00 |
lvxinran
|
b586b0c502
|
时间5天改成30天
|
2020-09-01 14:55:09 +08:00 |
lvxinran
|
cc3f0d662d
|
公会副本次数修改
|
2020-09-01 14:14:26 +08:00 |
lvxinran
|
c98aa7f20d
|
公会副本次数修改
|
2020-09-01 22:30:59 +08:00 |
lvxinran
|
57057330aa
|
上报乘100修改
|
2020-08-22 16:57:01 +08:00 |
lvxinran
|
d56aa73460
|
Merge branch 'master' into 公会副本
|
2020-08-22 15:39:33 +08:00 |
lvxinran
|
146c394e7a
|
公会副本提交
|
2020-08-22 15:38:31 +08:00 |
lvxinran
|
86eee21319
|
怪物战力修改表数据
|
2020-08-21 20:53:26 +08:00 |
zhangshanxue
|
3ef43a64a7
|
灵动网页支付
|
2020-08-21 20:31:30 +08:00 |
lvxinran
|
26e02ac204
|
无尽修改
|
2020-08-21 19:25:31 +08:00 |
lvxinran
|
388a28507b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-21 18:46:55 +08:00 |
lvxinran
|
e9fe5e2992
|
礼包修改
|
2020-08-21 18:46:49 +08:00 |
lvxinran
|
f7b77d668a
|
副本提交
|
2020-08-28 14:38:20 +08:00 |
lilei
|
80bd02138f
|
破阵诛仙累冲任务修正
|
2020-08-21 18:00:07 +08:00 |
lilei
|
7c7e5cf9f1
|
破阵诛仙系列任务
|
2020-08-21 16:36:46 +08:00 |
lvxinran
|
c6a0354f81
|
公会副本提交,大闹天宫埋点提交
|
2020-08-20 23:02:13 +08:00 |
lvxinran
|
95375eab26
|
公会副本提交
|
2020-08-27 19:49:57 +08:00 |
lilei
|
2cdf521ce3
|
探索达人替换为极速达人,增加探索次数特权逻辑
|
2020-08-20 14:06:48 +08:00 |
lilei
|
bf1ef4c1a3
|
活动热更延期增加遗留数据清理
|
2020-08-19 20:36:18 +08:00 |
zhangshanxue
|
b83687ea23
|
revert 错误合并
|
2020-08-19 11:16:28 +08:00 |
lvxinran
|
ec758ee011
|
公会副本排行榜
|
2020-08-19 09:58:33 +08:00 |
lvxinran
|
41d73df618
|
公会副本排行
|
2020-08-19 09:50:37 +08:00 |
lilei
|
50f33a02c0
|
Merge branch 'develop_treasure'
|
2020-08-19 09:47:27 +08:00 |
lilei
|
2ef8972406
|
青龙秘宝
|
2020-08-19 09:47:02 +08:00 |
zhangshanxue
|
bc50b90957
|
重连有问题
|
2020-08-18 22:27:30 +08:00 |
zhangshanxue
|
413f84af8a
|
十绝阵结算
|
2020-08-18 20:10:12 +08:00 |
lvxinran
|
1b70b3c73a
|
公会副本
|
2020-08-18 19:42:50 +08:00 |
lilei
|
f202f73b73
|
青龙秘宝,工坊合成装备任务改为锻器阁合成装备
|
2020-08-18 17:10:06 +08:00 |
zhangshanxue
|
22aca76856
|
充值和数据转换
|
2020-08-18 16:22:38 +08:00 |
zhangshanxue
|
000b4466b3
|
充值和数据转换
|
2020-08-18 16:12:54 +08:00 |
lvxinran
|
38c3cffa54
|
appId加入
|
2020-08-21 14:22:14 +08:00 |
zhangshanxue
|
cc801a8510
|
充值价格
|
2020-08-18 11:27:03 +08:00 |
lilei
|
c18ac44bcf
|
青龙秘宝
|
2020-08-18 09:42:32 +08:00 |
zhangshanxue
|
024e339bc3
|
合服
|
2020-08-17 22:31:25 +08:00 |
zhangshanxue
|
90e14e4493
|
合服
|
2020-08-17 21:40:49 +08:00 |
lilei
|
b797c85de6
|
青龙秘宝,新增任务类型
|
2020-08-17 19:53:26 +08:00 |
zhangshanxue
|
d9bd59ea26
|
合服
|
2020-08-17 15:30:25 +08:00 |
lilei
|
f73829b5d4
|
青龙秘宝,新增部分任务类型
|
2020-08-17 15:01:28 +08:00 |
zhangshanxue
|
29f85c959b
|
合服
|
2020-08-17 11:09:35 +08:00 |
zhangshanxue
|
b643307e5a
|
合服
|
2020-08-17 10:26:46 +08:00 |
lvxinran
|
588e22626f
|
修改部分日志
|
2020-08-17 10:11:27 +08:00 |
lvxinran
|
237317a677
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-30 21:15:02 +08:00 |
lvxinran
|
8aaf2d698b
|
十绝阵邮件发奖修改
|
2020-08-30 21:14:49 +08:00 |
lvxinran
|
bde18afb04
|
轩辕宝镜修改推送
|
2020-08-24 05:02:20 +08:00 |
zhangshanxue
|
2826ce87de
|
合服
|
2020-08-15 17:28:53 +08:00 |
zhangshanxue
|
05a1f88da3
|
合服
|
2020-08-15 15:47:51 +08:00 |
zhangshanxue
|
7c8743c71e
|
Merge branch 'master_test_combin' of http://60.1.1.230/backend/jieling_server into master_test_combin
|
2020-08-15 15:41:50 +08:00 |
zhangshanxue
|
7c5c28d6a1
|
Merge branch 'master_test_hw' into master_test_combin
|
2020-08-15 15:40:46 +08:00 |
zhangshanxue
|
68aa9fc53d
|
合服
|
2020-08-15 15:25:55 +08:00 |
zhangshanxue
|
0a162ccce7
|
充值类型更换
|
2020-08-14 23:41:23 +08:00 |
zhangshanxue
|
47bfc8c339
|
充值类型更换
|
2020-08-14 23:19:12 +08:00 |
zhangshanxue
|
329cb6dcc2
|
充值类型更换
|
2020-08-14 23:18:18 +08:00 |
zhangshanxue
|
433ef98265
|
充值类型更换
|
2020-08-14 23:08:45 +08:00 |
zhangshanxue
|
a2504adc4c
|
合服
|
2020-08-14 14:30:31 +08:00 |
zhangshanxue
|
e81eeb4cf6
|
英雄创建类型
|
2020-08-14 14:10:56 +08:00 |
lvxinran
|
9a25d556a2
|
换层清除数据
|
2020-08-23 07:03:47 +08:00 |
lvxinran
|
3b384d0698
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-23 07:02:32 +08:00 |
lvxinran
|
c0126ead43
|
线程加入try catch
|
2020-08-23 07:02:27 +08:00 |
lvxinran
|
20a0adb7fe
|
森罗环境 小怪计血量
|
2020-08-23 07:02:07 +08:00 |
lvxinran
|
a8087e7b84
|
森罗幻境重置商人
|
2020-08-22 05:02:27 +08:00 |
lvxinran
|
dbfb8f4110
|
限时兑换活动物品掉落修改
|
2020-08-21 11:30:47 +08:00 |
lilei
|
517f156037
|
每日签到宝箱
|
2020-08-14 09:39:38 +08:00 |
zhangshanxue
|
ca65ff8689
|
合服
|
2020-08-13 21:44:36 +08:00 |
zhangshanxue
|
60abb970a9
|
Merge branch 'master' into master_test_combin
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2020-08-13 19:28:39 +08:00 |
zhangshanxue
|
cbde195205
|
合服
|
2020-08-13 19:26:18 +08:00 |
zhangshanxue
|
c36c3abdde
|
英雄置换
|
2020-08-13 16:53:56 +08:00 |
lvxinran
|
eff5b8a1f3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-17 06:21:36 +08:00 |
lvxinran
|
315ef31145
|
车迟斗法打点修改
|
2020-08-17 06:21:31 +08:00 |
lvxinran
|
19ee0348b9
|
合成英雄修改
|
2020-08-17 05:36:19 +08:00 |
zhangshanxue
|
31274417cd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-13 15:01:33 +08:00 |
zhangshanxue
|
993ad432b2
|
英雄置换
|
2020-08-13 15:01:25 +08:00 |
zhangshanxue
|
b5295969ca
|
英雄置换
|
2020-08-13 14:34:05 +08:00 |
lvxinran
|
7d298ccfbb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-17 05:08:40 +08:00 |
lvxinran
|
6dfd305c73
|
轩辕宝镜排行发奖
|
2020-08-17 05:08:35 +08:00 |
lvxinran
|
cf3704b456
|
神将合成进阶修改
|
2020-09-07 14:45:25 +08:00 |
lvxinran
|
e371b00b38
|
推送修改
|
2020-08-26 05:58:13 +08:00 |
lvxinran
|
2ba3f2d76f
|
埋点报错修改
|
2020-08-26 05:43:23 +08:00 |
zhangshanxue
|
53993024b6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-13 12:07:29 +08:00 |
zhangshanxue
|
64e4e2911b
|
英雄置换
|
2020-08-13 12:07:16 +08:00 |
zhangshanxue
|
2b33f18c05
|
Merge branch 'equip_develop'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2020-08-12 15:20:22 +08:00 |
lvxinran
|
1bbf5bc010
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-08-16 14:21:45 +08:00 |
lvxinran
|
9934547352
|
修改装备返还
|
2020-08-16 14:21:35 +08:00 |
lvxinran
|
a05812d3e6
|
修复战斗被动
|
2020-08-16 12:38:09 +08:00 |
lvxinran
|
a5d9a17b29
|
怪物被动修改
|
2020-08-16 11:27:35 +08:00 |
lvxinran
|
5dfcc37f29
|
判断宝镜
|
2020-08-15 20:24:41 +08:00 |
lvxinran
|
1af2208ab8
|
修改校验条件
|
2020-08-15 20:01:33 +08:00 |
lvxinran
|
2d92899d8f
|
打点修改
|
2020-08-15 19:17:46 +08:00 |
lvxinran
|
ef2184ac99
|
二期打点需求
|
2020-08-15 18:18:32 +08:00 |
lvxinran
|
d46749052d
|
战斗位置
|
2020-08-15 17:08:45 +08:00 |
lvxinran
|
c3aa6aaec9
|
报空 修改
|
2020-08-15 16:25:45 +08:00 |
lvxinran
|
00198786e9
|
轩辕宝镜代码提交
|
2020-08-15 13:42:36 +08:00 |
lvxinran
|
fffe477523
|
英雄装备掉落修改
|
2020-08-13 09:41:07 +08:00 |
lvxinran
|
5c23253d5e
|
轩辕宝镜
|
2020-08-13 09:37:01 +08:00 |
zhangshanxue
|
4e0dd14dce
|
英雄置换
|
2020-08-12 14:16:08 +08:00 |
zhangshanxue
|
efc21ecbf3
|
英雄置换
|
2020-08-10 15:26:19 +08:00 |
lvxinran
|
424b64e6c9
|
挑战 扫荡 逻辑
|
2020-08-07 15:26:25 +08:00 |