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 |