Commit Graph

7096 Commits (caee7ba2a16ce7cd92bdacefe7ea878996232331)
 

Author SHA1 Message Date
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 be9cd576aa Merge branch 'master_prb_gn' into master_test_gn_zf 2022-01-26 14:11:15 +08:00
xuexinpeng 36e8abdb61 探索相关报错 2022-01-26 13:44:38 +08:00
xuexinpeng 6f9a1ee82c log相关 2022-01-25 13:43:02 +08:00
jiahuiwen 793b55cbac Merge branch 'master_prb_gn' into master_test_gn_zf 2022-01-25 09:50:17 +08:00
duhui e2c331f840 新增主角时装类型 2022-01-22 14:18:44 +08:00
xuexinpeng b36842bedd Merge branch 'master_prb_gn' into master_test_gn_zf 2022-01-21 17:25:19 +08:00
xuexinpeng 85969b7acf 探索bug 2022-01-21 17:19:47 +08:00
duhui df9f1501c2 家园特权,重复购买问题解决 2022-01-19 17:04:52 +08:00
jiahuiwen 2203e54375 优化代码 2022-01-18 16:31:48 +08:00
jiahuiwen a682067c20 Merge branch 'master_test_gn' into master_prb_gn 2022-01-18 09:56:37 +08:00
jiahuiwen 351909d5f3 鸿蒙阵推送 2022-01-18 09:56:28 +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
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
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
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