duhui
|
b65b1b625a
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-17 14:10:15 +08:00 |
duhui
|
1cd71db5cb
|
1.大闹天宫,招募英雄逻辑重写
2.竞技场,机器人突破id计算逻辑重写
3.公会排行榜,添加非空验证
|
2021-03-17 14:09:55 +08:00 |
lvxinran
|
aa9fee7c60
|
buff类型回滚
|
2021-03-16 17:43:22 +08:00 |
lvxinran
|
0a7bc08b07
|
战斗同步
|
2021-03-16 14:15:18 +08:00 |
duhui
|
bf0ab56a93
|
大闹天宫,随机阵容问题处理
|
2021-03-16 11:14:27 +08:00 |
duhui
|
028c534428
|
四灵试炼,助战重写(算上鸿蒙阵加成)
|
2021-03-16 09:58:26 +08:00 |
duhui
|
0567561cee
|
大闹天宫,boos节点和精英节点战力问题解决
|
2021-03-16 09:49:37 +08:00 |
mengchengzhen
|
409b7a3468
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-15 18:50:19 +08:00 |
mengchengzhen
|
eff18fe054
|
danaotiangong update
|
2021-03-15 18:50:12 +08:00 |
duhui
|
15fbc91a9b
|
原有的升级通知更换到setLevel外边,因为这个方法不只是升级用,也可能归送
hero实现clone接口,对象克隆
|
2021-03-15 16:18:16 +08:00 |
lvxinran
|
16106ae6d0
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-03-15 11:27:33 +08:00 |
lvxinran
|
870c524ca4
|
充值修改
|
2021-03-15 11:27:05 +08:00 |
lvxinran
|
6804684744
|
非空判断
|
2021-03-15 11:11:21 +08:00 |
lvxinran
|
8966f25c5b
|
限时神装
|
2021-03-15 11:09:03 +08:00 |
lvxinran
|
75336f12d9
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-03-15 09:53:07 +08:00 |
lvxinran
|
72d408063d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-03-15 09:52:06 +08:00 |
lvxinran
|
9fbb26d855
|
离线逻辑修改
|
2021-03-15 09:52:01 +08:00 |
duhui
|
262fd27218
|
鸿蒙阵,等级突破问题
|
2021-03-12 16:40:19 +08:00 |
mengchengzhen
|
8fa36b3b1a
|
dntg bug
|
2021-03-11 21:01:10 +08:00 |
duhui
|
9e488abe4e
|
鸿蒙阵突破等级
|
2021-03-11 18:34:36 +08:00 |
duhui
|
f086046586
|
符号
|
2021-03-11 18:27:32 +08:00 |
duhui
|
e01097fabc
|
鸿蒙阵突破共鸣问题
|
2021-03-11 18:19:09 +08:00 |
duhui
|
f85e86a2eb
|
公告问题
|
2021-03-11 17:12:52 +08:00 |
mengchengzhen
|
d4e5a2b6a4
|
holy 37type update
|
2021-03-11 17:02:35 +08:00 |
duhui
|
f73102ff3b
|
竖线格式化
|
2021-03-11 16:53:01 +08:00 |
mengchengzhen
|
0173bd1fa0
|
robotskill update
|
2021-03-11 15:39:45 +08:00 |
duhui
|
888a04a023
|
助战小bug修改
|
2021-03-11 11:19:31 +08:00 |
lvxinran
|
cfd88aa051
|
转换
|
2021-03-10 17:32:25 +08:00 |
lvxinran
|
f0abc728be
|
阈值修改提交
|
2021-03-10 17:29:28 +08:00 |
lvxinran
|
dbcb1f98f9
|
阈值修改
|
2021-03-10 16:56:08 +08:00 |
lvxinran
|
5d7fad815e
|
修改阈值冲突
|
2021-03-10 16:16:22 +08:00 |
lvxinran
|
ecde209b04
|
Merge branch 'master_test_gn' into master_test_gn_datatype
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java
# tablemanager/src/main/java/config/SCHero.java
|
2021-03-10 16:13:37 +08:00 |
duhui
|
b1d5c773c2
|
四灵试炼,跑马灯
|
2021-03-10 16:09:24 +08:00 |
mengchengzhen
|
b83f8583ec
|
danaotiangong battlenode
|
2021-03-10 15:17:47 +08:00 |
mengchengzhen
|
8e5e1dc6b2
|
战斗
|
2021-03-10 11:28:29 +08:00 |
mengchengzhen
|
43f14ff544
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
# Conflicts:
# luafight/Modules/Battle/Logic/Base/Passivity.lua
|
2021-03-10 11:27:24 +08:00 |
mengchengzhen
|
7bba32a458
|
danaotiangong
|
2021-03-10 11:24:14 +08:00 |
duhui
|
14f3dd54e3
|
建木神树,跑马灯
|
2021-03-10 11:22:58 +08:00 |
mengchengzhen
|
d31e186de2
|
danaotiangong zhandou
|
2021-03-10 11:22:03 +08:00 |
duhui
|
3ff5d19972
|
四灵试炼,跑马灯
|
2021-03-10 11:16:21 +08:00 |
duhui
|
06a18387ed
|
Merge branch 'master_test_hw' into dh_dev_HavocInHeaven
|
2021-03-10 11:02:56 +08:00 |
mengchengzhen
|
9fe8dd3e5f
|
大闹天宫圣物修改
|
2021-03-10 10:28:59 +08:00 |
duhui
|
53aa975368
|
Revert "查看他人装备共鸣"
This reverts commit 36b669d9e9 .
|
2021-03-09 16:06:17 +08:00 |
duhui
|
e46c9b42ab
|
二次提交
|
2021-03-09 16:04:12 +08:00 |
duhui
|
36b669d9e9
|
查看他人装备共鸣
|
2021-03-09 16:02:49 +08:00 |
lvxinran
|
f2a0fffe24
|
敏感字修改
|
2021-03-09 15:48:48 +08:00 |
duhui
|
0b60f9c4f7
|
表字段添加,战力排行榜查看他人共鸣熟悉
|
2021-03-09 15:29:49 +08:00 |
lvxinran
|
269d7e07e2
|
越南敏感字
|
2021-03-08 16:00:55 +08:00 |
duhui
|
3a3b2725e3
|
redis批量查询key问题处理
|
2021-03-08 15:29:40 +08:00 |
duhui
|
50ce973616
|
Merge branch 'master_test_hw' into master_test_hw_four_challenge
|
2021-03-08 15:21:46 +08:00 |