duhui
|
129b9ed2ac
|
战斗同步
|
2021-03-02 17:14:52 +08:00 |
duhui
|
974891f80a
|
大闹天宫,遇敌
|
2021-03-01 11:01:24 +08:00 |
lvxinran
|
d8ef8d9e64
|
本地化修改
|
2021-02-27 06:43:48 +08:00 |
duhui
|
2dc01e8b26
|
大闹天宫,遇敌刷新逻辑修改
|
2021-02-26 11:29:44 +08:00 |
duhui
|
60231a23a5
|
鸿蒙阵,根据最大星级获取最大等级,走表
|
2021-02-25 11:11:54 +08:00 |
duhui
|
1099169d1f
|
大闹天宫,初版未完成
|
2021-02-25 10:34:05 +08:00 |
lvxinran
|
bf68a3b434
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-02-23 18:20:04 +08:00 |
lvxinran
|
0895fd0886
|
越南语字段
|
2021-02-23 18:19:32 +08:00 |
whb
|
cc2d7f9064
|
datatype
|
2021-02-23 15:54:00 +08:00 |
duhui
|
32b5f8d8fd
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
|
2021-02-19 11:06:29 +08:00 |
lvxinran
|
674c00ff98
|
工会关联表
|
2021-01-28 15:33:57 +08:00 |
lvxinran
|
633f531425
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-27 15:22:26 +08:00 |
lvxinran
|
6e396124ec
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2021-01-21 11:03:35 +08:00 |
lvxinran
|
ae79e8d410
|
扭转乾坤活动提交
|
2021-01-21 11:03:31 +08:00 |
duhui
|
36306b509e
|
0127挂机奖励计算
|
2021-01-20 10:05:46 +08:00 |
lvxinran
|
7b3b844be2
|
日志打印
|
2021-01-17 15:26:14 +08:00 |
lvxinran
|
e55325dd14
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-17 14:45:49 +08:00 |
duhui
|
664b4c748c
|
限时头像框
|
2021-01-15 17:40:56 +08:00 |
lvxinran
|
f28fd3a65d
|
抽卡校验修改
|
2021-01-14 17:22:19 +08:00 |
duhui
|
14d06145c9
|
Merge branch 'dh_dev_mail' into master_test_hw
邮件功能合并
|
2021-01-13 16:01:15 +08:00 |
duhui
|
6dab85335f
|
鸿蒙阵,breaId补充
|
2021-01-13 13:33:14 +08:00 |
duhui
|
1bc6fe656d
|
Merge branch 'master_test_hw' into master_test_hw_hongmeng
0120版本合并
|
2021-01-13 11:44:03 +08:00 |
duhui
|
0b580e8ce3
|
0120版本更新
1、竞技场机器人英雄显示bug处理
2、心魔试炼添加排名奖励功能实现
|
2021-01-13 11:38:48 +08:00 |
duhui
|
0c4041c74d
|
车迟斗法优化,根据boss更换排行奖励
|
2021-01-13 21:12:52 +08:00 |
duhui
|
d423925752
|
鸿蒙阵3.2
|
2021-01-08 18:36:58 +08:00 |
duhui
|
70a69c02af
|
邮件bug修改
|
2021-01-08 15:12:33 +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 |
lvxinran
|
202943d84f
|
Merge branch 'master_test_hw' into master_test_hw_i18n
|
2021-01-06 16:53:54 +08:00 |
duhui
|
a1eb022f14
|
鸿蒙阵3.0,成就任务
|
2021-01-05 18:39:35 +08:00 |
duhui
|
6084f9aa96
|
鸿蒙阵2.1
|
2021-01-05 12:15:25 +08:00 |
duhui
|
9c9f43d686
|
鸿蒙阵2.0
|
2021-01-04 15:11:00 +08:00 |
lvxinran
|
46d3d86d68
|
Merge branch 'master_test_hw' into master_test_hw_i18n
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/DeathPathLogic.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/logic/item/WorkShopLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
|
2021-01-01 01:51:02 +08:00 |
duhui
|
e3391faa6e
|
鸿蒙阵1.0,存在bug正在修改
|
2020-12-25 14:21:57 +08:00 |
lvxinran
|
12b0160f3a
|
表报错修改
|
2021-01-01 00:03:53 +08:00 |
zhangshanxue
|
de27c8aea3
|
跨服提交
|
2021-02-20 20:13:15 +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 |
duhui
|
c11dd1b1ce
|
战报功能二版
|
2020-12-18 13:50:34 +08:00 |
duhui
|
637f25930f
|
战报和法宝公告功能提交
|
2020-12-18 11:27:25 +08:00 |
zhangshanxue
|
c160bca82e
|
Merge branch 'master_online_hw' into master_test_hw
|
2021-02-08 01:28:00 +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
|
b7b1154a68
|
跨服服务器
|
2021-01-30 00:15:10 +08:00 |
duhui
|
a52f9e77ca
|
战报功能二版
|
2020-12-18 10:01:12 +08:00 |
duhui
|
9ea1ceec59
|
战报功能和法宝公告,初版未测试
|
2020-12-17 11:17:57 +08:00 |
duhui
|
5fce8f9920
|
神树配置表字段添加
|
2020-12-15 15:02:44 +08:00 |
duhui
|
813ff75cfb
|
套装优化
|
2020-12-11 17:17:12 +08:00 |
duhui
|
97077d9557
|
新将来袭活动文件补充
|
2020-12-09 14:01:59 +08:00 |
zhangshanxue
|
4bce4b8e96
|
跨服服务器
|
2020-12-07 14:44:12 +08:00 |
zhangshanxue
|
bfb89434cd
|
跨服服务器
|
2020-12-03 21:02:17 +08:00 |
lvxinran
|
44a241b52c
|
Revert "鸿蒙碑初版"
This reverts commit 8057c913bb .
|
2020-11-27 10:58:29 +08:00 |
lvxinran
|
e80c2b6e03
|
Revert "鸿蒙阵"
This reverts commit c1bc98d972 .
|
2020-11-27 10:58:18 +08:00 |
lvxinran
|
11ac7ec7ad
|
鸿蒙 切分支
|
2020-11-27 10:57:42 +08:00 |
jiahuiwen
|
c1bc98d972
|
鸿蒙阵
|
2020-11-26 20:24:33 +08:00 |
jiahuiwen
|
0ad0e87617
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-26 20:06:24 +08:00 |
jiahuiwen
|
8057c913bb
|
鸿蒙碑初版
|
2020-11-26 20:06:17 +08:00 |
lvxinran
|
5640521082
|
修改表数据
|
2020-11-23 15:18:28 +08:00 |
lvxinran
|
a8a99c38e9
|
技能修改
|
2020-12-01 04:08:02 +08:00 |
lvxinran
|
23bfdbe50f
|
灵兽抽卡修改
|
2020-11-16 21:09:43 +08:00 |
lvxinran
|
36304b135e
|
灵兽活动提交
|
2020-11-16 20:20:45 +08:00 |
jiahuiwen
|
5a84536aa6
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-11 09:57:25 +08:00 |
jiahuiwen
|
d646106de5
|
英雄觉醒飘字
|
2020-11-11 09:57:11 +08:00 |
zhangshanxue
|
16ded73f10
|
易经宝库道具回收
|
2020-11-17 16:59:04 +08:00 |
zhangshanxue
|
cd8fd29036
|
Merge branch 'master_test_hw' into master_test_hw_sub
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-11-06 16:24:38 +08:00 |
zhangshanxue
|
8e3704bf67
|
易经宝库提交
|
2020-11-06 16:22:53 +08:00 |
jiahuiwen
|
d1d38a85a0
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-06 16:12:42 +08:00 |
jiahuiwen
|
fd8e564a15
|
英雄觉醒
|
2020-11-06 16:12:37 +08:00 |
lvxinran
|
c2e5a9ca5a
|
类型修改提交
|
2020-11-06 15:13:06 +08:00 |
lvxinran
|
298d799594
|
技能皮肤修改
|
2020-11-06 15:11:18 +08:00 |
lvxinran
|
01620df5a9
|
Merge branch 'master_test_hw' into master_test_skin
|
2020-11-06 10:21:37 +08:00 |
lvxinran
|
7232b8604a
|
皮肤 头像修改
|
2020-11-03 05:25:17 +08:00 |
zhangshanxue
|
345de35e8e
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SheJiActivity.java
# tablemanager/src/main/java/config/SGodSacrificeSetting.java
|
2020-11-04 00:32:18 +08:00 |
zhangshanxue
|
45f74d5e52
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-11-04 00:28:11 +08:00 |
zhangshanxue
|
faf9a8e8db
|
社稷大典
|
2020-10-31 13:57:58 +08:00 |
lvxinran
|
aa94e3bc5b
|
英雄皮肤添加
|
2020-10-31 09:58:34 +08:00 |
zhangshanxue
|
763872915f
|
社稷大典公会排行
|
2020-10-31 14:02:38 +08:00 |
lvxinran
|
4f3c4fc8fb
|
灵兽系统消息添加
|
2020-10-28 16:51:51 +08:00 |
lvxinran
|
1fa383a2ed
|
首通奖励添加
|
2020-10-27 18:28:52 +08:00 |
lvxinran
|
89122562b5
|
怪物组内添加灵兽提交
|
2020-10-27 17:23:04 +08:00 |
lvxinran
|
c96a16f112
|
Merge branch 'master_test_hw' into master_test_hw_special_monster
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-10-27 13:56:10 +08:00 |
lvxinran
|
9f44b5de2a
|
无用日志
|
2020-10-27 13:53:49 +08:00 |
zhangshanxue
|
ecc95a79a4
|
社稷大典公会排行
|
2020-10-28 12:14:06 +08:00 |
zhangshanxue
|
210f4a1529
|
社稷大典代码提交
|
2020-10-25 17:00:00 +08:00 |
lvxinran
|
3dd49ea868
|
折扣 妖精抽卡次数提交
|
2020-10-24 15:52:25 +08:00 |
lvxinran
|
d054d48907
|
灵兽战斗数据添加
|
2020-10-23 13:38:08 +08:00 |
lvxinran
|
bf282624e7
|
灵兽提交
|
2020-10-22 20:26:40 +08:00 |
lvxinran
|
f5427e27a7
|
灵兽放生,涅槃
|
2020-10-22 14:48:26 +08:00 |
zhangshanxue
|
6e7465f17d
|
Merge branch 'master_test_hw' into master_test_hw_sheji
|
2020-10-21 16:27:13 +08:00 |
lvxinran
|
64744bb3bb
|
修改灵兽
|
2020-10-21 10:21:06 +08:00 |
jiahuiwen
|
871ba646e0
|
异妖可下阵
|
2020-10-20 20:08:36 +08:00 |
zhangshanxue
|
9bc774ef2b
|
添加新币种
|
2020-10-19 23:25:14 +08:00 |
lvxinran
|
1c0cbabcad
|
修改灵兽
|
2020-10-19 19:58:52 +08:00 |
lvxinran
|
3f862e1ce3
|
Merge branch 'master_test_hw' into master_test_journey
|
2020-10-17 18:14:06 +08:00 |
lvxinran
|
f4c4f22919
|
逍遥游修改
|
2020-10-17 18:11:58 +08:00 |
zhangshanxue
|
661b8f50c8
|
社稷大典配置表提交
|
2020-10-17 15:38:23 +08:00 |
lvxinran
|
663b3c9723
|
逍遥游逻辑
|
2020-10-16 14:19:16 +08:00 |
jiahuiwen
|
8df6762548
|
25闯关礼包、26、心魔试炼礼包 触发和推送
|
2020-10-13 14:58:25 +08:00 |
lvxinran
|
166b93b3f7
|
邮件本地化提交
|
2020-10-01 00:55:09 +08:00 |
lvxinran
|
e79d844eec
|
系统公告本地化修改
|
2020-12-06 08:57:25 +08:00 |
lvxinran
|
b3222d42b3
|
删除无用代码
|
2020-11-23 21:27:47 +08:00 |
lvxinran
|
805ac98057
|
Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/ForceCurrRank.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
|
2020-09-25 14:31:42 +08:00 |
zhangshanxue
|
f24b25419a
|
热更表日志
|
2020-09-23 19:20:27 +08:00 |