duhui
|
9c8bb8b283
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-27 14:34:44 +08:00 |
duhui
|
34249d3d3f
|
日志
|
2021-09-27 14:34:29 +08:00 |
duhui
|
a7b964ffcc
|
排行榜问题,和发奖时间日志
|
2021-10-10 23:34:35 +08:00 |
jiahuiwen
|
3952359f2b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-27 12:01:44 +08:00 |
jiahuiwen
|
4c68000711
|
魂宝灵宝 id赋值错误
|
2021-09-27 12:01:39 +08:00 |
duhui
|
36e07bc438
|
七界,跨服数据更新
|
2021-09-27 10:12:52 +08:00 |
duhui
|
544eb87500
|
七界,跨发排行榜,玩家取出不方缓存
|
2021-09-27 10:03:19 +08:00 |
yuanshuai
|
4ba1470fb5
|
添加每日赠送次数限制
|
2021-09-27 09:45:44 +08:00 |
yuanshuai
|
3eab389f36
|
好感度兼容老数据脚本
|
2021-09-26 20:05:12 +08:00 |
yuanshuai
|
6724ea31cf
|
好感度功能完善
|
2021-09-26 19:51:17 +08:00 |
yuanshuai
|
970b3911f8
|
好感度脚本提交
|
2021-09-26 19:43:02 +08:00 |
jiahuiwen
|
177b95c6fe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-26 18:34:53 +08:00 |
jiahuiwen
|
971447a392
|
白金装备技能加入战斗数据
|
2021-09-26 18:34:46 +08:00 |
xuexinpeng
|
30fe0d8ca6
|
【跨服优化】跨服排行榜和跨服聊天改为在开服7天内不开放
|
2021-09-26 11:42:33 +08:00 |
jiahuiwen
|
447ac9d61b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-26 11:27:44 +08:00 |
duhui
|
a52efb87e1
|
跨服,返回第几周
|
2021-10-02 18:44:00 +08:00 |
jiahuiwen
|
653f969ac3
|
战斗返回解析错误
|
2021-09-26 11:27:17 +08:00 |
duhui
|
027fc3eec2
|
七界秘宝积分问题
|
2021-09-24 17:02:51 +08:00 |
jiahuiwen
|
47eacce939
|
合并代码
|
2021-09-24 16:42:02 +08:00 |
duhui
|
14f6e735bc
|
编队修改
|
2021-09-24 16:36:36 +08:00 |
jiahuiwen
|
492d5d96fe
|
合并代码
|
2021-09-24 16:30:38 +08:00 |
jiahuiwen
|
7e46c61114
|
合并代码
|
2021-09-24 15:42:34 +08:00 |
jiahuiwen
|
5a4a0b1534
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-24 15:04:21 +08:00 |
jiahuiwen
|
c286ae0f36
|
云游商人修改
|
2021-09-24 15:04:08 +08:00 |
yuanshuai
|
4f8249150d
|
好感度功能修改
|
2021-09-24 14:36:37 +08:00 |
yuanshuai
|
c900a018ec
|
好感度脚本提交
|
2021-09-24 14:10:02 +08:00 |
duhui
|
f69e502d39
|
七界遗物buf修改
|
2021-09-24 11:51:17 +08:00 |
duhui
|
a10e1988ec
|
七界战斗问题
|
2021-09-24 10:24:40 +08:00 |
duhui
|
5d341b4a1c
|
七界战斗
|
2021-09-23 18:28:35 +08:00 |
yuanshuai
|
8dc19f2d98
|
好感度代码提交
|
2021-09-23 17:22:40 +08:00 |
jiahuiwen
|
8ba37641ba
|
GetPlayerInfoResponse 增加服务器开服时间
|
2021-09-23 15:47:19 +08:00 |
jiahuiwen
|
4a8ecca725
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-23 15:45:33 +08:00 |
duhui
|
78ac3e8df1
|
七界,领取奖励
|
2021-09-23 14:48:42 +08:00 |
jiahuiwen
|
7dfb9563c0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2021-09-23 14:37:30 +08:00 |
jiahuiwen
|
0b674943e7
|
删除无用代码
|
2021-09-23 14:33:37 +08:00 |
duhui
|
eb3c5d359b
|
玲珑宝阁,十连抽
|
2021-09-23 14:25:24 +08:00 |
duhui
|
d627ad64e6
|
七界秘宝和跨服排行榜
|
2021-09-23 14:00:50 +08:00 |
duhui
|
9c8f867c91
|
七界秘宝修改
|
2021-09-23 12:02:58 +08:00 |
duhui
|
8692f5829f
|
玲珑宝阁新优化,活动优化
|
2021-09-23 11:18:52 +08:00 |
duhui
|
e6221cfd40
|
七界试炼,回合数
|
2021-09-23 10:44:21 +08:00 |
yuanshuai
|
0f5ef029d1
|
【四象心法】bug修改
|
2021-09-22 20:31:11 +08:00 |
duhui
|
ef3c6e81c7
|
网页支付
|
2021-09-22 18:34:44 +08:00 |
duhui
|
1b4426b9e4
|
玲珑宝镜功能修改
|
2021-09-22 18:34:29 +08:00 |
yuanshuai
|
db8504e51f
|
Merge branch 'master_test_gn_ys' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java
|
2021-09-22 15:23:50 +08:00 |
duhui
|
3673e1b713
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-22 14:59:53 +08:00 |
duhui
|
6577d05bdf
|
礼包报错兼容
|
2021-09-22 14:19:48 +08:00 |
xuexinpeng
|
f479efce7c
|
GetPlayerOneTeamInfo 还原
|
2021-09-22 14:08:19 +08:00 |
duhui
|
dfbf4285a0
|
Merge branch 'dh_dev_qijie' into master_test_gn
|
2021-09-22 13:57:54 +08:00 |
jiahuiwen
|
f5c52e7bd7
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-22 10:58:22 +08:00 |
jiahuiwen
|
fa89891f2f
|
新战斗力计算
|
2021-09-22 10:57:38 +08:00 |
duhui
|
b4f8483c4c
|
日志
|
2021-09-18 17:45:49 +08:00 |
duhui
|
921482467c
|
七界,显示回合
|
2021-09-18 17:33:09 +08:00 |
duhui
|
a29bc9b60a
|
七界推送
|
2021-09-18 15:48:06 +08:00 |
duhui
|
d3d6924a57
|
不影响逻辑,美观
|
2021-09-18 15:19:14 +08:00 |
duhui
|
5cbba695bf
|
七界合并3--bug修改
|
2021-09-24 00:42:13 +08:00 |
jiahuiwen
|
00037467d2
|
公会援助失败也算援助次数
|
2021-09-18 11:59:06 +08:00 |
jiahuiwen
|
a5e82c01a0
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-09-17 16:47:07 +08:00 |
jiahuiwen
|
8427f08a4a
|
还原战力计算公式
|
2021-09-17 16:20:13 +08:00 |
duhui
|
613a724623
|
助战兼容,报错修改
|
2021-09-17 14:28:39 +08:00 |
duhui
|
ff3f04af63
|
合并代码2
|
2021-09-17 14:21:01 +08:00 |
duhui
|
2050067fb1
|
战斗修改补充
(cherry picked from commit 901ab76a3aad4862318a8c76378ea138d21a9095)
|
2021-09-17 14:20:07 +08:00 |
duhui
|
def246c407
|
合并代码1
|
2021-09-17 14:19:54 +08:00 |
duhui
|
18f91727e4
|
第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
|
2021-09-17 14:13:29 +08:00 |
duhui
|
01457210b5
|
本地gm,四灵跳关
|
2021-09-17 14:09:25 +08:00 |
jiahuiwen
|
484298240c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-09-17 11:40:01 +08:00 |
jiahuiwen
|
e125b19b99
|
战斗力公式修改
|
2021-09-17 11:39:48 +08:00 |
duhui
|
dfc615ae0a
|
鸿蒙阵英雄魂印问题处理
|
2021-09-16 16:41:57 +08:00 |
duhui
|
9e964a10f1
|
日志调整
|
2021-09-16 11:27:57 +08:00 |
duhui
|
42cbcab535
|
鸿蒙阵推送bug处理
|
2021-09-15 15:52:32 +08:00 |
xuexinpeng
|
d4b117d4c3
|
寻宝迷踪打开
|
2021-09-15 15:15:07 +08:00 |
duhui
|
31ce7a2522
|
鸿蒙阵请求返回
|
2021-09-21 01:45:46 +08:00 |
duhui
|
a362ba1838
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-09-27 11:18:31 +08:00 |
duhui
|
68239e5634
|
时间修改
|
2021-09-27 11:13:53 +08:00 |
duhui
|
0219a8ae12
|
Merge branch 'master_test_gn_zf' into master_prb_gn
|
2021-09-27 11:12:53 +08:00 |
duhui
|
7f1180c2b2
|
轩辕宝镜礼包推送
|
2021-09-27 11:12:30 +08:00 |
duhui
|
4679fb5af2
|
十绝伤害超上限
|
2021-09-27 11:09:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
c39cb8eac6
|
十绝阵刷新
|
2021-09-22 11:09:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
95223a0c98
|
测试回滚
|
2021-09-22 10:18:53 +08:00 |
duhui
|
b70260fc88
|
Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn
|
2021-09-14 20:06:52 +08:00 |
duhui
|
1c3fdf907c
|
数数修改
|
2021-09-14 20:06:34 +08:00 |
jiahuiwen
|
713dda777f
|
礼包推送 增加判断
|
2021-09-14 15:49:29 +08:00 |
jiahuiwen
|
b6f4eb1b24
|
轩辕宝镜礼包增加 推送扫荡推送
|
2021-09-14 14:53:24 +08:00 |
yuanshuai
|
5bfabb7e7f
|
【四象心法】跑马灯问题修改
|
2021-09-14 14:32:17 +08:00 |
yuanshuai
|
e3a628d5ad
|
Merge branch 'master_test_gn' into master_test_gn_ys
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java
|
2021-09-14 13:57:03 +08:00 |
yuanshuai
|
0d7c337ced
|
【四象心法】添加技能属性加成
|
2021-09-14 11:36:38 +08:00 |
yuanshuai
|
d172e4d48f
|
跑马灯修改
|
2021-09-14 09:48:53 +08:00 |
duhui
|
eeac777798
|
版本号读表
|
2021-09-13 17:52:00 +08:00 |
yuanshuai
|
10cb106a8d
|
四象心法bug 修改
|
2021-09-13 17:18:53 +08:00 |
duhui
|
081266e83d
|
十绝阵定时清理
|
2021-09-13 13:58:12 +08:00 |
duhui
|
045e1ce82f
|
跨服十绝阵
|
2021-09-13 11:37:48 +08:00 |
yuanshuai
|
3a29dc0ce3
|
【四象心法】bug修改
|
2021-09-11 18:06:34 +08:00 |
duhui
|
2fd6b82d04
|
十绝阵兼容
|
2021-09-10 19:51:44 +08:00 |
duhui
|
686f22d60d
|
竞技场刷新
|
2021-09-10 19:12:34 +08:00 |
duhui
|
8a05dbe235
|
Merge branch 'dh_dev_rediskey' of http://60.1.1.230/backend/jieling_server into dh_dev_rediskey
|
2021-09-10 18:29:04 +08:00 |
duhui
|
59b4e12b17
|
公会援助刷新回滚
|
2021-09-10 18:28:52 +08:00 |
duhui
|
aa040195e0
|
竞技场每日发奖
|
2021-09-14 00:35:05 +08:00 |
duhui
|
7af7724b0c
|
Merge branch 'master_test_gn' into dh_dev_rediskey
|
2021-09-14 00:07:34 +08:00 |
duhui
|
987f4c6729
|
十绝阵删除key
|
2021-09-14 00:07:25 +08:00 |
jiahuiwen
|
8b3031f9b9
|
DEATH_PATH
|
2021-09-10 18:11:29 +08:00 |
duhui
|
989f45f926
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
|
2021-09-10 16:01:28 +08:00 |