lvxinran
|
4b44ae7d04
|
重置进图点
|
2021-01-16 00:20:28 +08:00 |
duhui
|
f82b25d392
|
无尽副本,调试日志
|
2021-01-04 11:44:58 +08:00 |
lvxinran
|
f5c70afcb2
|
修改森罗保存阵容
|
2021-01-04 10:10:15 +08:00 |
duhui
|
541fb455fc
|
无尽副本调试日志添加
|
2020-01-08 00:04:51 +08:00 |
duhui
|
f8af824fcd
|
无尽副本优化中,bug修改
|
2020-12-31 16:36:45 +08:00 |
duhui
|
a1e4ca3f4c
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-08 10:15:04 +08:00 |
duhui
|
fc05c6a1cb
|
1.6版本优化,初版,待测试
|
2021-01-08 10:14:53 +08:00 |
lvxinran
|
5332a072b9
|
删除无用配置!!!!!!
|
2020-12-31 11:35:27 +08:00 |
lvxinran
|
0d19dcd30f
|
战斗里添加job字段
|
2020-12-31 10:03:05 +08:00 |
lvxinran
|
de1cc036ee
|
公会技能长按修改
|
2020-12-30 17:57:54 +08:00 |
lvxinran
|
b37c3146c9
|
gradle配置提交
|
2020-01-05 00:09:45 +08:00 |
lvxinran
|
d2c1b418a9
|
社稷大典埋点
|
2020-12-14 11:42:10 +08:00 |
lvxinran
|
fbc893124f
|
车迟斗法报错
|
2020-12-14 11:41:05 +08:00 |
lvxinran
|
e40d422d55
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-28 16:38:45 +08:00 |
lvxinran
|
d616cdb2d1
|
竞技场埋点 敏感字添加竞技守卫
|
2020-12-28 16:38:39 +08:00 |
duhui
|
0c851e6967
|
新将伤害计算修改1.2
|
2020-12-28 15:07:13 +08:00 |
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 |