yuanshuai
|
e8426e7de2
|
点金bug修改
|
2021-10-13 14:38:53 +08:00 |
xuexinpeng
|
4a2e7bdf22
|
yx-聊天gm
|
2021-10-13 13:37:20 +08:00 |
jiahuiwen
|
c3c1193e58
|
Exception in thread "main" java.lang.ClassCastException: java.lang.String cannot be cast to java.lang.Double
|
2021-10-12 15:01:17 +08:00 |
xuexinpeng
|
4f615fb11d
|
yx 1.战斗记录排序 2.没队伍输赢判断3.换一批不能匹配到自己
|
2021-10-12 14:58:06 +08:00 |
jiahuiwen
|
eb0d4f892b
|
网页支付 类型转换错误
|
2021-10-12 14:09:21 +08:00 |
yuanshuai
|
107f7eb458
|
充值金额礼包推送功能优化
|
2021-10-12 10:38:45 +08:00 |
yuanshuai
|
00a7cb0351
|
vip初始化好感度特权bug修改
|
2021-10-11 17:01:36 +08:00 |
yuanshuai
|
90eec47c30
|
礼包推送相关修改
|
2021-10-11 16:51:37 +08:00 |
xuexinpeng
|
37ff5b7ca7
|
寻宝迷踪新一期不刷新
|
2021-10-11 15:52:19 +08:00 |
xuexinpeng
|
86c3f5d1e9
|
yx赛季重置
|
2021-10-11 15:31:03 +08:00 |
yuanshuai
|
7e9469ee38
|
四象心法飘字提示修改
|
2021-10-11 11:08:30 +08:00 |
xuexinpeng
|
fef22e4ae3
|
yx1.匹配规则的修改
2.战斗回放战力显示
3.玩家初始化积分
|
2021-10-09 20:24:50 +08:00 |
jiahuiwen
|
86dae30e4f
|
点金 减少精度
|
2021-10-09 15:34:21 +08:00 |
xuexinpeng
|
fd70ebb1c3
|
yx领奖
|
2021-10-09 11:57:14 +08:00 |
xuexinpeng
|
40ec544c1a
|
yx领奖bug
|
2021-10-09 11:24:11 +08:00 |
jiahuiwen
|
ccc07db16b
|
点金特权加成
|
2021-10-09 11:18:50 +08:00 |
jiahuiwen
|
f9115627b9
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-10-09 11:06:31 +08:00 |
jiahuiwen
|
3df6b64f82
|
删错误宝器bug
|
2021-10-09 11:06:03 +08:00 |
xuexinpeng
|
a03ee2095c
|
玉虚论道10.8
|
2021-10-09 10:57:12 +08:00 |
jiahuiwen
|
24da18a4e4
|
点金增加特权加成
|
2021-10-08 14:54:20 +08:00 |
jiahuiwen
|
bb6ef14fcf
|
点石成金基础收益随着玩家等级提升,玩家等级提升时 发放道具进背包
|
2021-10-08 11:11:24 +08:00 |
jiahuiwen
|
7303e9d92d
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-09-30 17:34:53 +08:00 |
jiahuiwen
|
4133f80879
|
网页支付bug
|
2021-09-30 17:34:16 +08:00 |
jiahuiwen
|
11ba70d8bc
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-30 14:28:55 +08:00 |
jiahuiwen
|
93eb07e78d
|
云游商人bug
|
2021-09-30 14:28:31 +08:00 |
jiahuiwen
|
6386448536
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-09-29 18:10:18 +08:00 |
jiahuiwen
|
54b53fda54
|
战斗力时事计算
|
2021-09-29 18:09:37 +08:00 |
xuexinpeng
|
7204d7187c
|
玉虚论道排行榜删除机器人 rpc调用修改
|
2021-09-29 17:27:41 +08:00 |
yuanshuai
|
235a3d3a8c
|
Merge branch 'master_test_gn_likable' into master_test_gn
|
2021-09-29 15:45:09 +08:00 |
jiahuiwen
|
4376b5ece7
|
删除key*
|
2021-09-29 15:23:15 +08:00 |
jiahuiwen
|
80c0a72ac9
|
删除 keys*
|
2021-09-29 14:54:59 +08:00 |
xuexinpeng
|
8437b6f9ea
|
海洋改掉落
|
2021-09-29 14:34:00 +08:00 |
xuexinpeng
|
4a1f019c1a
|
玉虚论道
|
2021-09-28 19:15:13 +08:00 |
yuanshuai
|
9c1f77abfb
|
bug修改
|
2021-09-28 17:37:54 +08:00 |
duhui
|
f846e981d1
|
奇门遁甲,代码格式优化
|
2021-09-28 16:51:40 +08:00 |
xuexinpeng
|
d20ba835bf
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# fightmanager/src/main/java/com/ljsd/fight/FightType.java
# serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisUtil.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/GameGM/GMRequestHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
# serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
# tablemanager/src/main/java/config/SArenaRobotConfig.java
# tablemanager/src/main/java/config/SMServerArenaSetting.java
# tablemanager/src/main/java/config/SMServerRankConfig.java
# tablemanager/src/main/java/config/SMServerRankReward.java
|
2021-09-28 16:47:44 +08:00 |
duhui
|
b06a1b3124
|
玲珑宝阁奖励提交
|
2021-09-28 14:59:56 +08:00 |
yuanshuai
|
be9fa17c70
|
【好感度】bug修改
|
2021-09-28 12:05:32 +08:00 |
jiahuiwen
|
8903413162
|
修复玩家魂宝灵宝
|
2021-09-27 20:40:15 +08:00 |
duhui
|
dc98d0fc75
|
车迟斗法战斗bug修改
|
2021-09-27 18:01:53 +08:00 |
duhui
|
93a0b5bf50
|
战斗修改
|
2021-09-27 17:53:04 +08:00 |
jiahuiwen
|
55d71eaa4d
|
Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn
|
2021-09-27 17:23:14 +08:00 |
jiahuiwen
|
906baf0968
|
车迟斗法结算bug
|
2021-09-27 17:23:04 +08:00 |
duhui
|
093ddaa0e9
|
优化一下
|
2021-09-27 16:40:39 +08:00 |
duhui
|
be4c659ffa
|
七界,排名
|
2021-09-27 16:24:44 +08:00 |
jiahuiwen
|
8ef0fffa43
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-27 16:00:39 +08:00 |
jiahuiwen
|
b491e01c9e
|
战斗参数返回
|
2021-09-27 16:00:21 +08:00 |
duhui
|
e157abb248
|
七界试炼,排名奖励
|
2021-09-27 15:59:13 +08:00 |
duhui
|
2e7417278c
|
七界试炼,排行发奖bug
|
2021-09-27 15:32:01 +08:00 |
duhui
|
385db300e4
|
每日累充,网页支付特殊处理
|
2021-09-27 15:29:18 +08:00 |