Commit Graph

6810 Commits (2791d19ee0869755c0d25f2eab913ff2282ecc6a)
 

Author SHA1 Message Date
duhui 3e3e5ee1bf 牛气冲天任务优化 2022-01-18 10:06:09 +08:00
jiahuiwen 06154fcb5c 删除测试日志 2022-01-17 19:01:16 +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