duhui
|
d3d6924a57
|
不影响逻辑,美观
|
2021-09-18 15:19:14 +08:00 |
duhui
|
5cbba695bf
|
七界合并3--bug修改
|
2021-09-24 00:42:13 +08:00 |
jiahuiwen
|
00037467d2
|
公会援助失败也算援助次数
|
2021-09-18 11:59:06 +08:00 |
jiahuiwen
|
5d4ef3ac50
|
BlessingConfigNew 表 basicPoolId 改 String
|
2021-09-18 10:43:52 +08:00 |
jiahuiwen
|
a5e82c01a0
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-09-17 16:47:07 +08:00 |
jiahuiwen
|
8427f08a4a
|
还原战力计算公式
|
2021-09-17 16:20:13 +08:00 |
duhui
|
613a724623
|
助战兼容,报错修改
|
2021-09-17 14:28:39 +08:00 |
duhui
|
ff3f04af63
|
合并代码2
|
2021-09-17 14:21:01 +08:00 |
duhui
|
2050067fb1
|
战斗修改补充
(cherry picked from commit 901ab76a3aad4862318a8c76378ea138d21a9095)
|
2021-09-17 14:20:07 +08:00 |
duhui
|
def246c407
|
合并代码1
|
2021-09-17 14:19:54 +08:00 |
duhui
|
18f91727e4
|
第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
|
2021-09-17 14:13:29 +08:00 |
duhui
|
01457210b5
|
本地gm,四灵跳关
|
2021-09-17 14:09:25 +08:00 |
jiahuiwen
|
484298240c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-17 11:40:01 +08:00 |
jiahuiwen
|
e125b19b99
|
战斗力公式修改
|
2021-09-17 11:39:48 +08:00 |
duhui
|
dfc615ae0a
|
鸿蒙阵英雄魂印问题处理
|
2021-09-16 16:41:57 +08:00 |
duhui
|
9e964a10f1
|
日志调整
|
2021-09-16 11:27:57 +08:00 |
duhui
|
42cbcab535
|
鸿蒙阵推送bug处理
|
2021-09-15 15:52:32 +08:00 |
xuexinpeng
|
d4b117d4c3
|
寻宝迷踪打开
|
2021-09-15 15:15:07 +08:00 |
duhui
|
31ce7a2522
|
鸿蒙阵请求返回
|
2021-09-21 01:45:46 +08:00 |
duhui
|
a362ba1838
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-27 11:18:31 +08:00 |
duhui
|
68239e5634
|
时间修改
|
2021-09-27 11:13:53 +08:00 |
duhui
|
0219a8ae12
|
Merge branch 'master_test_gn_zf' into master_prb_gn
|
2021-09-27 11:12:53 +08:00 |
duhui
|
7f1180c2b2
|
轩辕宝镜礼包推送
|
2021-09-27 11:12:30 +08:00 |
duhui
|
4679fb5af2
|
十绝伤害超上限
|
2021-09-27 11:09:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
c39cb8eac6
|
十绝阵刷新
|
2021-09-22 11:09:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
95223a0c98
|
测试回滚
|
2021-09-22 10:18:53 +08:00 |
duhui
|
b70260fc88
|
Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn
|
2021-09-14 20:06:52 +08:00 |
duhui
|
1c3fdf907c
|
数数修改
|
2021-09-14 20:06:34 +08:00 |
jiahuiwen
|
713dda777f
|
礼包推送 增加判断
|
2021-09-14 15:49:29 +08:00 |
jiahuiwen
|
b6f4eb1b24
|
轩辕宝镜礼包增加 推送扫荡推送
|
2021-09-14 14:53:24 +08:00 |
yuanshuai
|
5bfabb7e7f
|
【四象心法】跑马灯问题修改
|
2021-09-14 14:32:17 +08:00 |
yuanshuai
|
e3a628d5ad
|
Merge branch 'master_test_gn' into master_test_gn_ys
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java
|
2021-09-14 13:57:03 +08:00 |
yuanshuai
|
0d7c337ced
|
【四象心法】添加技能属性加成
|
2021-09-14 11:36:38 +08:00 |
yuanshuai
|
d172e4d48f
|
跑马灯修改
|
2021-09-14 09:48:53 +08:00 |
duhui
|
eeac777798
|
版本号读表
|
2021-09-13 17:52:00 +08:00 |
yuanshuai
|
10cb106a8d
|
四象心法bug 修改
|
2021-09-13 17:18:53 +08:00 |
duhui
|
081266e83d
|
十绝阵定时清理
|
2021-09-13 13:58:12 +08:00 |
duhui
|
045e1ce82f
|
跨服十绝阵
|
2021-09-13 11:37:48 +08:00 |
yuanshuai
|
3a29dc0ce3
|
【四象心法】bug修改
|
2021-09-11 18:06:34 +08:00 |
duhui
|
884e3b1276
|
老跨服代码注释
|
2021-09-10 20:13:21 +08:00 |
duhui
|
2fd6b82d04
|
十绝阵兼容
|
2021-09-10 19:51:44 +08:00 |
duhui
|
686f22d60d
|
竞技场刷新
|
2021-09-10 19:12:34 +08:00 |
duhui
|
8a05dbe235
|
Merge branch 'dh_dev_rediskey' of http://60.1.1.230/backend/jieling_server into dh_dev_rediskey
|
2021-09-10 18:29:04 +08:00 |
duhui
|
59b4e12b17
|
公会援助刷新回滚
|
2021-09-10 18:28:52 +08:00 |
duhui
|
aa040195e0
|
竞技场每日发奖
|
2021-09-14 00:35:05 +08:00 |
duhui
|
7af7724b0c
|
Merge branch 'master_test_gn' into dh_dev_rediskey
|
2021-09-14 00:07:34 +08:00 |
duhui
|
987f4c6729
|
十绝阵删除key
|
2021-09-14 00:07:25 +08:00 |
jiahuiwen
|
8b3031f9b9
|
DEATH_PATH
|
2021-09-10 18:11:29 +08:00 |
duhui
|
989f45f926
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
|
2021-09-10 16:01:28 +08:00 |
duhui
|
2e03d50d47
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-10 15:59:42 +08:00 |