duhui
|
c2d127e325
|
注释
|
2021-02-12 14:11:20 +08:00 |
duhui
|
ca1b4f3fa8
|
Merge branch 'dev_dh_tree' into master_test_hw_four_challenge
# Conflicts:
# luafight/Modules/Battle/Logic/Base/Passivity.lua
# luafight/Modules/Battle/Logic/Misc/BattleUtil.lua
# luafight/Modules/Battle/Logic/Role/RoleLogic.lua
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
|
2021-01-26 11:26:56 +08:00 |
duhui
|
fa39c7eb9b
|
四灵试炼添加注释
|
2021-01-26 11:18:18 +08:00 |
lvxinran
|
8394061f97
|
四灵试炼提交
|
2020-12-27 19:05:39 +08:00 |
duhui
|
8f51736494
|
战斗同步
|
2020-12-24 17:13:36 +08:00 |
duhui
|
abcf1b4686
|
神树修改2.0
|
2020-12-18 18:12:12 +08:00 |
zhangshanxue
|
58b3f69aac
|
巅峰赛 竞猜币补发
|
2020-12-17 21:24:03 +08:00 |
lvxinran
|
3cf66b94fe
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/arena/ArenaChallengeHandler.java
|
2020-12-15 16:32:46 +08:00 |
duhui
|
fe8bc9ec57
|
建木神树二版,bug修改,添加注释
|
2020-12-14 16:47:32 +08:00 |
lvxinran
|
2e240b33d0
|
打点修改提交
|
2020-12-14 11:07:37 +08:00 |
lvxinran
|
1272ae01f8
|
宝物错误数据修改
|
2020-12-12 18:09:46 +08:00 |
lvxinran
|
1f0f27727b
|
宝物分解bug,竞猜打点提交
|
2020-12-12 17:51:29 +08:00 |
lvxinran
|
9784aa4c3f
|
公会排行榜
|
2020-12-20 06:09:08 +08:00 |
lvxinran
|
3c636a42be
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-12-18 05:03:08 +08:00 |
lvxinran
|
874fc8f2c5
|
森罗bug修改
|
2020-12-18 05:03:02 +08:00 |
lvxinran
|
543cca1864
|
大闹天宫皮肤添加
|
2020-12-12 14:45:49 +08:00 |
duhui
|
813ff75cfb
|
套装优化
|
2020-12-11 17:17:12 +08:00 |
duhui
|
ad8641f96c
|
建木神树初版,未测试
|
2020-12-11 11:30:41 +08:00 |
zhangshanxue
|
64700c9190
|
社稷积分
|
2020-12-10 16:37:14 +08:00 |
DESKTOP-98AVA47\Administrator
|
13849ac7b8
|
社稷大典积分恢复
|
2020-12-11 02:07:22 +08:00 |
duhui
|
86aee0e6ce
|
战斗同步
|
2020-12-10 16:32:17 +08:00 |
duhui
|
97077d9557
|
新将来袭活动文件补充
|
2020-12-09 14:01:59 +08:00 |
lvxinran
|
3e4b27fa9d
|
竞技场修改
|
2020-12-08 21:10:15 +08:00 |
zhangshanxue
|
5e0c455469
|
Merge branch 'master_online_hw' of http://60.1.1.230/backend/jieling_server into master_online_hw
|
2020-12-08 16:58:46 +08:00 |
zhangshanxue
|
220d2b802d
|
巅峰赛 记录bug
|
2020-12-08 16:58:38 +08:00 |
duhui
|
2ae47522f3
|
Merge branch 'dev_dh_xinjiang' into master_test_hw
|
2020-12-08 11:36:41 +08:00 |
lvxinran
|
a2a1edb290
|
战斗覆盖技能
|
2020-12-08 11:32:59 +08:00 |
duhui
|
d7b5a22965
|
竞技场积分加减1问题
|
2020-12-08 11:12:09 +08:00 |
duhui
|
e02da1d687
|
test
|
2020-12-08 11:06:24 +08:00 |
duhui
|
39505c9d24
|
竞技场分数+-1问题
|
2020-12-08 10:40:42 +08:00 |
zhangshanxue
|
3c16dbe91c
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-12-07 21:14:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
951e54fb0b
|
社稷大典跨期刷新
|
2020-12-15 21:38:46 +08:00 |
duhui
|
c1fcfcf3a2
|
新将活动应策划需求改版,掉落比例重新计算
|
2020-12-07 13:53:25 +08:00 |
zhangshanxue
|
92e5c50e24
|
大闹天宫圣物效果
|
2020-12-03 19:32:28 +08:00 |
zhangshanxue
|
08b85eb654
|
大闹天宫圣物效果
|
2020-12-03 16:23:56 +08:00 |
duhui
|
686596375d
|
新将来袭初版
|
2020-12-03 10:27:55 +08:00 |
lvxinran
|
b217c19431
|
竞技场排名优化
|
2020-12-03 10:06:22 +08:00 |
duhui
|
e31d779762
|
ID1007542
|
2020-12-02 14:17:04 +08:00 |
duhui
|
e0c2c51303
|
no message
|
2020-12-02 14:13:11 +08:00 |
duhui
|
21aec6d252
|
竞技场修改
|
2020-12-02 10:42:23 +08:00 |
duhui
|
ed7d883cce
|
临时提交2
|
2020-12-02 10:29:51 +08:00 |
zhangshanxue
|
904d77814f
|
Merge branch 'master_online_hw' into master_test_hw
|
2020-11-30 11:56:35 +08:00 |
zhangshanxue
|
93b394ce7e
|
【模块】大闹天宫-战斗后圣物刷新种类不正确
|
2020-11-30 11:55:29 +08:00 |
lvxinran
|
e1bae5947d
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-28 08:55:56 +08:00 |
lvxinran
|
2476e457af
|
挂机预览修改
|
2020-11-28 08:55:46 +08:00 |
lvxinran
|
f275342e67
|
物品上限添加
|
2020-11-27 18:49:25 +08:00 |
lvxinran
|
0494ff83f2
|
战斗同步
|
2020-11-27 16:52:55 +08:00 |
duhui
|
4051b4dd61
|
法宝升级通知
|
2020-11-27 14:19:14 +08:00 |
duhui
|
249580edf7
|
暂存,功能没写完
|
2020-11-27 14:07:56 +08:00 |
lvxinran
|
44a241b52c
|
Revert "鸿蒙碑初版"
This reverts commit 8057c913bb .
|
2020-11-27 10:58:29 +08:00 |