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 |
duhui
|
0402d633a0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-26 10:34:34 +08:00 |
duhui
|
3c85141eab
|
多活动
|
2021-11-26 10:34:22 +08:00 |
jiahuiwen
|
287f295530
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-25 19:28:04 +08:00 |
jiahuiwen
|
c11813b44e
|
月礼包特殊处理,可每日都刷新购买次数
|
2021-11-25 19:27:52 +08:00 |
yuanshuai
|
609bea38bd
|
活动类型整理
|
2021-11-25 17:49:29 +08:00 |
jiahuiwen
|
af0b9547c5
|
支持删 RechargeCommodityConfig
|
2021-11-25 17:41:32 +08:00 |
yuanshuai
|
31859110b4
|
Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
|
2021-11-25 16:59:54 +08:00 |
yuanshuai
|
f850101322
|
灵兽宝阁bug
|
2021-11-25 16:56:36 +08:00 |
yuanshuai
|
fad0cadb25
|
Merge branch 'master_prb_gn' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/AbstractActivity.java
|
2021-11-25 16:49:34 +08:00 |
yuanshuai
|
17e32849ae
|
灵兽宝阁领取bug修改
|
2021-11-25 16:39:23 +08:00 |
xuexinpeng
|
4c11a6db16
|
log
|
2021-11-25 16:34:50 +08:00 |
duhui
|
9c45649824
|
【优化】限时招募,乾坤宝盒,灵兽宝阁整体包装
|
2021-11-25 16:29:08 +08:00 |
jiahuiwen
|
188bf0bf25
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-25 16:27:11 +08:00 |
yuanshuai
|
4c462a99dc
|
灵兽抽奖替换bug修改
|
2021-11-25 16:20:46 +08:00 |
yuanshuai
|
b8267cba0b
|
灵兽抽奖替换bug修改
|
2021-11-25 16:19:59 +08:00 |
xuexinpeng
|
80603a4de5
|
跨服灵脉
|
2021-11-25 16:06:31 +08:00 |
xuexinpeng
|
a9cbf7a046
|
日志
|
2021-11-25 15:39:09 +08:00 |
yuanshuai
|
150742a64d
|
灵兽宝阁bug修改
|
2021-11-25 15:23:09 +08:00 |
yuanshuai
|
fca3f6510c
|
灵兽宝阁bug修改
|
2021-11-25 15:21:59 +08:00 |
xuexinpeng
|
4bfbad8254
|
跨服灵脉
|
2021-11-25 15:15:33 +08:00 |
xuexinpeng
|
edb39cf2af
|
跨服灵脉bug
|
2021-11-25 14:53:18 +08:00 |