duhui
|
95da9033b8
|
车迟斗法改为跨服玩法,清除上期数据
|
2022-03-04 11:25:54 +08:00 |
duhui
|
f42013ba08
|
车迟斗法改为跨服玩法,优化
|
2022-03-03 18:27:22 +08:00 |
xuexinpeng
|
0d50b13db8
|
1.探索结束后得邮件加入你本次队伍一共击杀了多少敌人,死亡多少次
2.战力冲刺任务按钮完成状态按最高战力判断,实际领取按当前战力校验
.
|
2022-03-03 18:33:12 +08:00 |
duhui
|
8d7b7bdeb3
|
车迟斗法改为跨服玩法
|
2022-03-05 15:39:20 +08:00 |
jiahuiwen
|
85b48640cd
|
删除无用代码
|
2022-03-03 11:56:43 +08:00 |
duhui
|
00b6a93c53
|
四灵试炼战斗记录从redis转移到mongodb
|
2022-03-02 13:13:06 +08:00 |
xuexinpeng
|
837174f0cd
|
周礼包根据不同等级推不同的礼包
|
2022-03-01 14:48:39 +08:00 |
jiahuiwen
|
74463746c4
|
减少聊天信息缓存
|
2022-03-01 13:16:09 +08:00 |
jiahuiwen
|
1dafc96c7c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-03-01 11:34:13 +08:00 |
jiahuiwen
|
6df96edad6
|
优化redis key
|
2022-03-01 11:34:01 +08:00 |
xuexinpeng
|
bb2d555e64
|
排行榜
|
2022-02-28 11:55:59 +08:00 |
xuexinpeng
|
2ada704ba3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-28 10:46:29 +08:00 |
xuexinpeng
|
cb76090d01
|
排行榜
|
2022-02-28 10:45:06 +08:00 |
jiahuiwen
|
5227b6ea0c
|
USER_LOGIN_URL 设置过期时间
|
2022-02-28 10:39:54 +08:00 |
jiahuiwen
|
186ed8f82c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-28 10:37:46 +08:00 |
jiahuiwen
|
f53ddd0d59
|
WORLD_ARENA_RRECORD 巅峰赛战斗记录设置过期时间
|
2022-02-28 10:37:35 +08:00 |
xuexinpeng
|
4c92ff6135
|
战力冲刺
|
2022-02-25 14:56:07 +08:00 |
xuexinpeng
|
4982b2c70d
|
战力冲刺邮件奖励
|
2022-02-25 14:34:58 +08:00 |
xuexinpeng
|
84d5015304
|
战力冲刺排行榜修改
|
2022-02-25 13:37:49 +08:00 |
xuexinpeng
|
4ce354caa5
|
战力冲刺排行榜调整
|
2022-02-25 11:52:23 +08:00 |
jiahuiwen
|
163a14fe36
|
修仙增加日志
|
2022-02-24 13:56:43 +08:00 |
duhui
|
e6ba9c0ac4
|
至尊降世活动提高1000档
|
2022-02-23 18:06:38 +08:00 |
duhui
|
9836cab7a7
|
补充2:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:37:00 +08:00 |
duhui
|
803280eaf0
|
补充:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:17:35 +08:00 |
duhui
|
dc0eacd113
|
跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:12:37 +08:00 |
xuexinpeng
|
900412365d
|
战力冲刺
|
2022-02-22 21:02:47 +08:00 |
duhui
|
1368922c6d
|
跨服分组改为gm上手动分组,去除自动分组
|
2022-02-21 00:11:00 +08:00 |
jiahuiwen
|
51b0872905
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-20 10:05:13 +08:00 |
jiahuiwen
|
7df22af548
|
规范日志
|
2022-02-20 10:04:18 +08:00 |
jiahuiwen
|
af4b08c3d2
|
重复购买礼包算成功
|
2022-02-20 09:37:51 +08:00 |
xuexinpeng
|
54f6e06a74
|
活动:战力冲刺
|
2022-02-18 22:57:40 +08:00 |
jiahuiwen
|
6b88e120cd
|
_oaid _imei赋值 deviceid
|
2022-02-18 16:46:27 +08:00 |
jiahuiwen
|
8f7ca009a9
|
上报增加 _androidid
|
2022-02-18 16:34:46 +08:00 |
jiahuiwen
|
df28c22959
|
上报增加默认值
|
2022-02-18 13:35:01 +08:00 |
jiahuiwen
|
980477b790
|
上报修改
|
2022-02-17 20:46:33 +08:00 |
jiahuiwen
|
f2e2835076
|
增加报送的头信息
|
2022-02-17 19:26:02 +08:00 |
jiahuiwen
|
283439f860
|
改post
|
2022-02-17 19:18:34 +08:00 |
jiahuiwen
|
a906ad4712
|
增加字段
|
2022-02-17 18:53:30 +08:00 |
jiahuiwen
|
fb94ec7526
|
金额改字符串
|
2022-02-17 18:48:36 +08:00 |
jiahuiwen
|
e9238bd713
|
openId赋值错误
|
2022-02-17 18:40:42 +08:00 |
jiahuiwen
|
f579fbf20c
|
开天上报打印参数
|
2022-02-17 18:17:55 +08:00 |
jiahuiwen
|
831722996d
|
开天上报 价格 改为 元
|
2022-02-17 18:05:36 +08:00 |
jiahuiwen
|
5ec60747ef
|
开天增加充值上报
|
2022-02-17 17:34:09 +08:00 |
yuanshuai
|
4af6f92c99
|
超值返利兼容老数据bug修改
|
2022-02-21 16:27:25 +08:00 |
yuanshuai
|
0d5a19339b
|
超值返利兼容老数据bug修改
|
2022-02-17 16:28:27 +08:00 |
duhui
|
1210a30798
|
【补充】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:43:08 +08:00 |
duhui
|
0b1295cb61
|
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:14:19 +08:00 |
jiahuiwen
|
91be761235
|
删除多余代码
|
2022-02-15 17:54:42 +08:00 |
jiahuiwen
|
e1a5cd8db8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-15 11:34:35 +08:00 |
jiahuiwen
|
802a85021e
|
神将可控制进入版本时间优化
|
2022-02-15 11:34:25 +08:00 |
duhui
|
b0a1347ddf
|
特权刷新日志添加
|
2022-02-15 10:33:03 +08:00 |
jiahuiwen
|
b4f4c43a0e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-14 17:11:01 +08:00 |
jiahuiwen
|
cc1f777372
|
神将可控制进入版本时间
|
2022-02-14 17:10:51 +08:00 |
yuanshuai
|
45d0438456
|
每日豪礼活动重新开启
|
2022-02-11 16:59:12 +08:00 |
jiahuiwen
|
9b7c9af1cc
|
大圣升星活动添加判断
|
2022-02-11 15:25:48 +08:00 |
yuanshuai
|
e2fc3f54cd
|
超值返利活动修改提交
|
2022-02-26 00:05:29 +08:00 |
xuexinpeng
|
92b7b7ee82
|
每日特惠
|
2022-02-11 11:25:49 +08:00 |
xuexinpeng
|
1ccd802b2d
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-10 16:46:56 +08:00 |
xuexinpeng
|
647882cd4e
|
注释掉每日特惠中60元七天特惠活动
|
2022-02-10 16:19:55 +08:00 |
yuanshuai
|
cafea7ce46
|
大闹天宫开战报错bug修改
|
2022-02-10 15:05:13 +08:00 |
yuanshuai
|
3544b10c47
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 15:04:05 +08:00 |
yuanshuai
|
4443ac1bf2
|
大闹天宫开战报错bug修改
|
2022-02-10 15:03:52 +08:00 |
jiahuiwen
|
63cf33f5d4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 11:28:36 +08:00 |
jiahuiwen
|
6053cf9db9
|
神将可控制进入版本时间
|
2022-02-10 11:28:33 +08:00 |
duhui
|
b3b7ce5ed7
|
日志级别调整
|
2022-02-08 18:26:13 +08:00 |
jiahuiwen
|
acb0dcb9d3
|
探索优化
|
2022-01-26 15:06:16 +08:00 |
xuexinpeng
|
36e8abdb61
|
探索相关报错
|
2022-01-26 13:44:38 +08:00 |
xuexinpeng
|
6f9a1ee82c
|
log相关
|
2022-01-25 13:43:02 +08:00 |
DESKTOP-98AVA47\Administrator
|
0c84030817
|
超值基金bug修改
|
2022-01-18 01:10:52 +08:00 |
duhui
|
b94adebdc7
|
超值基金活动修改,线上兼容2
|
2022-01-24 18:03:13 +08:00 |
duhui
|
a29f8a08c2
|
超值基金活动修改,线上兼容
|
2022-01-24 17:31:49 +08:00 |
duhui
|
121bd7924f
|
超值基金活动修改
|
2022-01-24 17:10:11 +08:00 |
jiahuiwen
|
a7c5616dbf
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-24 10:58:53 +08:00 |
duhui
|
73687ceeaa
|
新增主角时装类型
(cherry picked from commit e2c331f840 )
|
2022-01-22 14:27:54 +08:00 |
xuexinpeng
|
fe971df10d
|
探索公会重置
|
2022-01-22 11:31:16 +08:00 |
xuexinpeng
|
09efdc1b7a
|
探索退出公会重置个人数
|
2022-02-10 01:00:05 +08:00 |
xuexinpeng
|
02f41921ab
|
探索达人
|
2022-02-04 16:38:47 +08:00 |
xuexinpeng
|
9310dcfc4f
|
探索达人
|
2022-02-10 00:04:06 +08:00 |
xuexinpeng
|
85969b7acf
|
探索bug
|
2022-01-21 17:19:47 +08:00 |
yuanshuai
|
1f3fce5ece
|
战斗力不一致bug修复(总好感度属性加成导致的)
|
2022-01-20 15:17:00 +08:00 |
duhui
|
12600a3bed
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-19 17:05:44 +08:00 |
duhui
|
df9f1501c2
|
家园特权,重复购买问题解决
|
2022-01-19 17:04:52 +08:00 |
yuanshuai
|
19ab726801
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2022-01-19 16:31:10 +08:00 |
yuanshuai
|
925b06352f
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-22 11:14:33 +08:00 |
jiahuiwen
|
64fc286053
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-18 16:32:14 +08:00 |
yuanshuai
|
89152453e6
|
节日登录活动提交
|
2022-02-13 23:59:56 +08:00 |
jiahuiwen
|
2203e54375
|
优化代码
|
2022-01-18 16:31:48 +08:00 |
duhui
|
3e3e5ee1bf
|
牛气冲天任务优化
|
2022-01-18 10:06:09 +08:00 |
jiahuiwen
|
351909d5f3
|
鸿蒙阵推送
|
2022-01-18 09:56:28 +08:00 |
jiahuiwen
|
ff3c81bfbe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-17 18:59:05 +08:00 |
jiahuiwen
|
fc6bf6f613
|
家园任务bug
|
2022-01-17 18:58:56 +08:00 |
xuexinpeng
|
4bbf743013
|
断线重连探索
|
2022-01-17 18:34:22 +08:00 |
xuexinpeng
|
6bd1bb83ee
|
规范部分log
|
2022-01-17 11:16:47 +08:00 |
xuexinpeng
|
2aecb022a6
|
探索冲突
|
2022-01-15 18:46:26 +08:00 |
jiahuiwen
|
c3075fadb4
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java
|
2022-01-15 18:44:15 +08:00 |
xuexinpeng
|
eb9ed25093
|
探索报空
|
2022-01-15 18:33:19 +08:00 |
xuexinpeng
|
3a1a61171a
|
SExplore判空
|
2022-01-15 18:27:25 +08:00 |
xuexinpeng
|
315083312d
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-15 16:38:31 +08:00 |
jiahuiwen
|
ee98e74895
|
类型转换错误
|
2022-01-15 11:43:57 +08:00 |
jiahuiwen
|
cf6c9cc9ff
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-15 11:08:09 +08:00 |
jiahuiwen
|
5cecf52687
|
森罗幻境阵容bug
|
2022-01-15 11:07:23 +08:00 |
duhui
|
70d69c58b4
|
每日特惠活动
|
2022-01-15 10:09:18 +08:00 |
xuexinpeng
|
129e31c61f
|
断线重连玩家处理/log
|
2022-01-14 13:56:52 +08:00 |
xuexinpeng
|
8aa8865f42
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-14 11:41:57 +08:00 |
xuexinpeng
|
8dd658edc5
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-13 18:32:39 +08:00 |
yuanshuai
|
f5ea9a3b8c
|
天地洪炉脚本抽奖脚本完善
|
2022-01-13 15:12:29 +08:00 |
yuanshuai
|
144ea73fa0
|
代码整理
|
2022-01-12 10:15:53 +08:00 |
jiahuiwen
|
996169647e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-11 14:00:08 +08:00 |
duhui
|
f305dea91f
|
修改注释
|
2022-03-14 00:01:18 +08:00 |
jiahuiwen
|
d352dbb972
|
Merge branch 'master_test_gn' into master_test_gn_upStarHeroActiviry
|
2022-01-11 11:09:46 +08:00 |
yuanshuai
|
813ca52e63
|
英雄升星活动选择英雄限制
|
2022-01-22 16:30:21 +08:00 |
yuanshuai
|
bb15b379ea
|
升星活动脚本修改提交
|
2022-01-22 16:20:41 +08:00 |
yuanshuai
|
c532cad640
|
多提交的内容还原
|
2022-01-22 10:53:53 +08:00 |
yuanshuai
|
2594a30e6a
|
新版升星活动脚本提交
|
2022-01-20 18:36:25 +08:00 |
duhui
|
6f35e726a0
|
家园建筑gm,修改1
|
2022-01-10 18:21:28 +08:00 |
duhui
|
f0a19957b2
|
家园建筑gm
|
2022-01-10 18:18:27 +08:00 |
yuanshuai
|
69166c0950
|
天地洪炉抽卡特殊处理
|
2022-01-22 16:24:57 +08:00 |
yuanshuai
|
1367f81092
|
天地洪炉bug修改
|
2022-01-10 13:44:39 +08:00 |
yuanshuai
|
058cb045ce
|
天地洪炉bug修改提交
|
2022-01-10 13:42:45 +08:00 |
yuanshuai
|
e9b492ee5d
|
天地洪炉抽奖bug修改
|
2022-01-10 12:07:44 +08:00 |
duhui
|
c03ae4a02f
|
易经宝库gm
|
2022-01-06 18:14:26 +08:00 |
xuexinpeng
|
a7c2a5a71f
|
森罗幻境自动挂机返回掉落展示清除
|
2022-01-06 16:25:22 +08:00 |
duhui
|
718ca61a46
|
Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# tablemanager/src/main/java/config/SHomeLand.java
# tablemanager/src/main/java/config/SHomeLandLevel.java
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-06 16:15:00 +08:00 |
xuexinpeng
|
5031f7d9e8
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2022-01-06 16:08:27 +08:00 |
xuexinpeng
|
a58b5f8948
|
删除没用引用
|
2022-01-06 16:07:45 +08:00 |
duhui
|
8946f22d57
|
【法宝聚灵&跨服rpc】
1、聚灵表添加新列
2、rpc方法添加catch,简化log
|
2022-01-06 14:59:08 +08:00 |
duhui
|
c82267c4ea
|
【法宝聚灵】
1、添加总星级属性
|
2022-01-06 13:45:37 +08:00 |
duhui
|
91c2a4bf0c
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-06 11:20:07 +08:00 |
duhui
|
06bdbf2a78
|
法宝聚灵优化,添加总星级属性加成
|
2022-01-06 11:12:26 +08:00 |
xuexinpeng
|
a1fbed11b2
|
单笔充值领奖活动
|
2022-01-05 18:34:53 +08:00 |
duhui
|
0689f52cbe
|
【家园功能1.1.16】
1、建筑升级,解决特权加速时间bug2
|
2022-01-05 16:07:50 +08:00 |
duhui
|
ff205bd900
|
【家园功能1.1.15】
1、建筑升级,解决特权加速时间bug
|
2022-01-05 15:46:22 +08:00 |
duhui
|
a0de4fd484
|
【家园功能1.1.14】
1、处理装备强化逻辑bug2
|
2022-01-05 15:03:28 +08:00 |
duhui
|
1e11b909fc
|
【家园功能1.1.13】
1、处理装备强化逻辑bug
|
2022-01-05 14:28:35 +08:00 |
duhui
|
e912f389ca
|
【家园功能1.1.12】
1、代码优化,防止空指针
|
2022-01-05 13:38:55 +08:00 |
duhui
|
fb9f074c17
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-05 10:18:43 +08:00 |
duhui
|
215cc76897
|
【家园功能1.1.11】
1、装备升级优化
|
2022-01-05 10:15:17 +08:00 |
duhui
|
2707c018f0
|
【家园功能1.1.10】
1、zhuang bei sheng ji
|
2022-01-04 18:34:57 +08:00 |
duhui
|
bd9c2e002a
|
【家园功能1.1.9】
1、特权收益加成修改
|
2022-01-04 15:55:50 +08:00 |
jiahuiwen
|
567a46b4ad
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-04 14:33:01 +08:00 |
jiahuiwen
|
5e51e9c8dc
|
删除多余代码
|
2022-01-04 14:27:28 +08:00 |
duhui
|
6870645ea4
|
代码格式处理,不影响逻辑
|
2022-01-04 11:50:35 +08:00 |
duhui
|
a6595b054e
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2022-01-04 11:45:13 +08:00 |
duhui
|
e9b526e61b
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:44:43 +08:00 |
jiahuiwen
|
e4e4715543
|
竞技试炼发奖励bug
|
2022-01-04 11:44:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
29dc23ed4e
|
跨服战斗,身外化身技能
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
6074368c60
|
删除多余代码
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
925b9688c0
|
神将回退突破等级归 0
|
2022-01-04 11:44:41 +08:00 |
jiahuiwen
|
71ecc1510a
|
超值返利删除容错代码
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
454388b731
|
神将回退卸下魂印bug
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
70ce7e3446
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
812f8ac7d1
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
7642a5b5fb
|
神将回退增加上报
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
8d014c2269
|
减少玩家数据在内存时间
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
9284eb0e48
|
删除无用代码
|
2022-01-04 11:44:37 +08:00 |
yuanshuai
|
352a586ae2
|
超值返利网页支付重复购买礼包问题修改
|
2022-01-04 11:44:36 +08:00 |
yuanshuai
|
b870b9afa2
|
命石快速合成bug修改
|
2022-01-04 11:44:36 +08:00 |
jiahuiwen
|
61b3a6113e
|
逐胜商店刷新错误
|
2022-01-04 11:44:35 +08:00 |
yuanshuai
|
c8f9014741
|
命石一键合成bug修改
|
2022-01-04 11:44:34 +08:00 |
yuanshuai
|
b8de92f98c
|
添加批量删除道具GM
|
2022-01-04 11:44:12 +08:00 |
yuanshuai
|
93555c633d
|
命石快速合成脚本修改提交
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
0414793568
|
命石快速合成脚本优化
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
d17c6cdec9
|
命格脚本修改
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
2028b3cfe2
|
命格脚本优化
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
f06acc6801
|
命格脚本优化
|
2022-01-04 11:43:21 +08:00 |
yuanshuai
|
946d97a7d4
|
脚本优化
|
2022-01-04 11:43:20 +08:00 |
yuanshuai
|
4a2f7fc95e
|
整理代码
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
a66ff0d2ba
|
添加命格计算战斗力逻辑
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
487722d6ac
|
命格脚本提交
|
2022-01-04 11:43:05 +08:00 |
yuanshuai
|
a58adbbb18
|
超值返利网页支付bug修改
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
7c21b147a0
|
返还道具bug
|
2022-01-04 11:41:54 +08:00 |
xuexinpeng
|
ebae30feef
|
战斗星级
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
64f4f644de
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
30111415c0
|
补充
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
eb504fd20c
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
17242edf01
|
获取活动开启时间
|
2022-01-04 11:41:53 +08:00 |
jiahuiwen
|
6e3b1b5be9
|
升星配方调整补偿
|
2022-01-04 11:41:53 +08:00 |
duhui
|
5312fc728c
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:40:52 +08:00 |
jiahuiwen
|
458b8a8165
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-04 11:05:02 +08:00 |
jiahuiwen
|
affe194539
|
竞技试炼发奖励bug
|
2022-01-04 11:02:41 +08:00 |
xuexinpeng
|
f6ac2a88bd
|
探索时间戳进位
|
2021-12-31 17:33:31 +08:00 |
xuexinpeng
|
3b14b27161
|
探索
|
2021-12-31 14:03:07 +08:00 |
xuexinpeng
|
64df199aee
|
探索
|
2021-12-31 13:49:24 +08:00 |
duhui
|
a56918a674
|
【家园功能1.1.8】
1、装备强化增加战力修改
|
2021-12-31 13:39:41 +08:00 |
jiahuiwen
|
50d5195692
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-31 10:49:12 +08:00 |
jiahuiwen
|
ffb0488e50
|
赠送好友友情点bug
|
2021-12-31 10:49:04 +08:00 |
xuexinpeng
|
82dde4cdb8
|
森罗幻境自动挂机奖励展示
|
2021-12-31 10:36:32 +08:00 |
duhui
|
b1c4e0ba35
|
【家园功能1.1.7】
1、装备方法bug修改
|
2021-12-31 10:22:49 +08:00 |
duhui
|
3dab8bf18c
|
【家园功能1.1.6】
1、家园装备强化展示
|
2021-12-30 18:34:43 +08:00 |
xuexinpeng
|
188ea389e6
|
森罗幻境自动挂机奖励展示
|
2021-12-30 18:19:24 +08:00 |
yuanshuai
|
c3553579e2
|
新增被动技能注释
|
2021-12-30 17:40:47 +08:00 |
duhui
|
6cbd8104e7
|
云游商人,装备升级逻辑修改
|
2021-12-30 17:09:45 +08:00 |
yuanshuai
|
8ac39917af
|
牛魔王4火不生效bug修改(添加了一个被动技能)
|
2021-12-30 16:23:13 +08:00 |
duhui
|
9e433e1969
|
【家园功能1.1.5】
1、家园特权功能添加
|
2021-12-30 16:09:24 +08:00 |
duhui
|
a61999d664
|
【家园功能1.1.4(特殊)】
1、删除栖云阁一键领取代码,之后有需要可以从本次提交找回
|
2021-12-30 15:21:27 +08:00 |
duhui
|
6b139b482e
|
【家园功能1.1.3】
1、装备强化验证bug修改
|
2021-12-30 13:51:29 +08:00 |
xuexinpeng
|
16fc0ffbbb
|
离线探索
|
2021-12-30 13:34:34 +08:00 |
xuexinpeng
|
bb1bea214f
|
探索
|
2021-12-30 10:26:22 +08:00 |
xuexinpeng
|
f4f027c40c
|
探索
|
2021-12-29 18:24:24 +08:00 |
duhui
|
7c19af673d
|
【家园功能1.1.2】
1、装备强化表数据修改
|
2021-12-29 18:20:43 +08:00 |
xuexinpeng
|
35c2547c89
|
探索
|
2021-12-29 17:44:51 +08:00 |
xuexinpeng
|
b816997e38
|
探索
|
2021-12-29 19:16:02 +08:00 |
xuexinpeng
|
dae028d07f
|
探索
|
2021-12-29 19:05:13 +08:00 |
xuexinpeng
|
28e984d9e9
|
探索
|
2021-12-29 19:01:26 +08:00 |
xuexinpeng
|
4ea6f544cb
|
探索
|
2021-12-29 17:26:42 +08:00 |
duhui
|
dc71d70ad2
|
【家园功能1.1.1】
1、建筑解锁修改
|
2021-12-29 17:08:18 +08:00 |
yuanshuai
|
e8fd75b925
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2021-12-29 15:17:19 +08:00 |
duhui
|
07dfc01d30
|
【家园功能1.1.0】
1、任务功能完善
2、添加装备突破功能
3、装备强化信息添加到英雄信息
4、跨服添加家园装备强化信息
|
2021-12-29 15:12:02 +08:00 |
yuanshuai
|
455cccd059
|
飞升跑马灯脚本提交
|
2021-12-29 14:55:38 +08:00 |
xuexinpeng
|
5e811fb9aa
|
探索血量更新
|
2021-12-28 18:25:41 +08:00 |
xuexinpeng
|
eab1eb0b89
|
探索
|
2021-12-28 18:02:46 +08:00 |
duhui
|
e5fc1ea28c
|
【家园功能1.0.9】建筑升级只允许一次升级一个建筑,装备强化bug优化
|
2021-12-28 17:39:20 +08:00 |
xuexinpeng
|
705e81c629
|
探索
|
2021-12-28 16:32:49 +08:00 |
jiahuiwen
|
973c2b9ce8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-28 15:24:45 +08:00 |
jiahuiwen
|
bf85dfec3c
|
超值返利删除容错代码
|
2021-12-28 15:24:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
97bd55af89
|
跨服战斗,身外化身技能
|
2021-12-28 15:21:14 +08:00 |
yuanshuai
|
9b31eeadc9
|
飞升脚本修改提交
|
2021-12-28 15:07:39 +08:00 |
duhui
|
ee97a40004
|
【家园功能1.0.8】建筑解锁推送修改,只推送解锁的建筑
|
2021-12-28 14:59:59 +08:00 |
xuexinpeng
|
3c5f29e2e5
|
探索 测试 不扣消耗
|
2021-12-28 14:33:23 +08:00 |
ZhangBiao
|
304d1da7ef
|
[家园功能1.0.7]建筑解锁Indication修改
|
2021-12-28 11:52:54 +08:00 |
ZhangBiao
|
c7a22e0787
|
[家园功能1.0.6]建筑收益bug修改
|
2021-12-28 11:12:31 +08:00 |
xuexinpeng
|
6b07593757
|
探索
|
2021-12-27 18:36:31 +08:00 |
jiahuiwen
|
71eb51d017
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:18:57 +08:00 |
jiahuiwen
|
89f4eae73e
|
删除多余代码
|
2021-12-27 17:18:31 +08:00 |
jiahuiwen
|
313053ed5d
|
神将回退突破等级归 0
|
2021-12-27 17:17:56 +08:00 |
jiahuiwen
|
811d67c536
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:00:18 +08:00 |
duhui
|
937c740ebd
|
【家园功能1.0.5】建筑升级前置条件判断,添加长度验证
|
2021-12-27 16:56:32 +08:00 |
jiahuiwen
|
7ebd8878de
|
神将回退卸下魂印bug
|
2021-12-27 16:55:11 +08:00 |
xuexinpeng
|
87bcc6d5d7
|
探索
|
2021-12-27 16:33:32 +08:00 |
yuanshuai
|
6faac1d034
|
超值返利网页支付bug修改
|
2021-12-27 16:24:46 +08:00 |
jiahuiwen
|
ac30e70c2e
|
神将回退bug
|
2021-12-27 16:11:51 +08:00 |
jiahuiwen
|
5f04e68e3d
|
神将回退bug
|
2021-12-27 16:09:56 +08:00 |
jiahuiwen
|
9c998b86e6
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 16:01:30 +08:00 |
jiahuiwen
|
4ee0f7b5f2
|
神将回退bug
|
2021-12-27 15:57:09 +08:00 |
duhui
|
bee333690e
|
【家园功能1.0.4】无用代码删除,不影响原有逻辑
|
2021-12-27 14:57:24 +08:00 |
jiahuiwen
|
ecd017281d
|
神将回退增加上报
|
2021-12-27 14:25:21 +08:00 |
duhui
|
fed5fcf59b
|
【家园功能1.0.4】日志完善内容
|
2021-12-27 14:01:55 +08:00 |
duhui
|
ad1cf08eae
|
【家园功能1.0.3】建筑升级添加前置建筑等级验证,建筑解锁逻辑优化
|
2021-12-27 13:45:47 +08:00 |
duhui
|
4e852db95b
|
【家园功能1.0.2】生产建筑存储总上限修改,部分建筑生产无总上限,只有领取上限
|
2021-12-27 11:47:40 +08:00 |
jiahuiwen
|
b88a69ef3a
|
减少玩家数据在内存时间
|
2021-12-27 10:25:35 +08:00 |
xuexinpeng
|
8f0010b1be
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2021-12-27 10:04:54 +08:00 |
xuexinpeng
|
6a6cbaca50
|
探索
|
2021-12-27 10:02:59 +08:00 |
duhui
|
20b1c958e5
|
【家园功能1.0.1】任务优化,添加升级取消功能
|
2021-12-24 18:20:10 +08:00 |
jiahuiwen
|
c6d13b6685
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-12-24 17:52:59 +08:00 |
jiahuiwen
|
4132cd1f80
|
删除无用代码
|
2021-12-24 17:52:09 +08:00 |
duhui
|
6f3c8768bf
|
【家园功能1.0】待联调
|
2021-12-24 17:07:57 +08:00 |
jiahuiwen
|
8f47418546
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-24 13:55:10 +08:00 |
jiahuiwen
|
0602b9f003
|
逐胜商店刷新错误
|
2021-12-24 13:55:03 +08:00 |
xuexinpeng
|
b9cc3dec5f
|
探索
|
2021-12-24 11:29:51 +08:00 |
yuanshuai
|
93596965dd
|
超值返利网页支付重复购买礼包问题修改
|
2021-12-24 09:49:28 +08:00 |
yuanshuai
|
540e61d512
|
超值返利网页支付bug修改
|
2021-12-23 16:05:15 +08:00 |
yuanshuai
|
5cedfa6e4e
|
命石快速合成bug修改
|
2021-12-23 15:14:43 +08:00 |
yuanshuai
|
9b545e5eea
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
|
2021-12-23 09:53:52 +08:00 |
yuanshuai
|
4de94d16ea
|
飞升脚本提交
|
2021-12-23 09:51:48 +08:00 |
xuexinpeng
|
503ef57f57
|
探索
|
2021-12-22 18:04:05 +08:00 |
jiahuiwen
|
a9df7aa7e0
|
返还道具bug
|
2021-12-22 10:54:44 +08:00 |
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
|
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 |
yuanshuai
|
ce4d17763f
|
新增道具类型
|
2021-12-15 13:01:44 +08:00 |
jiahuiwen
|
3b112b0dff
|
回退不飘字
|
2021-12-15 10:57:50 +08:00 |
jiahuiwen
|
1f08ca2f33
|
回退所得神将不更新任务或活动
|
2021-12-15 09:45:00 +08:00 |
jiahuiwen
|
edf251cd1f
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-14 17:58:42 +08:00 |
jiahuiwen
|
53b29d606e
|
神将回退
|
2021-12-14 17:58:31 +08:00 |
yuanshuai
|
9a02fbc459
|
使用资源包道具修改脚本提交
|
2021-12-14 17:40:30 +08:00 |
yuanshuai
|
b865fac770
|
新增经验和金币收益道具脚本提交
|
2021-12-14 17:37:27 +08:00 |
yuanshuai
|
23b2c9285e
|
命石一键合成bug修改
|
2021-12-14 16:06:41 +08:00 |
yuanshuai
|
2fcf50d33e
|
添加批量删除道具GM
|
2021-12-14 14:55:59 +08:00 |
xuexinpeng
|
8313116aa3
|
御剑行活动配置
|
2021-12-14 13:45:12 +08:00 |
xuexinpeng
|
0117de31fc
|
探索地图
|
2021-12-14 11:45:17 +08:00 |
yuanshuai
|
1ee2a60fc0
|
命石快速合成脚本修改提交
|
2021-12-13 18:41:46 +08:00 |
yuanshuai
|
9a2bf80a9b
|
脚本优化
|
2021-12-13 17:34:19 +08:00 |
yuanshuai
|
69607c3c66
|
命石快速合成脚本优化
|
2021-12-13 16:23:32 +08:00 |
jiahuiwen
|
bdc1aa723a
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 16:10:24 +08:00 |
jiahuiwen
|
9d232a7783
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-13 16:07:02 +08:00 |
jiahuiwen
|
aa4341c12b
|
无尽秘宝,英雄升星需要增加数量
|
2021-12-13 16:06:55 +08:00 |
yuanshuai
|
ce6b4d239b
|
关卡限制脚本优化
|
2021-12-13 14:55:23 +08:00 |
jiahuiwen
|
08ca89a90f
|
开商店
|
2021-12-13 14:44:08 +08:00 |
jiahuiwen
|
586945be2c
|
删除报错
|
2021-12-13 14:05:11 +08:00 |
jiahuiwen
|
1f952efa98
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2021-12-13 14:04:18 +08:00 |
jiahuiwen
|
bbc555db7c
|
删活动
|
2021-12-13 14:04:12 +08:00 |
yuanshuai
|
312ad1cd58
|
主线关卡限制条件增加
|
2021-12-13 12:04:33 +08:00 |
jiahuiwen
|
ea6ebeb278
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 11:56:42 +08:00 |
jiahuiwen
|
8a5b72f0fa
|
消除编译错误
|
2021-12-13 11:55:29 +08:00 |
jiahuiwen
|
450ab39a7e
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 11:38:56 +08:00 |
jiahuiwen
|
308f406daa
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-13 11:38:23 +08:00 |
jiahuiwen
|
292b395dfe
|
优化
|
2021-12-13 11:38:12 +08:00 |
jiahuiwen
|
a19352578e
|
登录检测已开启的活动,商店是否开启
|
2021-12-13 11:30:53 +08:00 |
yuanshuai
|
0b34d98e99
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2021-12-13 10:49:37 +08:00 |
yuanshuai
|
ea545c50ac
|
主线关卡限制条件增加
|
2021-12-13 10:12:29 +08:00 |
yuanshuai
|
8a77b7c2d5
|
添加关卡附加条件功能提交
|
2021-12-10 18:43:49 +08:00 |
duhui
|
9a7a6f71f5
|
公会boss伤害超上限
|
2021-12-10 18:27:30 +08:00 |
duhui
|
8d7394d1ac
|
公会boss伤害超上限
|
2021-12-10 16:44:38 +08:00 |
duhui
|
1af8836d72
|
注释修改
|
2021-12-10 16:24:53 +08:00 |
duhui
|
143c7a5230
|
招募秘宝
|
2021-12-10 14:24:47 +08:00 |
yuanshuai
|
72637c0ec5
|
命格脚本修改
|
2021-12-10 14:03:45 +08:00 |
yuanshuai
|
09cd66d6ca
|
命格脚本优化
|
2021-12-10 11:03:32 +08:00 |
yuanshuai
|
9060e00553
|
命格脚本优化
|
2021-12-10 09:55:51 +08:00 |
jiahuiwen
|
02807f9c49
|
关闭 云梦祈福
|
2021-12-09 16:22:35 +08:00 |
jiahuiwen
|
50118efe42
|
优化打印
|
2021-12-09 15:34:45 +08:00 |
jiahuiwen
|
33546f01b2
|
增加保存
|
2021-12-09 15:26:51 +08:00 |
jiahuiwen
|
3ba82851fd
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-09 14:14:51 +08:00 |
jiahuiwen
|
afa8040533
|
竞技试炼
|
2021-12-09 14:14:39 +08:00 |
duhui
|
32a5f49782
|
连续礼包补充
|
2021-12-09 11:44:19 +08:00 |
duhui
|
c555ca977f
|
连续礼包,礼包id重复问题处理
|
2021-12-09 11:32:58 +08:00 |
yuanshuai
|
b8de907745
|
脚本优化
|
2021-12-09 10:11:14 +08:00 |
yuanshuai
|
be54f4627d
|
整理代码
|
2021-12-08 17:13:16 +08:00 |
yuanshuai
|
1455339b03
|
添加命格计算战斗力逻辑
|
2021-12-08 17:03:28 +08:00 |
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 |
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 |
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
|
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 |
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 |