duhui
|
50ce973616
|
Merge branch 'master_test_hw' into master_test_hw_four_challenge
|
2021-03-08 15:21:46 +08:00 |
|
duhui
|
d887ff2d90
|
Merge branch 'master_test_hw' into master_test_hw_four_challenge
|
2021-02-12 14:21:21 +08:00 |
|
duhui
|
7c348f0833
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.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/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/hero/SaveHeroChangeRequestHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
# tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
# tablemanager/src/main/java/config/SItem.java
# tablemanager/src/main/java/config/SJewelConfig.java
|
2021-01-07 14:31:08 +08:00 |
|
duhui
|
e3391faa6e
|
鸿蒙阵1.0，存在bug正在修改
|
2020-12-25 14:21:57 +08:00 |
|
duhui
|
5fce8f9920
|
神树配置表字段添加
|
2020-12-15 15:02:44 +08:00 |
|
duhui
|
ad8641f96c
|
建木神树初版，未测试
|
2020-12-11 11:30:41 +08:00 |
zhangshanxue
|
f75b7ad1cc
|
Task【ID1006177】【新战斗版本】宝物合成
|
2020-05-11 11:37:55 +08:00 |
lvxinran
|
d4a0550657
|
宝器 每日副本 代码提交
|
2020-04-27 15:15:58 +08:00 |