Commit Graph

6679 Commits (a29f8a08c2d15464c1ac91f1a7fb9a4dbc847c38)
 

Author SHA1 Message Date
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 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
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