xuexinpeng
|
49811877fa
|
战斗星级
|
2021-12-21 19:07:26 +08:00 |
xuexinpeng
|
e683d993d5
|
探索 战斗
|
2021-12-21 19:04:56 +08:00 |
jiahuiwen
|
90e98f6355
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2021-12-21 17:48:01 +08:00 |
xuexinpeng
|
9253e775f0
|
探索
|
2021-12-21 16:46:24 +08:00 |
xuexinpeng
|
db7dbb84c2
|
探索
|
2021-12-23 17:19:54 +08:00 |
jiahuiwen
|
d3b35d55d0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 10:50:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
8aba14dbe2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-23 19:13:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
5421882672
|
补充
|
2021-12-23 19:13:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b6f5a8e0c
|
获取活动开启时间
|
2021-12-23 19:01:57 +08:00 |
jiahuiwen
|
bd15f69616
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-21 10:50:43 +08:00 |
jiahuiwen
|
cf91ff167b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 09:55:23 +08:00 |
jiahuiwen
|
a97bca5c9b
|
升星配方调整补偿
|
2021-12-21 09:55:12 +08:00 |
yuanshuai
|
b473c1a6ca
|
旧版积天豪礼bug修改
|
2021-12-20 18:52:08 +08:00 |
xuexinpeng
|
048c240cb4
|
礼包刷新
|
2021-12-23 17:21:26 +08:00 |
jiahuiwen
|
fb5036ea29
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:51:23 +08:00 |
xuexinpeng
|
a7ff90e6a7
|
规范代码
|
2021-12-29 00:03:50 +08:00 |
jiahuiwen
|
2596eb08b9
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-20 11:51:13 +08:00 |
xuexinpeng
|
d9e9f378ef
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2021-12-20 11:31:19 +08:00 |
jiahuiwen
|
7ea5e79269
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:12:59 +08:00 |
yuanshuai
|
9d7058bec8
|
新版天天尊降世bug修改
|
2021-12-23 11:04:02 +08:00 |
yuanshuai
|
652caf6b5b
|
旧版积天豪礼代码兼容
|
2021-12-31 00:02:41 +08:00 |
jiahuiwen
|
58311e37df
|
心愿抽奖 400 次后不重置剩余保底次数
|
2021-12-20 11:12:47 +08:00 |
jiahuiwen
|
fc01267f37
|
每日豪礼 活动类型 13 不再更新,补发奖励
|
2021-12-20 10:20:31 +08:00 |
jiahuiwen
|
78bf408e42
|
积天豪礼活动已被替换,未参与的玩家不再累计
|
2021-12-17 18:31:52 +08:00 |
jiahuiwen
|
80f48b3f42
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 17:19:57 +08:00 |
jiahuiwen
|
7012d6c647
|
灵兽宝阁特殊使用
|
2021-12-17 17:19:40 +08:00 |
yuanshuai
|
f473965b9d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 16:13:59 +08:00 |
yuanshuai
|
df0059632a
|
新版积天豪礼活动提交
|
2021-12-17 16:13:50 +08:00 |
yuanshuai
|
d814ecb635
|
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/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2022-01-03 11:48:04 +08:00 |
yuanshuai
|
b3d5dfc0e6
|
新积天豪礼活动脚本修改提交
|
2022-01-03 11:46:33 +08:00 |
jiahuiwen
|
ebc1106e3c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 15:05:08 +08:00 |
jiahuiwen
|
847efbe252
|
原有罗浮货币登录时转化为逐胜徽章
|
2021-12-17 15:05:01 +08:00 |
jiahuiwen
|
87f073bb89
|
新人商城活动
|
2021-12-17 10:52:19 +08:00 |
xuexinpeng
|
e54a1c6243
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-29 00:22:01 +08:00 |
xuexinpeng
|
70d147e593
|
新特惠
|
2021-12-29 00:20:38 +08:00 |
xuexinpeng
|
652097f613
|
新每日特惠
|
2021-12-17 17:58:55 +08:00 |
xuexinpeng
|
956c9cc2fe
|
新特惠礼包
|
2021-12-23 00:17:13 +08:00 |
jiahuiwen
|
2715ea64a3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-16 18:19:21 +08:00 |
jiahuiwen
|
5ef7afe587
|
功能开启关闭
|
2021-12-16 18:19:13 +08:00 |
yuanshuai
|
d96dc3a63d
|
新版天尊降世代码提交
|
2021-12-16 16:39:02 +08:00 |
jiahuiwen
|
d56b0b6a08
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-16 16:30:06 +08:00 |
jiahuiwen
|
701d32c31f
|
回退bug
|
2021-12-16 16:29:55 +08:00 |
yuanshuai
|
8c7c2c00cc
|
漏提交
|
2021-12-16 16:26:09 +08:00 |
yuanshuai
|
83c72f95ba
|
道具添加使用等级限制
|
2021-12-16 15:28:08 +08:00 |
yuanshuai
|
93993d8150
|
挂机收益道具逻辑修改
|
2021-12-16 11:14:48 +08:00 |
yuanshuai
|
db39942231
|
使用资源包道具逻辑完善
|
2021-12-16 10:44:32 +08:00 |
jiahuiwen
|
4ae13de871
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-15 18:42:17 +08:00 |
jiahuiwen
|
6f38da5b27
|
回退修复
|
2021-12-15 18:42:12 +08:00 |
yuanshuai
|
1c3a458869
|
漏提交关卡限制条件脚本
|
2021-12-15 13:07:39 +08:00 |
yuanshuai
|
a5762d9aa9
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-15 13:01:53 +08:00 |