yuanshuai
|
204eb5f959
|
命格脚本提交
|
2021-12-08 16:50:41 +08:00 |
xuexinpeng
|
d69aca969f
|
删除部分无用log
|
2021-12-08 13:28:06 +08:00 |
jiahuiwen
|
e754405dfe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-08 13:20:02 +08:00 |
jiahuiwen
|
ad85622fe3
|
竞技试炼
|
2021-12-08 13:19:21 +08:00 |
xuexinpeng
|
ca60360b64
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-07 18:38:06 +08:00 |
xuexinpeng
|
9d893b37ad
|
战斗同步
|
2021-12-07 18:37:27 +08:00 |
jiahuiwen
|
e6d3b7a85c
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-12-07 17:59:54 +08:00 |
jiahuiwen
|
426b23d23f
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-12-07 17:58:45 +08:00 |
xuexinpeng
|
c6fc2fd87a
|
李海洋-gm降关卡
|
2021-12-07 17:02:43 +08:00 |
duhui
|
0914af5631
|
活动非空判断
|
2021-12-07 16:08:00 +08:00 |
jiahuiwen
|
f0ba0de60b
|
Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2021-12-07 16:03:47 +08:00 |
duhui
|
946ae79b7c
|
补充
|
2021-12-07 15:24:37 +08:00 |
duhui
|
aedf20d453
|
计算机器人星级
|
2021-12-07 15:24:03 +08:00 |
duhui
|
43e355c242
|
计算机器人星级
|
2021-12-07 15:04:02 +08:00 |
duhui
|
19e2c1617f
|
计算机器人英雄天赋
|
2021-12-07 10:57:53 +08:00 |
duhui
|
067f639a52
|
机器人根据等级计算信息
|
2021-12-07 10:40:23 +08:00 |
xuexinpeng
|
595735ff93
|
超值基金加判空操作
|
2021-12-07 10:28:41 +08:00 |
duhui
|
147a3a2368
|
计算星级
|
2021-12-06 18:31:53 +08:00 |
duhui
|
2c549257e0
|
机器人星级修改
|
2021-12-06 17:38:38 +08:00 |
duhui
|
92a1305eaf
|
大闹天宫优化
|
2021-12-06 15:35:18 +08:00 |
duhui
|
0cf8bb430b
|
连续礼包优化
|
2021-12-10 00:29:26 +08:00 |
duhui
|
257a5afaf8
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2021-12-03 10:05:46 +08:00 |
jiahuiwen
|
8157f05b32
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
|
2021-12-03 10:03:01 +08:00 |
jiahuiwen
|
bde0bb4ed2
|
重置天宫商店
|
2021-12-03 10:01:07 +08:00 |
duhui
|
910670c66c
|
连续礼包优化,bug修改提交
|
2021-12-02 16:44:17 +08:00 |
duhui
|
f0b55b5ffb
|
四灵试炼,层数刷新日志
|
2021-12-02 16:16:23 +08:00 |
duhui
|
1dc148d469
|
Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2021-12-02 15:17:41 +08:00 |
duhui
|
2717cdefec
|
连续礼包优化
|
2021-12-02 15:16:02 +08:00 |
duhui
|
b418a8e53c
|
日志管理
|
2021-12-02 10:20:55 +08:00 |
jiahuiwen
|
275426aadc
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-12-01 18:49:01 +08:00 |
jiahuiwen
|
5c4874ab9e
|
重置天宫商店
|
2021-12-01 17:55:46 +08:00 |
duhui
|
4e4ed641ca
|
方寸寻宝活动
|
2021-12-01 15:25:19 +08:00 |
duhui
|
c4e252a3ed
|
礼包活动报错
|
2021-12-01 07:14:08 +08:00 |
duhui
|
345b573ddc
|
战斗报错
|
2021-12-01 06:58:13 +08:00 |
yuanshuai
|
40ae47feb0
|
修改异常飘字
|
2021-11-30 11:25:01 +08:00 |
duhui
|
d6f16d1f61
|
变身卡激活消耗道具
|
2021-11-30 10:09:44 +08:00 |
yuanshuai
|
d97164a2db
|
天地洪炉选择up添加限制
|
2021-12-05 15:05:28 +08:00 |
duhui
|
c91b204bdc
|
活动改版,初版
|
2021-11-29 18:32:14 +08:00 |
jiahuiwen
|
81e10b1e8c
|
消除报错
|
2021-11-29 14:00:40 +08:00 |
jiahuiwen
|
1fc0a0a4d3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-27 17:35:16 +08:00 |
jiahuiwen
|
cff11e010c
|
剧情关不需要战斗
|
2021-11-27 17:35:07 +08:00 |
xuexinpeng
|
1d72eeb54d
|
删除log
|
2021-11-27 17:15:19 +08:00 |
duhui
|
f119b88123
|
连续礼包活动
|
2021-11-27 16:07:55 +08:00 |
jiahuiwen
|
f929ea69db
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-27 15:43:34 +08:00 |
yuanshuai
|
e84a1463c4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-02 17:35:31 +08:00 |
DESKTOP-98AVA47\Administrator
|
9873a26fff
|
身外化身战斗
|
2021-12-09 15:19:21 +08:00 |
DESKTOP-98AVA47\Administrator
|
aab2103698
|
技能修改
|
2021-12-09 02:36:39 +08:00 |
yuanshuai
|
7709b634fd
|
天地洪炉活动脚本提交
|
2021-12-02 17:35:25 +08:00 |
jiahuiwen
|
8c359f8e44
|
每月礼包刷新时间改每天0点
|
2021-11-27 15:43:26 +08:00 |
xuexinpeng
|
e944250fb8
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-26 13:14:58 +08:00 |