Commit Graph

4385 Commits (869b8400f05bdf31cf4a7de6e14a3f3dbe71301f)
 

Author SHA1 Message Date
duhui 869b8400f0 战斗同步 2020-12-28 12:20:39 +08:00
duhui dffe1b81b9 新将血量修改1.1 2020-12-28 11:12:16 +08:00
duhui 225e58e5ee 新将,血量计算修改 2020-12-28 11:03:39 +08:00
duhui 70dec4bc49 战斗同步 2020-12-28 10:34:53 +08:00
lvxinran ef6347f38d Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
2020-12-26 18:37:54 +08:00
lvxinran 09b18714f0 好友上限申请修改 2021-01-09 00:00:00 +08:00
lvxinran b603634e6b 十绝阵暂时关闭 2021-01-01 21:37:04 +08:00
lvxinran 53b1dc1480 森罗小怪红点 2021-01-01 19:35:29 +08:00
duhui 3a9ab2167d Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-12-25 10:07:42 +08:00
lvxinran 3e87cb50d6 竞技场埋点 2021-01-01 01:36:57 +08:00
lvxinran 9a3c3fc9dc 竞技场挑战 2021-01-01 01:36:01 +08:00
lvxinran 7118b6a40c 巅峰赛埋点 2021-01-01 01:35:18 +08:00
lvxinran 2de51c477f 忽略协议文件 2021-01-01 01:34:58 +08:00
duhui a1cea20bdc 新将来袭活动结束,清空道具 2020-12-25 10:06:22 +08:00
duhui 41ee275964 新将boss,改获取伤害为获取血量 2020-12-24 18:53:27 +08:00
duhui 0e9e5e6502 新将伤害溢出问题 2020-12-24 18:26:49 +08:00
lvxinran fbdad03acd 小怪数量修改 2021-01-01 00:20:38 +08:00
lvxinran 8aa67eb6bf 森罗 无尽bug修改 2021-01-01 00:05:11 +08:00
lvxinran d6775fc511 跨服十绝阵暂时关闭 2021-01-01 00:04:20 +08:00
lvxinran afdd25f829 怪物战力修改 2021-01-01 00:04:06 +08:00
lvxinran 12b0160f3a 表报错修改 2021-01-01 00:03:53 +08:00
duhui cc10b2aab4 战斗同步 2020-12-24 17:14:38 +08:00
zhangshanxue 03ea28558f Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-20 23:01:52 +08:00
zhangshanxue b17ef4d6f4 膜拜limit 2021-02-20 20:37:51 +08:00
zhangshanxue de27c8aea3 跨服提交 2021-02-20 20:13:15 +08:00
zhangshanxue 7f991f8045 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-20 20:11:01 +08:00
zhangshanxue a0486a2da1 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
2021-01-18 01:41:19 +08:00
zhangshanxue 71821d360b 跨服服务器 2021-01-18 01:40:33 +08:00
zhangshanxue 040711b793 跨服服务器 2021-01-18 01:40:05 +08:00
zhangshanxue c160bca82e Merge branch 'master_online_hw' into master_test_hw 2021-02-08 01:28:00 +08:00
zhangshanxue e3b2fedbcd 跨服服务器 2021-02-08 01:25:47 +08:00
zhangshanxue fd681d5350 Merge branch 'master_test_hw' into master_test_hw_server_arena
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/core/VipPrivilegeType.java
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionBetInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/champion/ChampionGuessHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_global_gm.java
#	serverlogic/src/main/java/com/ljsd/jieling/ktbeans/ReportUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ArenaRank.java
#	tablemanager/src/main/java/config/SPassiveSkillLogicConfig.java
2021-02-08 01:17:41 +08:00
zhangshanxue e004d4d76c 跨服服务器 2021-02-08 01:06:51 +08:00
zhangshanxue b7b1154a68 跨服服务器 2021-01-30 00:15:10 +08:00
lvxinran 29b4dc5fdd 十绝阵key修改 2021-01-08 14:19:24 +08:00
duhui 3115844973 防止冲突,缓存减少一分钟 2020-12-24 16:07:07 +08:00
lvxinran c9cb1430c3 文件忽略提交 2020-12-24 14:06:12 +08:00
duhui 98d95f187a 修改proto路径后,合并代码战斗补充 2020-12-24 10:09:51 +08:00
duhui 645718da78 Merge branch 'master_test_hw' into dev_dh_chechi
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/GmService.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/StartExpeditionBattleRequest.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/monsterAttack/QuickStartMonsterFighter.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightRecordLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/result/FightResult.java
#	tablemanager/src/main/java/config/SGlobalSystemConfig.java
2020-12-24 10:04:18 +08:00
lvxinran 9634301446 代码类型修改 2020-12-30 03:14:18 +08:00
lvxinran bcf5191e7f 协议位置修改 2020-12-30 03:11:14 +08:00
lvxinran 4908ac4145 errorcode修改 2020-12-30 02:10:45 +08:00
lvxinran d872a55549 错误提示提交 2020-12-30 00:26:13 +08:00
lvxinran 23f35b428e 车迟斗法过时提示 2020-12-30 00:25:48 +08:00
lvxinran 697e2892a8 添加好友提示 2020-12-30 00:25:26 +08:00
lvxinran a520eb96db 礼包购买刷新修改0点 2020-12-30 00:25:11 +08:00
lvxinran 3df4fb246d 灵兽放生等级限制 2020-12-30 00:24:54 +08:00
duhui e1ee6d7b69 Merge branch 'master_test_hw' into dev_dh_xinjiang 2020-12-23 11:23:08 +08:00
duhui 71791a4342 降妖夺宝 2020-12-22 17:44:05 +08:00
zhangshanxue 025128b6ec 巅峰赛 竞猜币补发 2020-12-22 17:42:32 +08:00