duhui
|
3ab98dced8
|
开服冲榜活动,英雄星级计算触发位置增加
|
2022-11-10 10:39:52 +08:00 |
duhui
|
58dd7cace5
|
超值返利bug修复
|
2022-11-12 17:29:50 +08:00 |
duhui
|
1e3f97eb39
|
添加验证
|
2022-11-09 17:17:30 +08:00 |
duhui
|
a2378730d3
|
特权
|
2022-11-09 16:07:04 +08:00 |
duhui
|
df8d2dafcb
|
现金卡计入累充4
|
2022-11-08 15:22:07 +08:00 |
duhui
|
b24e187723
|
现金卡计入累充3
|
2022-11-08 15:16:41 +08:00 |
duhui
|
e0a494c1c2
|
现金卡计入累充2
|
2022-11-08 15:04:58 +08:00 |
duhui
|
711778ec98
|
现金卡计入累充
|
2022-11-08 14:12:46 +08:00 |
duhui
|
8c10cde626
|
自动返利
|
2022-11-08 13:45:30 +08:00 |
duhui
|
b5323a534e
|
超值返利活动
|
2022-11-12 17:11:35 +08:00 |
duhui
|
ef14f61e68
|
开服冲榜活动
|
2022-11-12 17:07:05 +08:00 |
duhui
|
ef5c32772d
|
红包最大金额
|
2022-11-07 15:16:20 +08:00 |
duhui
|
204c2f4a82
|
挂机奖励,随机奖励获得特权加成
|
2022-11-07 14:30:21 +08:00 |
duhui
|
60f3397865
|
开服冲榜活动结束
|
2022-11-07 14:12:03 +08:00 |
duhui
|
d112e60d82
|
特权影响直冲卡红包掉落2
|
2022-11-07 13:39:44 +08:00 |
duhui
|
cb4b6d1bd1
|
特权影响直冲卡红包掉落
|
2022-11-07 11:50:39 +08:00 |
duhui
|
e60184b0c3
|
线下自动返利优化完善
|
2022-11-04 18:00:05 +08:00 |
duhui
|
861a89cc42
|
特权加成主线挑战奖励
|
2022-11-04 17:58:00 +08:00 |
duhui
|
e7c9be735a
|
刷冲修改
|
2022-11-04 16:51:15 +08:00 |
duhui
|
b45efced66
|
gm修改器购买礼包验证流程优化修改
|
2022-11-04 16:29:52 +08:00 |
duhui
|
6b72172fe8
|
gm修改器购买,老活动修改,自动返利监听器修改
|
2022-11-04 15:35:01 +08:00 |
duhui
|
a520fb0a75
|
代码修正
|
2022-11-03 17:56:57 +08:00 |
duhui
|
23c4427207
|
自动返利
|
2022-11-03 16:47:42 +08:00 |
duhui
|
f690ffa1ee
|
小问题修改
|
2022-11-03 14:57:01 +08:00 |
duhui
|
fbba7b5300
|
小问题
|
2022-11-02 15:12:51 +08:00 |
duhui
|
697b531f1a
|
修改提示
|
2022-11-02 10:17:36 +08:00 |
duhui
|
753e693fed
|
1.变身卡升星修改
2.bug处理
|
2022-11-01 17:06:06 +08:00 |
duhui
|
8f602dfebe
|
gm充值返利活动
|
2022-11-01 11:17:31 +08:00 |
duhui
|
ffc965a6fe
|
开服冲榜补充
|
2022-11-02 18:20:03 +08:00 |
duhui
|
dc8e3b3c3c
|
1、gm转盘抽中稀有清空累计次数
2、冲榜活动英雄星级计算加上品质
|
2022-10-28 18:21:15 +08:00 |
duhui
|
e1d8422416
|
gm转盘优化3:累计抽卡次数推送
|
2022-10-28 18:04:08 +08:00 |
duhui
|
9c459dc23d
|
gm转盘优化2:特权相关内容
|
2022-10-27 10:00:08 +08:00 |
duhui
|
731bcc0292
|
空指针处理
|
2022-10-21 17:04:24 +08:00 |
duhui
|
7591ced69e
|
道具日志重复问题提交
|
2022-10-20 16:56:04 +08:00 |
duhui
|
453584cea0
|
线程池方法添加
|
2022-10-20 16:37:16 +08:00 |
duhui
|
9f042f4030
|
开服冲榜活动
|
2022-10-20 16:28:11 +08:00 |
duhui
|
705429e09e
|
Merge branch 'master_test_gn' into dev_dh_bt
|
2022-10-20 13:59:06 +08:00 |
duhui
|
c2940417ad
|
redisutil加异常捕捉和日志
|
2022-10-20 10:34:21 +08:00 |
duhui
|
13c77c0830
|
变身卡修改开启等级
|
2022-10-18 17:07:00 +08:00 |
duhui
|
a2641a596a
|
变身卡增加星级
|
2022-10-18 16:09:32 +08:00 |
duhui
|
de7600323e
|
送无限抽活动优化
|
2022-10-19 17:20:47 +08:00 |
duhui
|
c4a00a45a4
|
首充活动优化
|
2022-10-16 10:37:06 +08:00 |
duhui
|
333faebe9c
|
首充活动bug修改,部分代码修改注释
|
2022-10-12 16:50:59 +08:00 |
duhui
|
36401ce309
|
新增道具类型
|
2022-09-28 16:54:20 +08:00 |
duhui
|
b0595988ad
|
小优化
|
2022-09-27 18:06:43 +08:00 |
duhui
|
7dbbb96c79
|
免费充值活动
|
2022-09-27 16:48:37 +08:00 |
duhui
|
f723ae905c
|
刷冲特权问题修改2
|
2022-09-22 18:13:30 +08:00 |
duhui
|
5aef7674e7
|
刷冲特权问题修改
|
2022-09-22 18:04:43 +08:00 |
duhui
|
b39221e45f
|
gm修改器购买
|
2022-09-20 14:48:31 +08:00 |
duhui
|
3881e066ed
|
直购首冲活动
|
2022-09-19 16:32:55 +08:00 |
duhui
|
d9c771e49b
|
全民福利,单个服务器生效
|
2022-09-19 14:48:50 +08:00 |
duhui
|
56e993f2a9
|
人民币购买时获得名望及仙晶
|
2022-09-16 14:33:49 +08:00 |
duhui
|
6f88779303
|
特权修复
|
2022-09-16 11:18:00 +08:00 |
duhui
|
286d9a3f34
|
特权修复
|
2022-09-16 10:44:17 +08:00 |
duhui
|
caee7ba2a1
|
特权创角初始化
|
2022-09-16 10:00:08 +08:00 |
duhui
|
3a32b7889d
|
御兽特权
|
2022-09-15 18:10:39 +08:00 |
duhui
|
8ecab4414a
|
小bug修改
|
2022-09-15 17:53:41 +08:00 |
duhui
|
8d786bb5e1
|
全民福利活动修改
|
2022-09-15 15:46:57 +08:00 |
duhui
|
05243c0cb9
|
活动修改,全民福利和gm转盘
|
2022-09-15 14:43:55 +08:00 |
duhui
|
5bb9388894
|
小修改
|
2022-09-14 16:37:19 +08:00 |
duhui
|
31a2d5b56a
|
代码合并
|
2022-09-14 16:07:07 +08:00 |
duhui
|
ad7a3184e3
|
bt版本2.0,gm修改器逻辑
|
2022-09-14 16:01:44 +08:00 |
duhui
|
78e653ab65
|
补充2
|
2022-09-09 19:36:47 +08:00 |
duhui
|
b108f8abc9
|
补充2
|
2022-09-09 19:33:49 +08:00 |
duhui
|
584d727dee
|
补充2
|
2022-09-09 19:29:43 +08:00 |
duhui
|
19573065db
|
补充2
|
2022-09-09 18:41:42 +08:00 |
duhui
|
62151df478
|
补充
|
2022-09-09 18:39:43 +08:00 |
duhui
|
5778fe091c
|
特权经验
|
2022-09-09 18:18:29 +08:00 |
duhui
|
9e6c8637da
|
活动时间修改
|
2022-09-09 18:03:57 +08:00 |
duhui
|
3f66ac83b5
|
商店购买提示修改
|
2022-09-09 17:09:14 +08:00 |
duhui
|
85943157a9
|
刷冲特权活动补充
|
2022-09-09 15:39:58 +08:00 |
duhui
|
fad92b7455
|
刷冲特权活动,无限资源阁活动,每日道具清理
|
2022-09-09 15:38:17 +08:00 |
duhui
|
8c86bb20f7
|
bt:新增特权
|
2022-09-08 15:40:52 +08:00 |
duhui
|
73a0b91d3e
|
送无限抽活动
|
2022-09-07 16:05:52 +08:00 |
duhui
|
e89efa1a76
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-09-07 15:06:11 +08:00 |
duhui
|
5cf5552eb8
|
神应最大等级
|
2022-09-07 15:06:04 +08:00 |
duhui
|
5aee8e8d6b
|
bt特权
|
2022-09-07 14:52:05 +08:00 |
dengdan
|
16d9af5e3f
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-09-07 14:24:40 +08:00 |
dengdan
|
f2ace7c526
|
修复玉虚跨服带灵兽的问题
|
2022-09-07 14:24:14 +08:00 |
dengdan
|
c10d1193a4
|
修复玉虚跨服战斗有灵兽的问题
|
2022-09-14 11:23:52 +08:00 |
dengdan
|
26cc5f0ce1
|
修复查看罗浮,灵脉等信息为玉虚信息的问题
|
2022-09-14 11:20:21 +08:00 |
duhui
|
6ee2ba5d88
|
变身卡消耗bug
|
2022-09-07 14:04:03 +08:00 |
duhui
|
cb2581e5fc
|
任务兼容
|
2022-09-07 13:48:21 +08:00 |
duhui
|
43b3eaca7f
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-09-07 13:32:27 +08:00 |
duhui
|
c1f8088349
|
跨服用户属性
|
2022-09-07 13:31:57 +08:00 |
duhui
|
add9233993
|
全民福利
|
2022-09-07 10:36:57 +08:00 |
duhui
|
1355645444
|
宝器bug
|
2022-09-06 18:27:59 +08:00 |
duhui
|
7de75cd738
|
宝器gm
|
2022-09-06 17:04:57 +08:00 |
duhui
|
fa8b30a0ad
|
本地忽略敏感字服务器
|
2022-09-06 16:56:11 +08:00 |
duhui
|
c24fe5768c
|
宝器合成返回道具,修改
|
2022-09-06 16:19:56 +08:00 |
duhui
|
2df133f4d2
|
太初特权和刷冲特权用到的特权覆盖
|
2022-09-06 16:07:21 +08:00 |
duhui
|
6a3ef86f79
|
宝器合成返回道具
|
2022-09-06 15:30:47 +08:00 |
duhui
|
3284203069
|
牛气冲天活动bug修改,补充
|
2022-09-06 13:54:57 +08:00 |
duhui
|
bfdd43d6bd
|
牛气冲天活动bug修改
|
2022-09-06 13:45:24 +08:00 |
duhui
|
0579b663eb
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-09-06 13:30:11 +08:00 |
duhui
|
d92882cb02
|
Merge branch 'dev_equip' into master_test_gn
|
2022-09-06 13:28:53 +08:00 |
duhui
|
7f1866406f
|
建木神树
|
2022-09-05 15:45:22 +08:00 |
duhui
|
6e81f56b7a
|
跨服展示英雄报错
|
2022-09-05 13:30:50 +08:00 |
duhui
|
fabf55e0dc
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-09-02 13:46:40 +08:00 |
dengdan
|
1599f15eae
|
调整玉虚论道
|
2022-09-13 12:26:24 +08:00 |
dengdan
|
abf3c59199
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-09-13 12:20:17 +08:00 |
dengdan
|
b1e721c96a
|
调整玉虚论道
|
2022-09-13 12:19:48 +08:00 |
dengdan
|
1a7f39304c
|
玉虚论道调整为半公平
|
2022-09-12 11:56:57 +08:00 |
dengdan
|
8e93d63e25
|
玉虚论道玩法调整为半公平竞技
|
2022-09-12 11:04:11 +08:00 |
duhui
|
8bf8d3c9e6
|
摘星阁,装备重置
|
2022-09-02 13:46:26 +08:00 |
duhui
|
fc2eb578d5
|
冲突解决
|
2022-09-01 17:16:41 +08:00 |
duhui
|
76674db4d5
|
Merge branch 'dev_equip' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/player/ViewHeroInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2022-09-01 17:13:34 +08:00 |
duhui
|
cf6b898585
|
摘星阁装备强化
|
2022-09-01 17:08:02 +08:00 |
DESKTOP-98AVA47\Administrator
|
67c4ecd512
|
法宝邮件
|
2022-08-31 22:36:07 +08:00 |
duhui
|
e032f25e43
|
摘星阁装备强化
|
2022-08-31 15:19:47 +08:00 |
duhui
|
dd541be780
|
摘星阁装备强化
|
2022-08-31 15:18:17 +08:00 |
duhui
|
609bdac818
|
Merge branch 'master_test_gn' into dev_equip
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2022-08-30 16:53:03 +08:00 |
duhui
|
23e632dd30
|
法宝等级上限
|
2022-08-30 15:59:09 +08:00 |
duhui
|
a1fcc56f01
|
灵兽宝阁活动回滚
|
2022-08-30 11:53:16 +08:00 |
duhui
|
e1e551f1f1
|
灵兽宝阁活动冲突
|
2022-08-29 23:09:58 +08:00 |
duhui
|
a0050f326b
|
敏感字检测服未开启默认通过检测,兼容本地测试
|
2022-08-29 14:25:01 +08:00 |
duhui
|
2a51cb6da7
|
变身卡问题处理
|
2022-08-26 13:36:42 +08:00 |
duhui
|
42b38b25a5
|
玩家起名问题
|
2022-08-29 21:43:05 +08:00 |
duhui
|
f6267ce855
|
玩家发言问题
|
2022-08-27 13:52:19 +08:00 |
duhui
|
f4d4134e69
|
森罗扫荡,杀敌数问题
|
2022-08-27 13:26:11 +08:00 |
duhui
|
258d1e88ce
|
代码可读性修改
|
2022-08-24 09:57:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
aace2dae75
|
车迟斗法时间
|
2022-09-26 15:30:48 +08:00 |
duhui
|
4e10dbdae7
|
车迟斗法挑战记录改为一天的
|
2022-08-23 17:28:00 +08:00 |
duhui
|
b0114b8d4c
|
森罗幻境扫荡,boss杀敌数
|
2022-08-22 17:43:15 +08:00 |
duhui
|
844b0114cd
|
摘星阁装备调整初版,未联调
|
2022-08-19 18:12:57 +08:00 |
duhui
|
8508c685db
|
身外化身限制添加
|
2022-08-18 17:13:35 +08:00 |
duhui
|
4c9c1e1841
|
森罗幻境完成初版2
|
2022-08-18 16:16:00 +08:00 |
duhui
|
dcc9f3331d
|
森罗幻境完成初版
|
2022-08-18 16:02:48 +08:00 |
duhui
|
402efe553c
|
森罗幻境未完成
|
2022-08-17 18:09:45 +08:00 |
duhui
|
19ac577d2f
|
新活动,寻仙商城
|
2022-08-17 17:37:33 +08:00 |
duhui
|
3df83ecad7
|
逍遥游修改
|
2022-08-16 14:59:43 +08:00 |
duhui
|
ed2bdf5e6d
|
逍遥游修改
|
2022-08-16 11:57:52 +08:00 |
duhui
|
4d3d9abf1e
|
逍遥游修改
|
2022-08-15 13:55:17 +08:00 |
DESKTOP-98AVA47\Administrator
|
5073642868
|
摘星阁重置邮件
|
2022-08-15 01:53:48 +08:00 |
duhui
|
8f17bdc655
|
好感度代码优化
|
2022-08-12 16:51:23 +08:00 |
duhui
|
e7751a8e0e
|
好感度同步问题
|
2022-08-12 16:41:38 +08:00 |
duhui
|
ed2ccd969b
|
装备碎片道具添加
|
2022-08-11 11:30:53 +08:00 |
duhui
|
3fc272cb1f
|
法宝分解
|
2022-08-10 15:27:32 +08:00 |
duhui
|
b42511aade
|
法宝道具
|
2022-08-10 10:17:50 +08:00 |
duhui
|
a3cede0bb8
|
好感度碎片道具提交
|
2022-08-09 16:44:14 +08:00 |
duhui
|
0138170505
|
【摘星阁重构】增加道具消耗种类
|
2022-08-08 14:34:13 +08:00 |
duhui
|
bb16d01442
|
热度排行榜
|
2022-08-04 16:42:32 +08:00 |
duhui
|
b085fc0b2b
|
车迟斗法积分添加日志
|
2022-07-20 15:56:32 +08:00 |
DESKTOP-98AVA47\Administrator
|
ecf41ec2b3
|
心愿抽卡,未选择心愿报错兼容,直接返回原本英雄
|
2022-07-29 22:38:34 +08:00 |
duhui
|
ae47b63edd
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-07-13 19:44:08 +08:00 |
duhui
|
1e65d0fe7b
|
跨服分组逻辑优化
|
2022-07-13 19:43:46 +08:00 |
duhui
|
180120f93c
|
跨服分组逻辑优化
|
2022-07-13 16:45:38 +08:00 |
duhui
|
c41de97b94
|
跨服排行榜空数据处理
|
2022-07-13 15:37:45 +08:00 |
duhui
|
9f98449474
|
比数字小游戏gm,注释
|
2022-07-12 13:55:47 +08:00 |
duhui
|
12080ac558
|
比数字小游戏gm
|
2022-07-12 13:55:01 +08:00 |
duhui
|
13e7fcc48a
|
修改获取随机名称通过敏感字服时,如果链接失败,直接抛出异常,而不是不断重复(容易导致死循环)
|
2022-07-11 17:54:40 +08:00 |
duhui
|
f3ecd4fc3f
|
比数小游戏
|
2022-07-11 15:45:42 +08:00 |
duhui
|
b89c65056f
|
【任务类型补充】添加触发操作
|
2022-07-08 17:51:45 +08:00 |
duhui
|
bac38e2d33
|
【任务类型补充】6个 159-164,触发操作未加
|
2022-07-08 14:06:54 +08:00 |
duhui
|
fc19c03886
|
钻石心愿抽卡修改必中次数
|
2022-07-07 15:23:23 +08:00 |
duhui
|
bc1fb4b47f
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-07-06 14:13:52 +08:00 |
duhui
|
959d669813
|
缥缈之旅的奖励改为双月卡专享
|
2022-07-04 16:39:24 +08:00 |
jiahuiwen
|
f7803f53de
|
公会援助不刷新bug
|
2022-06-23 14:08:35 +08:00 |
DESKTOP-98AVA47\Administrator
|
27bcc3ef26
|
功能开启
|
2022-06-22 14:19:14 +08:00 |
jiahuiwen
|
051df7188a
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-06-21 14:24:07 +08:00 |
duhui
|
c898e80cd0
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-06-21 11:32:23 +08:00 |
duhui
|
3b3fe2878f
|
【易经宝库增加一键挖宝】
|
2022-06-20 14:21:28 +08:00 |
duhui
|
8848cadbd5
|
英雄初始被动
|
2022-06-15 10:57:27 +08:00 |
duhui
|
a7cda77d55
|
周卡月卡调整
|
2022-07-12 14:21:17 +08:00 |
duhui
|
1db35a294f
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-07-12 12:13:51 +08:00 |
duhui
|
429a771b77
|
周卡优化
|
2022-07-12 12:00:49 +08:00 |
duhui
|
58d7dc27c6
|
周卡优化
|
2022-06-19 19:58:58 +08:00 |
duhui
|
3261813450
|
周卡月卡调整,兼容老版本3
|
2023-07-18 19:53:14 +08:00 |
jiahuiwen
|
b6c4f3814c
|
升级fastjson,修复Fastjson 反序列化任意代码执行漏洞风险
|
2022-06-15 09:38:08 +08:00 |
duhui
|
43873b23eb
|
周卡月卡调整,兼容老版本2
|
2022-06-10 19:06:38 +08:00 |
duhui
|
f8e2852405
|
周卡月卡调整,兼容老版本
|
2022-06-17 12:40:46 +08:00 |
duhui
|
b0f6149358
|
周卡月卡调整,兼容老版本
|
2022-06-17 12:31:54 +08:00 |
duhui
|
be1ea53244
|
周卡月卡调整,兼容老版本月卡,四版
|
2022-06-17 11:37:35 +08:00 |
duhui
|
8c928fd864
|
周卡月卡调整,兼容老版本月卡,四版
|
2022-06-17 11:25:19 +08:00 |
duhui
|
5f6e0ff20a
|
周卡月卡调整,兼容老版本月卡,四版
|
2022-06-17 11:08:07 +08:00 |
duhui
|
92a63c75e3
|
周卡月卡调整,改时间bug,三版
|
2022-06-16 15:40:32 +08:00 |
duhui
|
cd3dba3982
|
周卡月卡调整改bug,二版
|
2022-06-17 15:40:56 +08:00 |
jiahuiwen
|
c00597d908
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-06-09 13:37:10 +08:00 |
duhui
|
9f01f3c35f
|
周卡月卡调整完成,初版
|
2022-06-08 18:58:38 +08:00 |
duhui
|
651d94e41b
|
周卡月卡调整,修改,未完成
|
2022-06-08 18:10:47 +08:00 |
duhui
|
6f63f03ab0
|
月卡调整,暂存
|
2022-06-06 16:31:44 +08:00 |
yuanshuai
|
ea547c2dc1
|
英雄升星活动报错修改
|
2022-06-01 17:51:16 +08:00 |
duhui
|
bd48f7bc3d
|
新周卡功能,bug修改-天数问题+1
|
2022-06-01 11:16:03 +08:00 |
duhui
|
1ec28cdf76
|
新周卡功能,bug修改-发邮件
|
2022-06-08 19:06:48 +08:00 |
duhui
|
27f92a9de8
|
新周卡功能,bug修改1
|
2022-06-04 00:02:27 +08:00 |
duhui
|
8e3cc63702
|
新周卡功能
|
2022-05-31 17:13:59 +08:00 |
xuexinpeng
|
ad8d491fc9
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-25 20:20:43 +08:00 |
xuexinpeng
|
9f3e6f2efe
|
灵脉秘境发奖根据表时间段走
|
2022-05-25 19:45:05 +08:00 |
jiahuiwen
|
04977c5abd
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-25 17:27:16 +08:00 |
xuexinpeng
|
8293b63aca
|
周卡更改
|
2022-05-25 16:42:48 +08:00 |
duhui
|
2820f24561
|
寻仙招募修改3
|
2022-05-24 12:59:15 +08:00 |
duhui
|
3a6a3fdf25
|
寻仙招募修改2
|
2022-05-24 12:02:36 +08:00 |
duhui
|
1f9d9736e6
|
寻仙招募修改,去除老逻辑
|
2022-05-24 11:34:06 +08:00 |
duhui
|
8c94c1b2ab
|
跨服分组时间bug
|
2022-05-23 11:32:42 +08:00 |
duhui
|
8b89873629
|
【寻仙招募调整】2
|
2022-05-23 10:15:23 +08:00 |
duhui
|
3b093d4209
|
【寻仙招募调整】
|
2022-05-23 10:08:41 +08:00 |
jiahuiwen
|
4c6917eca2
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-20 18:39:44 +08:00 |
duhui
|
80c5758a64
|
【寻仙招募调整】回滚
|
2022-05-20 18:38:12 +08:00 |
jiahuiwen
|
d319cd953b
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-20 15:08:52 +08:00 |
duhui
|
a748d0e64d
|
【寻仙招募调整】
|
2022-05-20 14:15:34 +08:00 |
xuexinpeng
|
4879ba762e
|
邮件7日限制
|
2022-05-25 14:38:22 +08:00 |
xuexinpeng
|
2a6dd4dec6
|
神尊特权
|
2022-06-09 00:00:49 +08:00 |
xuexinpeng
|
3715b8b869
|
神尊特权
|
2022-05-24 00:10:32 +08:00 |
duhui
|
41b599a9f0
|
【恢复100档首充奖励】3
|
2022-05-26 18:16:09 +08:00 |
duhui
|
928c266645
|
【恢复100档首充奖励】2
|
2022-05-16 17:54:52 +08:00 |
duhui
|
726c98f3ab
|
【恢复100档首充奖励】
|
2022-05-16 15:23:21 +08:00 |
duhui
|
7ed2d5c896
|
1.添加重载开服时间gm命令功能
2.聊天信息完善
|
2022-05-10 18:37:06 +08:00 |
xuexinpeng
|
9da9ef5bb3
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-10 14:10:53 +08:00 |
xuexinpeng
|
0e4d5f5558
|
山河社稷图分页
|
2022-05-10 13:59:30 +08:00 |
xuexinpeng
|
64b06e4c89
|
山河社稷图分页 新分页新章节
|
2022-05-10 13:49:09 +08:00 |
xuexinpeng
|
357a955689
|
Merge branch 'master_test_gn' into master_prb_gn
|
2022-05-09 18:05:02 +08:00 |
duhui
|
e7659a1b08
|
爱玩信息上报修改
|
2022-05-07 13:31:13 +08:00 |
jiahuiwen
|
c90aeb4c89
|
宗门排行榜bug
|
2022-05-06 18:20:35 +08:00 |
xuexinpeng
|
0d13709c18
|
山河社稷图分页
|
2022-05-05 17:31:42 +08:00 |
duhui
|
9c0af37bcf
|
神印合成bug修改2
|
2022-04-29 18:05:36 +08:00 |
duhui
|
25b4abd436
|
神印合成bug修改
|
2022-04-29 15:50:16 +08:00 |
duhui
|
5bb162590f
|
爱玩上报
|
2022-04-28 17:07:27 +08:00 |
jiahuiwen
|
7f7c729752
|
公会战力排行榜先不跨服
|
2022-04-28 15:31:35 +08:00 |
duhui
|
3ecfc2b88f
|
助战,神印修改
|
2022-04-27 16:27:50 +08:00 |
duhui
|
a614979ef8
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-04-27 16:24:38 +08:00 |
duhui
|
325bb8b789
|
助战,神印
|
2022-04-27 16:24:28 +08:00 |
xuexinpeng
|
a2b9e1fe5a
|
跨服身外化身技能
|
2022-04-29 16:04:13 +08:00 |
xuexinpeng
|
d589cfc104
|
化身之力
|
2022-04-29 15:32:39 +08:00 |
xuexinpeng
|
3f138b516f
|
优化超20回合显示
|
2022-04-27 15:45:59 +08:00 |
duhui
|
b97b400182
|
队伍战力存储到mongo,优化一下
|
2022-04-26 14:39:31 +08:00 |
duhui
|
c8e8e644df
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-04-26 14:20:15 +08:00 |
duhui
|
9a8bfa15ed
|
队伍战力存储到mongo
|
2022-04-26 14:20:04 +08:00 |
jiahuiwen
|
4ebae18d07
|
优化日志
|
2022-04-26 14:12:09 +08:00 |
duhui
|
4ac1800a01
|
探索商店解锁问题
|
2022-04-26 11:03:59 +08:00 |
xuexinpeng
|
d4fec7f545
|
变身卡原有逻辑修改
|
2022-04-26 10:42:03 +08:00 |
xuexinpeng
|
a62f66c27e
|
变身卡逻辑修改
|
2022-04-25 20:23:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
d4abf2e27e
|
挑战副本精度
|
2022-04-27 19:03:20 +08:00 |
yuanshuai
|
ccbb37e20b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 18:18:44 +08:00 |
yuanshuai
|
da68cc9465
|
开天上报修改
|
2022-04-25 18:18:35 +08:00 |
xuexinpeng
|
0814ed225c
|
挑战精度问题
|
2022-04-25 18:12:36 +08:00 |
jiahuiwen
|
2518c0821d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 17:46:05 +08:00 |
xuexinpeng
|
4a083edf92
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 17:41:04 +08:00 |
xuexinpeng
|
e94cef02a9
|
挑战副本 身外化身之力
|
2022-04-25 17:39:53 +08:00 |
duhui
|
cddb0f0935
|
探索商店解锁问题
|
2022-04-25 16:48:17 +08:00 |
jiahuiwen
|
309ac36c9b
|
关闭 tapdb 充值上报
|
2022-04-25 15:40:09 +08:00 |
jiahuiwen
|
da292b31ab
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-25 15:36:56 +08:00 |
jiahuiwen
|
d2a4a19be9
|
上报bug
|
2022-04-25 15:36:50 +08:00 |
jiahuiwen
|
3dcfb73ec2
|
开天上报
|
2022-04-25 15:14:45 +08:00 |
duhui
|
6f069c79a9
|
屏蔽点将台心愿招募,策划表屏蔽,代码先不改了,寻仙招募活动也会用
|
2022-04-25 11:28:32 +08:00 |
jiahuiwen
|
abbad4070b
|
优化代码
|
2022-04-24 18:12:45 +08:00 |
xuexinpeng
|
c7715e7a87
|
身外化身
|
2022-04-24 18:10:34 +08:00 |
jiahuiwen
|
eef6b5ca8e
|
数数上报 改 开天上报
|
2022-04-24 18:08:08 +08:00 |
jiahuiwen
|
9d99aaaee8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-24 16:44:57 +08:00 |
jiahuiwen
|
7c806e5a27
|
找回开天上报,注释数数上报
|
2022-04-24 16:44:51 +08:00 |
xuexinpeng
|
b3d35a15a3
|
身外化身
|
2022-04-24 13:54:31 +08:00 |
xuexinpeng
|
28e4676e90
|
消耗打开
|
2022-04-22 19:18:02 +08:00 |
duhui
|
b12d63788b
|
神印功能提交,补充
|
2022-04-22 18:27:39 +08:00 |
duhui
|
6ce4c11c7d
|
神印功能提交
|
2022-04-22 18:27:17 +08:00 |
xuexinpeng
|
913af67528
|
身外化身
|
2022-04-22 17:26:59 +08:00 |
jiahuiwen
|
a45d00b522
|
还原 LogHashMap
|
2022-04-22 17:25:53 +08:00 |
xuexinpeng
|
9a73862291
|
化身之力
|
2022-04-22 11:26:52 +08:00 |
jiahuiwen
|
94c86cb370
|
Merge branch 'master_guild_cross' into master_test_gn
|
2022-04-21 18:36:06 +08:00 |
jiahuiwen
|
779647bea4
|
Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross
|
2022-04-21 18:35:26 +08:00 |
jiahuiwen
|
04d0c57a1a
|
解散公会bug
|
2022-04-21 18:35:20 +08:00 |
xuexinpeng
|
699836479c
|
身外化身
|
2022-04-21 18:08:16 +08:00 |
jiahuiwen
|
9a48f5e62f
|
Merge branch 'master_test_gn' into master_guild_cross
|
2022-04-21 16:55:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
2ceaa10726
|
四灵试炼次数问题
|
2022-05-30 01:03:23 +08:00 |
duhui
|
695de90a50
|
四灵试炼次数修改
|
2022-04-21 15:44:54 +08:00 |
jiahuiwen
|
1e9dc84c64
|
车迟斗法退公会 删个人排行榜
|
2022-04-21 15:31:12 +08:00 |
jiahuiwen
|
e2974bfc0d
|
跨服加公会
|
2022-04-21 14:26:52 +08:00 |
duhui
|
f86f4e5676
|
四灵试炼开启天数管理
|
2022-04-21 14:06:25 +08:00 |
duhui
|
232fc4efeb
|
开服就跨服分组
|
2022-04-21 13:18:12 +08:00 |
jiahuiwen
|
9e754d5a2f
|
计算车迟挑战人数
|
2022-04-21 11:41:58 +08:00 |
duhui
|
665b993e21
|
开服就跨服分组
|
2022-04-21 11:35:05 +08:00 |
duhui
|
b58df88870
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-04-21 11:30:40 +08:00 |
xuexinpeng
|
9b38690f93
|
无尽副本类型变化
|
2022-04-23 10:34:51 +08:00 |
xuexinpeng
|
401889401c
|
森罗幻境
|
2022-04-21 18:34:29 +08:00 |
xuexinpeng
|
b64879f4b2
|
挑战副本 幻境达人 计数
|
2022-04-21 17:54:48 +08:00 |
duhui
|
a4c7a3b74b
|
屏蔽点将台心愿招募
|
2022-04-21 11:30:09 +08:00 |
jiahuiwen
|
2cfdee74c1
|
车迟斗法退出公会删排行
|
2022-04-20 18:06:48 +08:00 |
xuexinpeng
|
ea6899e50b
|
挑战副本
|
2022-04-20 16:24:42 +08:00 |
jiahuiwen
|
176d829f61
|
Merge branch 'master_test_gn' into master_guild_cross
|
2022-04-20 15:27:39 +08:00 |
jiahuiwen
|
d32b041372
|
踢出公会
|
2022-04-20 14:45:43 +08:00 |
jiahuiwen
|
6ebbd502df
|
Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross
|
2022-04-20 14:44:19 +08:00 |
jiahuiwen
|
e634933431
|
踢出公会
|
2022-04-20 14:44:14 +08:00 |
jiahuiwen
|
6d0db1f341
|
优化跨服公会代码
|
2022-04-20 14:43:38 +08:00 |
jiahuiwen
|
d48bd0883e
|
Merge branch 'master_guild_cross' of http://60.1.1.230/backend/jieling_server into master_guild_cross
|
2022-04-20 13:46:59 +08:00 |
jiahuiwen
|
f5d18d2575
|
公会跨服
|
2022-04-20 13:46:48 +08:00 |
jiahuiwen
|
c6997d8f1a
|
干掉 LogHashMap
|
2022-04-20 13:45:33 +08:00 |
jiahuiwen
|
f81cfe230d
|
公会援助
|
2022-04-20 11:40:17 +08:00 |
duhui
|
169d89e47a
|
关闭紫府神印功能
|
2022-04-20 11:23:49 +08:00 |
jiahuiwen
|
0ec32ba9e6
|
Merge branch 'master_jhw' of http://60.1.1.230/backend/jieling_server into master_jhw
|
2022-04-20 10:45:52 +08:00 |
jiahuiwen
|
0188b69fb5
|
注释错误代码
|
2022-04-20 10:45:38 +08:00 |
jiahuiwen
|
676f4c9c17
|
公会援助
|
2022-04-20 10:44:01 +08:00 |
jiahuiwen
|
24b50bc573
|
公会公报
|
2022-04-20 10:39:25 +08:00 |
jiahuiwen
|
143a0cd124
|
公会红包
|
2022-04-19 17:30:05 +08:00 |
jiahuiwen
|
7c2d23e460
|
公会红包
|
2022-04-19 17:22:27 +08:00 |
jiahuiwen
|
73d3c5c780
|
公会红包
|
2022-04-19 17:15:59 +08:00 |
jiahuiwen
|
318b1505eb
|
公会日志
|
2022-04-19 17:11:20 +08:00 |
jiahuiwen
|
bdf6666064
|
跨服公会
|
2022-04-19 16:05:10 +08:00 |
xuexinpeng
|
29dace7812
|
挑战副本
|
2022-04-19 15:48:58 +08:00 |
xuexinpeng
|
8564d36577
|
添加战斗结果
|
2022-04-18 18:19:06 +08:00 |
xuexinpeng
|
794fd34895
|
无尽副本判断输赢
|
2022-04-18 17:25:08 +08:00 |
xuexinpeng
|
9f00eeed00
|
挑战副本编队类型
|
2022-04-18 16:49:59 +08:00 |
jiahuiwen
|
30175a75c2
|
跨服加公会
|
2022-04-18 15:17:35 +08:00 |
duhui
|
e26b1e18ae
|
【探索玩法增加探索商店】
|
2022-04-18 15:05:46 +08:00 |
jiahuiwen
|
360e6c846d
|
Revert "跨服加公会"
This reverts commit 122d7836f7 .
|
2022-04-18 09:50:03 +08:00 |
xuexinpeng
|
9e3f87cbd0
|
规范代码
|
2022-04-15 17:06:03 +08:00 |
xuexinpeng
|
efc3368d0a
|
挑战副本
|
2022-04-15 14:52:04 +08:00 |
jiahuiwen
|
122d7836f7
|
跨服加公会
|
2022-04-15 10:37:23 +08:00 |
xuexinpeng
|
a325ba0451
|
挑战副本
|
2022-04-14 18:23:30 +08:00 |
duhui
|
df7006924b
|
爱玩信息上报
|
2022-04-12 18:03:13 +08:00 |
duhui
|
20f22de280
|
爱玩信息上报
|
2022-04-12 17:59:17 +08:00 |
duhui
|
8b655778b9
|
爱玩信息上报
|
2022-04-12 17:55:10 +08:00 |
duhui
|
1354ec8bf3
|
爱玩信息上报
|
2022-04-12 17:42:58 +08:00 |
xuexinpeng
|
deebea6ab1
|
删除注释的代码
|
2022-04-12 14:38:18 +08:00 |
xuexinpeng
|
3dab8ba9a3
|
功能注释
|
2022-04-12 10:18:12 +08:00 |
duhui
|
0399861e6b
|
协议去除无用参数
|
2022-04-11 13:06:25 +08:00 |
xuexinpeng
|
fbd3281ca6
|
探索优化
|
2022-04-08 18:29:30 +08:00 |
duhui
|
6f805a716f
|
协议去除无用参数
|
2022-04-08 10:56:41 +08:00 |
duhui
|
16a1f881dd
|
爱玩信息上报
|
2022-04-08 10:45:13 +08:00 |
jiahuiwen
|
921fbf9cc7
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-07 18:31:04 +08:00 |
jiahuiwen
|
42d5e3a6db
|
修改redis地址
|
2022-04-07 18:30:50 +08:00 |
xuexinpeng
|
814d5d6cd9
|
探索优化
|
2022-04-07 11:32:31 +08:00 |
duhui
|
77679ba892
|
家园强化修改
|
2022-04-07 11:09:30 +08:00 |
xuexinpeng
|
77a87f7ccd
|
探索优化
|
2022-04-07 10:51:34 +08:00 |
jiahuiwen
|
2bd61083e2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-04-06 15:43:00 +08:00 |
jiahuiwen
|
cb3ebd6372
|
玉虚论道 赋值职业
|
2022-04-06 15:42:50 +08:00 |
duhui
|
26d5114213
|
rpc链接socket设置超时时间
|
2022-04-06 14:58:57 +08:00 |
jiahuiwen
|
ce712afeac
|
神魔 卸下魂宝灵宝
|
2022-04-06 14:05:03 +08:00 |
jiahuiwen
|
cc668d9147
|
神魔 卸下魂宝灵宝
|
2022-04-06 13:43:50 +08:00 |
jiahuiwen
|
6b81fc069a
|
玉虚论道 增加职业
|
2022-04-02 16:02:42 +08:00 |
jiahuiwen
|
f945915126
|
HARD_STAGE_FIGHT_START_REQUEST 怪物职业赋值
|
2022-04-02 15:19:52 +08:00 |
jiahuiwen
|
2d2dba9374
|
神魔职业遗漏
|
2022-04-02 14:47:52 +08:00 |
yuanshuai
|
b48082bbab
|
神魔遗漏代码添加
|
2022-04-02 14:01:53 +08:00 |
duhui
|
2791d19ee0
|
【山河设计图每日玉衡龙魂丹领取调整】
|
2022-04-02 13:48:21 +08:00 |
xuexinpeng
|
f22b7b0c94
|
探索注释打开
|
2022-04-01 17:58:46 +08:00 |
yuanshuai
|
434366cdd3
|
神魔阵营转职功能bug修改
|
2022-03-31 17:16:57 +08:00 |
yuanshuai
|
38de0cae30
|
神魔bug修改
|
2022-03-31 16:35:51 +08:00 |
yuanshuai
|
4d0ff71928
|
神魔遗漏代码
|
2022-03-31 15:07:08 +08:00 |
yuanshuai
|
a991708d8e
|
Merge branch 'master_test_gn' into master_test_gn_GodDevil
|
2022-03-31 09:59:58 +08:00 |
xuexinpeng
|
cb85945e06
|
功能注释
|
2022-03-29 11:27:44 +08:00 |
duhui
|
257205b847
|
车迟斗法挑战人数问题处理,修改完善2
|
2022-03-29 11:23:22 +08:00 |
duhui
|
c2bd8a261a
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-03-29 11:21:36 +08:00 |
duhui
|
8aeef0695d
|
车迟斗法挑战人数问题处理,修改完善
|
2022-03-29 11:21:22 +08:00 |
xuexinpeng
|
59f4fa0077
|
注释探索功能
|
2022-03-29 11:16:45 +08:00 |
duhui
|
eb8327464a
|
车迟斗法挑战人数问题处理,补充
|
2022-03-29 10:52:44 +08:00 |
duhui
|
b0918e4071
|
车迟斗法挑战人数问题处理
|
2022-03-29 10:51:10 +08:00 |
duhui
|
fe4e985187
|
【车迟斗法调整为开服7日后开启】
|
2022-04-20 14:10:06 +08:00 |
jiahuiwen
|
02134b84c8
|
战力前后端不一致 bug
|
2022-03-29 10:10:06 +08:00 |
yuanshuai
|
18c2ef0b7b
|
Merge branch 'master_test_gn' into master_test_gn_GodDevil
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
|
2022-03-25 18:15:15 +08:00 |
yuanshuai
|
cb1558f309
|
脚本修改提交
|
2022-03-25 18:12:26 +08:00 |
yuanshuai
|
a53c1d8f97
|
新增字段赋值
|
2022-03-25 16:55:00 +08:00 |
yuanshuai
|
9bbcb33469
|
脚本修改提交
|
2022-03-25 16:14:06 +08:00 |
xuexinpeng
|
d2c5355948
|
探索事件
|
2022-03-25 10:17:27 +08:00 |
xuexinpeng
|
d3da540689
|
探索事件
|
2022-03-24 13:39:39 +08:00 |
xuexinpeng
|
73ad9d7c4c
|
探索事件
|
2022-03-24 10:47:39 +08:00 |
xuexinpeng
|
3bc2c1df69
|
探索事件
|
2022-03-23 16:08:10 +08:00 |
xuexinpeng
|
86a91c0c2a
|
探索事件
|
2022-03-23 13:47:18 +08:00 |
xuexinpeng
|
c15ab64462
|
探索事件
|
2022-03-22 17:20:23 +08:00 |
duhui
|
b64c22c7a9
|
Merge remote-tracking branch 'origin/master_test_gn' into master_test_gn
|
2022-03-22 10:23:08 +08:00 |
duhui
|
8e1795eb33
|
东海寻仙,活动报错处理
|
2022-03-22 10:21:52 +08:00 |
yuanshuai
|
e29efe8a19
|
修行技能战力加成脚本提交
|
2022-03-21 17:38:05 +08:00 |
duhui
|
9095583374
|
备用任务类型
|
2022-03-21 16:57:37 +08:00 |
xuexinpeng
|
293e9869b4
|
探索事件
|
2022-03-21 16:33:26 +08:00 |
yuanshuai
|
cc06e2f19b
|
新增神魔转职功能相关修改
|
2022-03-21 15:03:40 +08:00 |
duhui
|
204c7e9d0c
|
东海寻仙活动:bug修改
|
2022-03-21 10:21:08 +08:00 |
yuanshuai
|
dc0c9819bd
|
神魔阵营功能脚本提交
|
2022-03-18 16:45:25 +08:00 |
xuexinpeng
|
738ef9c1e2
|
探索事件
|
2022-03-18 11:50:59 +08:00 |
duhui
|
f588bc7c36
|
东海寻仙活动:bug修改
|
2022-03-17 16:01:22 +08:00 |
yuanshuai
|
87680c4a56
|
主角被动技能bug修改(修复前后端战斗不一致)
|
2022-03-17 14:30:47 +08:00 |
duhui
|
f7848be28d
|
东海寻仙活动:初版未测试
|
2022-03-16 14:35:28 +08:00 |
yuanshuai
|
927cbee86c
|
主角被动技能bug修改
|
2022-03-16 13:40:15 +08:00 |
yuanshuai
|
822aea186f
|
主角技能改被动技能代码修改提交
|
2022-03-11 17:13:54 +08:00 |
duhui
|
3e10197728
|
车迟斗法公会人数问题处理
|
2022-03-11 15:25:04 +08:00 |
duhui
|
7f4f430602
|
车迟斗法积分超过int上限问题处理3
|
2022-03-11 13:25:04 +08:00 |
duhui
|
2769559f0c
|
车迟斗法积分超过int上限问题处理2
|
2022-03-10 18:30:50 +08:00 |
duhui
|
2f4fcd21cc
|
车迟斗法积分超过int上限问题处理
|
2022-03-10 18:22:03 +08:00 |
duhui
|
66580a4055
|
网页支付特殊处理刷新时间单位问题处理
|
2022-03-10 18:04:53 +08:00 |
duhui
|
97598cb7a8
|
跨服排行榜刷新时间单位问题处理
|
2022-03-10 17:53:44 +08:00 |
duhui
|
71b403e608
|
车迟斗法积分显示和排行榜转圈优化
|
2022-03-10 11:00:53 +08:00 |
duhui
|
aa24961454
|
车迟斗法,公会人数问题处理
|
2022-03-08 18:25:06 +08:00 |
xuexinpeng
|
fe1f6b59d8
|
rpc活动数据报错
|
2022-03-08 17:02:18 +08:00 |
duhui
|
b01fa4c67f
|
rpc,活动数据报错问题处理
|
2022-03-08 16:58:40 +08:00 |
xuexinpeng
|
9ccb9e12da
|
活动结束未领奖励发邮件
|
2022-03-09 22:25:09 +08:00 |
xuexinpeng
|
ba4f2e87bb
|
达标任务在活动结束后的展示阶段也不能完成
|
2022-03-07 15:15:44 +08:00 |
xuexinpeng
|
160a26e109
|
达标任务在活动结束后的展示阶段也不能完成
|
2022-03-10 21:39:30 +08:00 |
duhui
|
ea003bf9ce
|
【车迟斗法改为跨服玩法】挑战记录显示问题
|
2022-03-04 17:56:32 +08:00 |
duhui
|
1ca7f410b3
|
【车迟斗法改为跨服玩法】公会名无法显示问题
|
2022-03-04 14:37:33 +08:00 |
duhui
|
fa9d396051
|
【车迟斗法改为跨服玩法】跨服战斗报错,和无积分问题
|
2022-03-04 13:31:35 +08:00 |
duhui
|
95da9033b8
|
车迟斗法改为跨服玩法,清除上期数据
|
2022-03-04 11:25:54 +08:00 |
duhui
|
f42013ba08
|
车迟斗法改为跨服玩法,优化
|
2022-03-03 18:27:22 +08:00 |
xuexinpeng
|
0d50b13db8
|
1.探索结束后得邮件加入你本次队伍一共击杀了多少敌人,死亡多少次
2.战力冲刺任务按钮完成状态按最高战力判断,实际领取按当前战力校验
.
|
2022-03-03 18:33:12 +08:00 |
duhui
|
8d7b7bdeb3
|
车迟斗法改为跨服玩法
|
2022-03-05 15:39:20 +08:00 |
jiahuiwen
|
85b48640cd
|
删除无用代码
|
2022-03-03 11:56:43 +08:00 |
duhui
|
00b6a93c53
|
四灵试炼战斗记录从redis转移到mongodb
|
2022-03-02 13:13:06 +08:00 |
xuexinpeng
|
837174f0cd
|
周礼包根据不同等级推不同的礼包
|
2022-03-01 14:48:39 +08:00 |
jiahuiwen
|
74463746c4
|
减少聊天信息缓存
|
2022-03-01 13:16:09 +08:00 |
jiahuiwen
|
1dafc96c7c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-03-01 11:34:13 +08:00 |
jiahuiwen
|
6df96edad6
|
优化redis key
|
2022-03-01 11:34:01 +08:00 |
xuexinpeng
|
bb2d555e64
|
排行榜
|
2022-02-28 11:55:59 +08:00 |
xuexinpeng
|
2ada704ba3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-28 10:46:29 +08:00 |
xuexinpeng
|
cb76090d01
|
排行榜
|
2022-02-28 10:45:06 +08:00 |
jiahuiwen
|
5227b6ea0c
|
USER_LOGIN_URL 设置过期时间
|
2022-02-28 10:39:54 +08:00 |
jiahuiwen
|
186ed8f82c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-28 10:37:46 +08:00 |
jiahuiwen
|
f53ddd0d59
|
WORLD_ARENA_RRECORD 巅峰赛战斗记录设置过期时间
|
2022-02-28 10:37:35 +08:00 |
xuexinpeng
|
4c92ff6135
|
战力冲刺
|
2022-02-25 14:56:07 +08:00 |
xuexinpeng
|
4982b2c70d
|
战力冲刺邮件奖励
|
2022-02-25 14:34:58 +08:00 |
xuexinpeng
|
84d5015304
|
战力冲刺排行榜修改
|
2022-02-25 13:37:49 +08:00 |
xuexinpeng
|
4ce354caa5
|
战力冲刺排行榜调整
|
2022-02-25 11:52:23 +08:00 |
jiahuiwen
|
163a14fe36
|
修仙增加日志
|
2022-02-24 13:56:43 +08:00 |
duhui
|
e6ba9c0ac4
|
至尊降世活动提高1000档
|
2022-02-23 18:06:38 +08:00 |
duhui
|
9836cab7a7
|
补充2:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:37:00 +08:00 |
duhui
|
803280eaf0
|
补充:跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:17:35 +08:00 |
duhui
|
dc0eacd113
|
跨服分组兼容,当分组id<=0时,表示不用跨服
|
2022-02-21 17:12:37 +08:00 |
xuexinpeng
|
900412365d
|
战力冲刺
|
2022-02-22 21:02:47 +08:00 |
duhui
|
1368922c6d
|
跨服分组改为gm上手动分组,去除自动分组
|
2022-02-21 00:11:00 +08:00 |
jiahuiwen
|
51b0872905
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-20 10:05:13 +08:00 |
jiahuiwen
|
7df22af548
|
规范日志
|
2022-02-20 10:04:18 +08:00 |
jiahuiwen
|
af4b08c3d2
|
重复购买礼包算成功
|
2022-02-20 09:37:51 +08:00 |
xuexinpeng
|
54f6e06a74
|
活动:战力冲刺
|
2022-02-18 22:57:40 +08:00 |
jiahuiwen
|
6b88e120cd
|
_oaid _imei赋值 deviceid
|
2022-02-18 16:46:27 +08:00 |
jiahuiwen
|
8f7ca009a9
|
上报增加 _androidid
|
2022-02-18 16:34:46 +08:00 |
jiahuiwen
|
df28c22959
|
上报增加默认值
|
2022-02-18 13:35:01 +08:00 |
jiahuiwen
|
980477b790
|
上报修改
|
2022-02-17 20:46:33 +08:00 |
jiahuiwen
|
f2e2835076
|
增加报送的头信息
|
2022-02-17 19:26:02 +08:00 |
jiahuiwen
|
283439f860
|
改post
|
2022-02-17 19:18:34 +08:00 |
jiahuiwen
|
a906ad4712
|
增加字段
|
2022-02-17 18:53:30 +08:00 |
jiahuiwen
|
fb94ec7526
|
金额改字符串
|
2022-02-17 18:48:36 +08:00 |
jiahuiwen
|
e9238bd713
|
openId赋值错误
|
2022-02-17 18:40:42 +08:00 |
jiahuiwen
|
f579fbf20c
|
开天上报打印参数
|
2022-02-17 18:17:55 +08:00 |
jiahuiwen
|
831722996d
|
开天上报 价格 改为 元
|
2022-02-17 18:05:36 +08:00 |
jiahuiwen
|
5ec60747ef
|
开天增加充值上报
|
2022-02-17 17:34:09 +08:00 |
yuanshuai
|
4af6f92c99
|
超值返利兼容老数据bug修改
|
2022-02-21 16:27:25 +08:00 |
yuanshuai
|
0d5a19339b
|
超值返利兼容老数据bug修改
|
2022-02-17 16:28:27 +08:00 |
duhui
|
1210a30798
|
【补充】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:43:08 +08:00 |
duhui
|
0b1295cb61
|
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:14:19 +08:00 |
jiahuiwen
|
91be761235
|
删除多余代码
|
2022-02-15 17:54:42 +08:00 |
jiahuiwen
|
e1a5cd8db8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-15 11:34:35 +08:00 |
jiahuiwen
|
802a85021e
|
神将可控制进入版本时间优化
|
2022-02-15 11:34:25 +08:00 |
duhui
|
b0a1347ddf
|
特权刷新日志添加
|
2022-02-15 10:33:03 +08:00 |
jiahuiwen
|
b4f4c43a0e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-14 17:11:01 +08:00 |
jiahuiwen
|
cc1f777372
|
神将可控制进入版本时间
|
2022-02-14 17:10:51 +08:00 |
yuanshuai
|
45d0438456
|
每日豪礼活动重新开启
|
2022-02-11 16:59:12 +08:00 |
jiahuiwen
|
9b7c9af1cc
|
大圣升星活动添加判断
|
2022-02-11 15:25:48 +08:00 |
yuanshuai
|
e2fc3f54cd
|
超值返利活动修改提交
|
2022-02-26 00:05:29 +08:00 |
xuexinpeng
|
92b7b7ee82
|
每日特惠
|
2022-02-11 11:25:49 +08:00 |
xuexinpeng
|
1ccd802b2d
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-02-10 16:46:56 +08:00 |
xuexinpeng
|
647882cd4e
|
注释掉每日特惠中60元七天特惠活动
|
2022-02-10 16:19:55 +08:00 |
yuanshuai
|
cafea7ce46
|
大闹天宫开战报错bug修改
|
2022-02-10 15:05:13 +08:00 |
yuanshuai
|
3544b10c47
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 15:04:05 +08:00 |
yuanshuai
|
4443ac1bf2
|
大闹天宫开战报错bug修改
|
2022-02-10 15:03:52 +08:00 |
jiahuiwen
|
63cf33f5d4
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-02-10 11:28:36 +08:00 |
jiahuiwen
|
6053cf9db9
|
神将可控制进入版本时间
|
2022-02-10 11:28:33 +08:00 |
duhui
|
b3b7ce5ed7
|
日志级别调整
|
2022-02-08 18:26:13 +08:00 |
jiahuiwen
|
acb0dcb9d3
|
探索优化
|
2022-01-26 15:06:16 +08:00 |
xuexinpeng
|
36e8abdb61
|
探索相关报错
|
2022-01-26 13:44:38 +08:00 |
xuexinpeng
|
6f9a1ee82c
|
log相关
|
2022-01-25 13:43:02 +08:00 |
DESKTOP-98AVA47\Administrator
|
0c84030817
|
超值基金bug修改
|
2022-01-18 01:10:52 +08:00 |
duhui
|
b94adebdc7
|
超值基金活动修改,线上兼容2
|
2022-01-24 18:03:13 +08:00 |
duhui
|
a29f8a08c2
|
超值基金活动修改,线上兼容
|
2022-01-24 17:31:49 +08:00 |
duhui
|
121bd7924f
|
超值基金活动修改
|
2022-01-24 17:10:11 +08:00 |
jiahuiwen
|
a7c5616dbf
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-24 10:58:53 +08:00 |
duhui
|
73687ceeaa
|
新增主角时装类型
(cherry picked from commit e2c331f840 )
|
2022-01-22 14:27:54 +08:00 |
xuexinpeng
|
fe971df10d
|
探索公会重置
|
2022-01-22 11:31:16 +08:00 |
xuexinpeng
|
09efdc1b7a
|
探索退出公会重置个人数
|
2022-02-10 01:00:05 +08:00 |
xuexinpeng
|
02f41921ab
|
探索达人
|
2022-02-04 16:38:47 +08:00 |
xuexinpeng
|
9310dcfc4f
|
探索达人
|
2022-02-10 00:04:06 +08:00 |
xuexinpeng
|
85969b7acf
|
探索bug
|
2022-01-21 17:19:47 +08:00 |
yuanshuai
|
1f3fce5ece
|
战斗力不一致bug修复(总好感度属性加成导致的)
|
2022-01-20 15:17:00 +08:00 |
duhui
|
12600a3bed
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-19 17:05:44 +08:00 |
duhui
|
df9f1501c2
|
家园特权,重复购买问题解决
|
2022-01-19 17:04:52 +08:00 |
yuanshuai
|
19ab726801
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2022-01-19 16:31:10 +08:00 |
yuanshuai
|
925b06352f
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
# Conflicts:
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-22 11:14:33 +08:00 |
jiahuiwen
|
64fc286053
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-18 16:32:14 +08:00 |
yuanshuai
|
89152453e6
|
节日登录活动提交
|
2022-02-13 23:59:56 +08:00 |
jiahuiwen
|
2203e54375
|
优化代码
|
2022-01-18 16:31:48 +08:00 |
duhui
|
3e3e5ee1bf
|
牛气冲天任务优化
|
2022-01-18 10:06:09 +08:00 |
jiahuiwen
|
351909d5f3
|
鸿蒙阵推送
|
2022-01-18 09:56:28 +08:00 |
jiahuiwen
|
ff3c81bfbe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-17 18:59:05 +08:00 |
jiahuiwen
|
fc6bf6f613
|
家园任务bug
|
2022-01-17 18:58:56 +08:00 |
xuexinpeng
|
4bbf743013
|
断线重连探索
|
2022-01-17 18:34:22 +08:00 |
xuexinpeng
|
6bd1bb83ee
|
规范部分log
|
2022-01-17 11:16:47 +08:00 |
xuexinpeng
|
2aecb022a6
|
探索冲突
|
2022-01-15 18:46:26 +08:00 |
jiahuiwen
|
c3075fadb4
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/explorerMap/ExplorerMapLogic.java
|
2022-01-15 18:44:15 +08:00 |
xuexinpeng
|
eb9ed25093
|
探索报空
|
2022-01-15 18:33:19 +08:00 |
xuexinpeng
|
3a1a61171a
|
SExplore判空
|
2022-01-15 18:27:25 +08:00 |
xuexinpeng
|
315083312d
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-15 16:38:31 +08:00 |
jiahuiwen
|
ee98e74895
|
类型转换错误
|
2022-01-15 11:43:57 +08:00 |
jiahuiwen
|
cf6c9cc9ff
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-15 11:08:09 +08:00 |
jiahuiwen
|
5cecf52687
|
森罗幻境阵容bug
|
2022-01-15 11:07:23 +08:00 |
duhui
|
70d69c58b4
|
每日特惠活动
|
2022-01-15 10:09:18 +08:00 |
xuexinpeng
|
129e31c61f
|
断线重连玩家处理/log
|
2022-01-14 13:56:52 +08:00 |
xuexinpeng
|
8aa8865f42
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-14 11:41:57 +08:00 |
xuexinpeng
|
8dd658edc5
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息
|
2022-01-13 18:32:39 +08:00 |
yuanshuai
|
f5ea9a3b8c
|
天地洪炉脚本抽奖脚本完善
|
2022-01-13 15:12:29 +08:00 |
yuanshuai
|
144ea73fa0
|
代码整理
|
2022-01-12 10:15:53 +08:00 |
jiahuiwen
|
996169647e
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2022-01-11 14:00:08 +08:00 |
duhui
|
f305dea91f
|
修改注释
|
2022-03-14 00:01:18 +08:00 |
jiahuiwen
|
d352dbb972
|
Merge branch 'master_test_gn' into master_test_gn_upStarHeroActiviry
|
2022-01-11 11:09:46 +08:00 |
yuanshuai
|
813ca52e63
|
英雄升星活动选择英雄限制
|
2022-01-22 16:30:21 +08:00 |
yuanshuai
|
bb15b379ea
|
升星活动脚本修改提交
|
2022-01-22 16:20:41 +08:00 |
yuanshuai
|
c532cad640
|
多提交的内容还原
|
2022-01-22 10:53:53 +08:00 |
yuanshuai
|
2594a30e6a
|
新版升星活动脚本提交
|
2022-01-20 18:36:25 +08:00 |
duhui
|
6f35e726a0
|
家园建筑gm,修改1
|
2022-01-10 18:21:28 +08:00 |
duhui
|
f0a19957b2
|
家园建筑gm
|
2022-01-10 18:18:27 +08:00 |
yuanshuai
|
69166c0950
|
天地洪炉抽卡特殊处理
|
2022-01-22 16:24:57 +08:00 |
yuanshuai
|
1367f81092
|
天地洪炉bug修改
|
2022-01-10 13:44:39 +08:00 |
yuanshuai
|
058cb045ce
|
天地洪炉bug修改提交
|
2022-01-10 13:42:45 +08:00 |
yuanshuai
|
e9b492ee5d
|
天地洪炉抽奖bug修改
|
2022-01-10 12:07:44 +08:00 |
duhui
|
c03ae4a02f
|
易经宝库gm
|
2022-01-06 18:14:26 +08:00 |
xuexinpeng
|
a7c2a5a71f
|
森罗幻境自动挂机返回掉落展示清除
|
2022-01-06 16:25:22 +08:00 |
duhui
|
718ca61a46
|
Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
# tablemanager/src/main/java/config/SHomeLand.java
# tablemanager/src/main/java/config/SHomeLandLevel.java
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2022-01-06 16:15:00 +08:00 |
xuexinpeng
|
5031f7d9e8
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2022-01-06 16:08:27 +08:00 |
xuexinpeng
|
a58b5f8948
|
删除没用引用
|
2022-01-06 16:07:45 +08:00 |
duhui
|
8946f22d57
|
【法宝聚灵&跨服rpc】
1、聚灵表添加新列
2、rpc方法添加catch,简化log
|
2022-01-06 14:59:08 +08:00 |
duhui
|
c82267c4ea
|
【法宝聚灵】
1、添加总星级属性
|
2022-01-06 13:45:37 +08:00 |
duhui
|
91c2a4bf0c
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-06 11:20:07 +08:00 |
duhui
|
06bdbf2a78
|
法宝聚灵优化,添加总星级属性加成
|
2022-01-06 11:12:26 +08:00 |
xuexinpeng
|
a1fbed11b2
|
单笔充值领奖活动
|
2022-01-05 18:34:53 +08:00 |
duhui
|
0689f52cbe
|
【家园功能1.1.16】
1、建筑升级,解决特权加速时间bug2
|
2022-01-05 16:07:50 +08:00 |
duhui
|
ff205bd900
|
【家园功能1.1.15】
1、建筑升级,解决特权加速时间bug
|
2022-01-05 15:46:22 +08:00 |
duhui
|
a0de4fd484
|
【家园功能1.1.14】
1、处理装备强化逻辑bug2
|
2022-01-05 15:03:28 +08:00 |
duhui
|
1e11b909fc
|
【家园功能1.1.13】
1、处理装备强化逻辑bug
|
2022-01-05 14:28:35 +08:00 |
duhui
|
e912f389ca
|
【家园功能1.1.12】
1、代码优化,防止空指针
|
2022-01-05 13:38:55 +08:00 |
duhui
|
fb9f074c17
|
Merge branch 'master_test_gn' into 开发/dev_dh
|
2022-01-05 10:18:43 +08:00 |
duhui
|
215cc76897
|
【家园功能1.1.11】
1、装备升级优化
|
2022-01-05 10:15:17 +08:00 |
duhui
|
2707c018f0
|
【家园功能1.1.10】
1、zhuang bei sheng ji
|
2022-01-04 18:34:57 +08:00 |
duhui
|
bd9c2e002a
|
【家园功能1.1.9】
1、特权收益加成修改
|
2022-01-04 15:55:50 +08:00 |
jiahuiwen
|
567a46b4ad
|
Merge branch 'master_prb_gn' into master_test_gn
|
2022-01-04 14:33:01 +08:00 |
jiahuiwen
|
5e51e9c8dc
|
删除多余代码
|
2022-01-04 14:27:28 +08:00 |
duhui
|
6870645ea4
|
代码格式处理,不影响逻辑
|
2022-01-04 11:50:35 +08:00 |
duhui
|
a6595b054e
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2022-01-04 11:45:13 +08:00 |
duhui
|
e9b526e61b
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:44:43 +08:00 |
jiahuiwen
|
e4e4715543
|
竞技试炼发奖励bug
|
2022-01-04 11:44:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
29dc23ed4e
|
跨服战斗,身外化身技能
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
6074368c60
|
删除多余代码
|
2022-01-04 11:44:42 +08:00 |
jiahuiwen
|
925b9688c0
|
神将回退突破等级归 0
|
2022-01-04 11:44:41 +08:00 |
jiahuiwen
|
71ecc1510a
|
超值返利删除容错代码
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
454388b731
|
神将回退卸下魂印bug
|
2022-01-04 11:44:40 +08:00 |
jiahuiwen
|
70ce7e3446
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
812f8ac7d1
|
神将回退bug
|
2022-01-04 11:44:39 +08:00 |
jiahuiwen
|
7642a5b5fb
|
神将回退增加上报
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
8d014c2269
|
减少玩家数据在内存时间
|
2022-01-04 11:44:38 +08:00 |
jiahuiwen
|
9284eb0e48
|
删除无用代码
|
2022-01-04 11:44:37 +08:00 |
yuanshuai
|
352a586ae2
|
超值返利网页支付重复购买礼包问题修改
|
2022-01-04 11:44:36 +08:00 |
yuanshuai
|
b870b9afa2
|
命石快速合成bug修改
|
2022-01-04 11:44:36 +08:00 |
jiahuiwen
|
61b3a6113e
|
逐胜商店刷新错误
|
2022-01-04 11:44:35 +08:00 |
yuanshuai
|
c8f9014741
|
命石一键合成bug修改
|
2022-01-04 11:44:34 +08:00 |
yuanshuai
|
b8de92f98c
|
添加批量删除道具GM
|
2022-01-04 11:44:12 +08:00 |
yuanshuai
|
93555c633d
|
命石快速合成脚本修改提交
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
0414793568
|
命石快速合成脚本优化
|
2022-01-04 11:43:23 +08:00 |
yuanshuai
|
d17c6cdec9
|
命格脚本修改
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
2028b3cfe2
|
命格脚本优化
|
2022-01-04 11:43:22 +08:00 |
yuanshuai
|
f06acc6801
|
命格脚本优化
|
2022-01-04 11:43:21 +08:00 |
yuanshuai
|
946d97a7d4
|
脚本优化
|
2022-01-04 11:43:20 +08:00 |
yuanshuai
|
4a2f7fc95e
|
整理代码
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
a66ff0d2ba
|
添加命格计算战斗力逻辑
|
2022-01-04 11:43:16 +08:00 |
yuanshuai
|
487722d6ac
|
命格脚本提交
|
2022-01-04 11:43:05 +08:00 |
yuanshuai
|
a58adbbb18
|
超值返利网页支付bug修改
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
7c21b147a0
|
返还道具bug
|
2022-01-04 11:41:54 +08:00 |
xuexinpeng
|
ebae30feef
|
战斗星级
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
64f4f644de
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
30111415c0
|
补充
|
2022-01-04 11:41:54 +08:00 |
jiahuiwen
|
eb504fd20c
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2022-01-04 11:41:54 +08:00 |
DESKTOP-98AVA47\Administrator
|
17242edf01
|
获取活动开启时间
|
2022-01-04 11:41:53 +08:00 |
jiahuiwen
|
6e3b1b5be9
|
升星配方调整补偿
|
2022-01-04 11:41:53 +08:00 |
duhui
|
5312fc728c
|
大闹天宫机器人,星级问题处理
|
2022-01-04 11:40:52 +08:00 |
jiahuiwen
|
458b8a8165
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2022-01-04 11:05:02 +08:00 |
jiahuiwen
|
affe194539
|
竞技试炼发奖励bug
|
2022-01-04 11:02:41 +08:00 |
xuexinpeng
|
f6ac2a88bd
|
探索时间戳进位
|
2021-12-31 17:33:31 +08:00 |
xuexinpeng
|
3b14b27161
|
探索
|
2021-12-31 14:03:07 +08:00 |
xuexinpeng
|
64df199aee
|
探索
|
2021-12-31 13:49:24 +08:00 |
duhui
|
a56918a674
|
【家园功能1.1.8】
1、装备强化增加战力修改
|
2021-12-31 13:39:41 +08:00 |
jiahuiwen
|
50d5195692
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-31 10:49:12 +08:00 |
jiahuiwen
|
ffb0488e50
|
赠送好友友情点bug
|
2021-12-31 10:49:04 +08:00 |
xuexinpeng
|
82dde4cdb8
|
森罗幻境自动挂机奖励展示
|
2021-12-31 10:36:32 +08:00 |
duhui
|
b1c4e0ba35
|
【家园功能1.1.7】
1、装备方法bug修改
|
2021-12-31 10:22:49 +08:00 |
duhui
|
3dab8bf18c
|
【家园功能1.1.6】
1、家园装备强化展示
|
2021-12-30 18:34:43 +08:00 |
xuexinpeng
|
188ea389e6
|
森罗幻境自动挂机奖励展示
|
2021-12-30 18:19:24 +08:00 |
yuanshuai
|
c3553579e2
|
新增被动技能注释
|
2021-12-30 17:40:47 +08:00 |
duhui
|
6cbd8104e7
|
云游商人,装备升级逻辑修改
|
2021-12-30 17:09:45 +08:00 |
yuanshuai
|
8ac39917af
|
牛魔王4火不生效bug修改(添加了一个被动技能)
|
2021-12-30 16:23:13 +08:00 |
duhui
|
9e433e1969
|
【家园功能1.1.5】
1、家园特权功能添加
|
2021-12-30 16:09:24 +08:00 |
duhui
|
a61999d664
|
【家园功能1.1.4(特殊)】
1、删除栖云阁一键领取代码,之后有需要可以从本次提交找回
|
2021-12-30 15:21:27 +08:00 |
duhui
|
6b139b482e
|
【家园功能1.1.3】
1、装备强化验证bug修改
|
2021-12-30 13:51:29 +08:00 |
xuexinpeng
|
16fc0ffbbb
|
离线探索
|
2021-12-30 13:34:34 +08:00 |
xuexinpeng
|
bb1bea214f
|
探索
|
2021-12-30 10:26:22 +08:00 |
xuexinpeng
|
f4f027c40c
|
探索
|
2021-12-29 18:24:24 +08:00 |
duhui
|
7c19af673d
|
【家园功能1.1.2】
1、装备强化表数据修改
|
2021-12-29 18:20:43 +08:00 |
xuexinpeng
|
35c2547c89
|
探索
|
2021-12-29 17:44:51 +08:00 |
xuexinpeng
|
b816997e38
|
探索
|
2021-12-29 19:16:02 +08:00 |
xuexinpeng
|
dae028d07f
|
探索
|
2021-12-29 19:05:13 +08:00 |
xuexinpeng
|
28e984d9e9
|
探索
|
2021-12-29 19:01:26 +08:00 |
xuexinpeng
|
4ea6f544cb
|
探索
|
2021-12-29 17:26:42 +08:00 |
duhui
|
dc71d70ad2
|
【家园功能1.1.1】
1、建筑解锁修改
|
2021-12-29 17:08:18 +08:00 |
yuanshuai
|
e8fd75b925
|
Merge branch 'master_test_gn' into master_test_gn_feisheng
|
2021-12-29 15:17:19 +08:00 |
duhui
|
07dfc01d30
|
【家园功能1.1.0】
1、任务功能完善
2、添加装备突破功能
3、装备强化信息添加到英雄信息
4、跨服添加家园装备强化信息
|
2021-12-29 15:12:02 +08:00 |
yuanshuai
|
455cccd059
|
飞升跑马灯脚本提交
|
2021-12-29 14:55:38 +08:00 |
xuexinpeng
|
5e811fb9aa
|
探索血量更新
|
2021-12-28 18:25:41 +08:00 |
xuexinpeng
|
eab1eb0b89
|
探索
|
2021-12-28 18:02:46 +08:00 |
duhui
|
e5fc1ea28c
|
【家园功能1.0.9】建筑升级只允许一次升级一个建筑,装备强化bug优化
|
2021-12-28 17:39:20 +08:00 |
xuexinpeng
|
705e81c629
|
探索
|
2021-12-28 16:32:49 +08:00 |
jiahuiwen
|
973c2b9ce8
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-28 15:24:45 +08:00 |
jiahuiwen
|
bf85dfec3c
|
超值返利删除容错代码
|
2021-12-28 15:24:37 +08:00 |
DESKTOP-98AVA47\Administrator
|
97bd55af89
|
跨服战斗,身外化身技能
|
2021-12-28 15:21:14 +08:00 |
yuanshuai
|
9b31eeadc9
|
飞升脚本修改提交
|
2021-12-28 15:07:39 +08:00 |
duhui
|
ee97a40004
|
【家园功能1.0.8】建筑解锁推送修改,只推送解锁的建筑
|
2021-12-28 14:59:59 +08:00 |
xuexinpeng
|
3c5f29e2e5
|
探索 测试 不扣消耗
|
2021-12-28 14:33:23 +08:00 |
ZhangBiao
|
304d1da7ef
|
[家园功能1.0.7]建筑解锁Indication修改
|
2021-12-28 11:52:54 +08:00 |
ZhangBiao
|
c7a22e0787
|
[家园功能1.0.6]建筑收益bug修改
|
2021-12-28 11:12:31 +08:00 |
xuexinpeng
|
6b07593757
|
探索
|
2021-12-27 18:36:31 +08:00 |
jiahuiwen
|
71eb51d017
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:18:57 +08:00 |
jiahuiwen
|
89f4eae73e
|
删除多余代码
|
2021-12-27 17:18:31 +08:00 |
jiahuiwen
|
313053ed5d
|
神将回退突破等级归 0
|
2021-12-27 17:17:56 +08:00 |
jiahuiwen
|
811d67c536
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 17:00:18 +08:00 |
duhui
|
937c740ebd
|
【家园功能1.0.5】建筑升级前置条件判断,添加长度验证
|
2021-12-27 16:56:32 +08:00 |
jiahuiwen
|
7ebd8878de
|
神将回退卸下魂印bug
|
2021-12-27 16:55:11 +08:00 |
xuexinpeng
|
87bcc6d5d7
|
探索
|
2021-12-27 16:33:32 +08:00 |
yuanshuai
|
6faac1d034
|
超值返利网页支付bug修改
|
2021-12-27 16:24:46 +08:00 |
jiahuiwen
|
ac30e70c2e
|
神将回退bug
|
2021-12-27 16:11:51 +08:00 |
jiahuiwen
|
5f04e68e3d
|
神将回退bug
|
2021-12-27 16:09:56 +08:00 |
jiahuiwen
|
9c998b86e6
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-27 16:01:30 +08:00 |
jiahuiwen
|
4ee0f7b5f2
|
神将回退bug
|
2021-12-27 15:57:09 +08:00 |
duhui
|
bee333690e
|
【家园功能1.0.4】无用代码删除,不影响原有逻辑
|
2021-12-27 14:57:24 +08:00 |
jiahuiwen
|
ecd017281d
|
神将回退增加上报
|
2021-12-27 14:25:21 +08:00 |
duhui
|
fed5fcf59b
|
【家园功能1.0.4】日志完善内容
|
2021-12-27 14:01:55 +08:00 |
duhui
|
ad1cf08eae
|
【家园功能1.0.3】建筑升级添加前置建筑等级验证,建筑解锁逻辑优化
|
2021-12-27 13:45:47 +08:00 |
duhui
|
4e852db95b
|
【家园功能1.0.2】生产建筑存储总上限修改,部分建筑生产无总上限,只有领取上限
|
2021-12-27 11:47:40 +08:00 |
jiahuiwen
|
b88a69ef3a
|
减少玩家数据在内存时间
|
2021-12-27 10:25:35 +08:00 |
xuexinpeng
|
8f0010b1be
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
|
2021-12-27 10:04:54 +08:00 |
xuexinpeng
|
6a6cbaca50
|
探索
|
2021-12-27 10:02:59 +08:00 |
duhui
|
20b1c958e5
|
【家园功能1.0.1】任务优化,添加升级取消功能
|
2021-12-24 18:20:10 +08:00 |
jiahuiwen
|
c6d13b6685
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-12-24 17:52:59 +08:00 |
jiahuiwen
|
4132cd1f80
|
删除无用代码
|
2021-12-24 17:52:09 +08:00 |
duhui
|
6f3c8768bf
|
【家园功能1.0】待联调
|
2021-12-24 17:07:57 +08:00 |
jiahuiwen
|
8f47418546
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-24 13:55:10 +08:00 |
jiahuiwen
|
0602b9f003
|
逐胜商店刷新错误
|
2021-12-24 13:55:03 +08:00 |
xuexinpeng
|
b9cc3dec5f
|
探索
|
2021-12-24 11:29:51 +08:00 |
yuanshuai
|
93596965dd
|
超值返利网页支付重复购买礼包问题修改
|
2021-12-24 09:49:28 +08:00 |
yuanshuai
|
540e61d512
|
超值返利网页支付bug修改
|
2021-12-23 16:05:15 +08:00 |
yuanshuai
|
5cedfa6e4e
|
命石快速合成bug修改
|
2021-12-23 15:14:43 +08:00 |
yuanshuai
|
9b545e5eea
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
|
2021-12-23 09:53:52 +08:00 |
yuanshuai
|
4de94d16ea
|
飞升脚本提交
|
2021-12-23 09:51:48 +08:00 |
xuexinpeng
|
503ef57f57
|
探索
|
2021-12-22 18:04:05 +08:00 |
jiahuiwen
|
a9df7aa7e0
|
返还道具bug
|
2021-12-22 10:54:44 +08:00 |
xuexinpeng
|
49811877fa
|
战斗星级
|
2021-12-21 19:07:26 +08:00 |
xuexinpeng
|
e683d993d5
|
探索 战斗
|
2021-12-21 19:04:56 +08:00 |
jiahuiwen
|
90e98f6355
|
int NEW_WELFARE = 42;//萌新福利 这个活动未开启需要记录进度
|
2021-12-21 17:48:01 +08:00 |
xuexinpeng
|
9253e775f0
|
探索
|
2021-12-21 16:46:24 +08:00 |
xuexinpeng
|
db7dbb84c2
|
探索
|
2021-12-23 17:19:54 +08:00 |
jiahuiwen
|
d3b35d55d0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 10:50:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
8aba14dbe2
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-23 19:13:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
5421882672
|
补充
|
2021-12-23 19:13:39 +08:00 |
DESKTOP-98AVA47\Administrator
|
9b6f5a8e0c
|
获取活动开启时间
|
2021-12-23 19:01:57 +08:00 |
jiahuiwen
|
bd15f69616
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-21 10:50:43 +08:00 |
jiahuiwen
|
cf91ff167b
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-21 09:55:23 +08:00 |
jiahuiwen
|
a97bca5c9b
|
升星配方调整补偿
|
2021-12-21 09:55:12 +08:00 |
yuanshuai
|
b473c1a6ca
|
旧版积天豪礼bug修改
|
2021-12-20 18:52:08 +08:00 |
xuexinpeng
|
048c240cb4
|
礼包刷新
|
2021-12-23 17:21:26 +08:00 |
jiahuiwen
|
fb5036ea29
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:51:23 +08:00 |
xuexinpeng
|
a7ff90e6a7
|
规范代码
|
2021-12-29 00:03:50 +08:00 |
jiahuiwen
|
2596eb08b9
|
2021-12-22 09:00:00 之后开的服,首充不显示累充满100元任务
|
2021-12-20 11:51:13 +08:00 |
xuexinpeng
|
d9e9f378ef
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2021-12-20 11:31:19 +08:00 |
jiahuiwen
|
7ea5e79269
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-20 11:12:59 +08:00 |
yuanshuai
|
9d7058bec8
|
新版天天尊降世bug修改
|
2021-12-23 11:04:02 +08:00 |
yuanshuai
|
652caf6b5b
|
旧版积天豪礼代码兼容
|
2021-12-31 00:02:41 +08:00 |
jiahuiwen
|
58311e37df
|
心愿抽奖 400 次后不重置剩余保底次数
|
2021-12-20 11:12:47 +08:00 |
jiahuiwen
|
fc01267f37
|
每日豪礼 活动类型 13 不再更新,补发奖励
|
2021-12-20 10:20:31 +08:00 |
jiahuiwen
|
78bf408e42
|
积天豪礼活动已被替换,未参与的玩家不再累计
|
2021-12-17 18:31:52 +08:00 |
jiahuiwen
|
80f48b3f42
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 17:19:57 +08:00 |
jiahuiwen
|
7012d6c647
|
灵兽宝阁特殊使用
|
2021-12-17 17:19:40 +08:00 |
yuanshuai
|
f473965b9d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 16:13:59 +08:00 |
yuanshuai
|
df0059632a
|
新版积天豪礼活动提交
|
2021-12-17 16:13:50 +08:00 |
yuanshuai
|
d814ecb635
|
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/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2022-01-03 11:48:04 +08:00 |
yuanshuai
|
b3d5dfc0e6
|
新积天豪礼活动脚本修改提交
|
2022-01-03 11:46:33 +08:00 |
jiahuiwen
|
ebc1106e3c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-17 15:05:08 +08:00 |
jiahuiwen
|
847efbe252
|
原有罗浮货币登录时转化为逐胜徽章
|
2021-12-17 15:05:01 +08:00 |
jiahuiwen
|
87f073bb89
|
新人商城活动
|
2021-12-17 10:52:19 +08:00 |
xuexinpeng
|
e54a1c6243
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-29 00:22:01 +08:00 |
xuexinpeng
|
70d147e593
|
新特惠
|
2021-12-29 00:20:38 +08:00 |
xuexinpeng
|
652097f613
|
新每日特惠
|
2021-12-17 17:58:55 +08:00 |
xuexinpeng
|
956c9cc2fe
|
新特惠礼包
|
2021-12-23 00:17:13 +08:00 |
jiahuiwen
|
2715ea64a3
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-16 18:19:21 +08:00 |
jiahuiwen
|
5ef7afe587
|
功能开启关闭
|
2021-12-16 18:19:13 +08:00 |
yuanshuai
|
d96dc3a63d
|
新版天尊降世代码提交
|
2021-12-16 16:39:02 +08:00 |
jiahuiwen
|
d56b0b6a08
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-16 16:30:06 +08:00 |
jiahuiwen
|
701d32c31f
|
回退bug
|
2021-12-16 16:29:55 +08:00 |
yuanshuai
|
83c72f95ba
|
道具添加使用等级限制
|
2021-12-16 15:28:08 +08:00 |
yuanshuai
|
93993d8150
|
挂机收益道具逻辑修改
|
2021-12-16 11:14:48 +08:00 |
yuanshuai
|
db39942231
|
使用资源包道具逻辑完善
|
2021-12-16 10:44:32 +08:00 |
jiahuiwen
|
4ae13de871
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-15 18:42:17 +08:00 |
jiahuiwen
|
6f38da5b27
|
回退修复
|
2021-12-15 18:42:12 +08:00 |
yuanshuai
|
1c3a458869
|
漏提交关卡限制条件脚本
|
2021-12-15 13:07:39 +08:00 |
yuanshuai
|
a5762d9aa9
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-15 13:01:53 +08:00 |
yuanshuai
|
ce4d17763f
|
新增道具类型
|
2021-12-15 13:01:44 +08:00 |
jiahuiwen
|
3b112b0dff
|
回退不飘字
|
2021-12-15 10:57:50 +08:00 |
jiahuiwen
|
1f08ca2f33
|
回退所得神将不更新任务或活动
|
2021-12-15 09:45:00 +08:00 |
jiahuiwen
|
edf251cd1f
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-14 17:58:42 +08:00 |
jiahuiwen
|
53b29d606e
|
神将回退
|
2021-12-14 17:58:31 +08:00 |
yuanshuai
|
9a02fbc459
|
使用资源包道具修改脚本提交
|
2021-12-14 17:40:30 +08:00 |
yuanshuai
|
b865fac770
|
新增经验和金币收益道具脚本提交
|
2021-12-14 17:37:27 +08:00 |
yuanshuai
|
23b2c9285e
|
命石一键合成bug修改
|
2021-12-14 16:06:41 +08:00 |
yuanshuai
|
2fcf50d33e
|
添加批量删除道具GM
|
2021-12-14 14:55:59 +08:00 |
xuexinpeng
|
8313116aa3
|
御剑行活动配置
|
2021-12-14 13:45:12 +08:00 |
xuexinpeng
|
0117de31fc
|
探索地图
|
2021-12-14 11:45:17 +08:00 |
yuanshuai
|
1ee2a60fc0
|
命石快速合成脚本修改提交
|
2021-12-13 18:41:46 +08:00 |
yuanshuai
|
9a2bf80a9b
|
脚本优化
|
2021-12-13 17:34:19 +08:00 |
yuanshuai
|
69607c3c66
|
命石快速合成脚本优化
|
2021-12-13 16:23:32 +08:00 |
jiahuiwen
|
bdc1aa723a
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 16:10:24 +08:00 |
jiahuiwen
|
9d232a7783
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-13 16:07:02 +08:00 |
jiahuiwen
|
aa4341c12b
|
无尽秘宝,英雄升星需要增加数量
|
2021-12-13 16:06:55 +08:00 |
yuanshuai
|
ce6b4d239b
|
关卡限制脚本优化
|
2021-12-13 14:55:23 +08:00 |
jiahuiwen
|
08ca89a90f
|
开商店
|
2021-12-13 14:44:08 +08:00 |
jiahuiwen
|
586945be2c
|
删除报错
|
2021-12-13 14:05:11 +08:00 |
jiahuiwen
|
1f952efa98
|
Merge branch 'master_test_gn_zf' of http://60.1.1.230/backend/jieling_server into master_test_gn_zf
|
2021-12-13 14:04:18 +08:00 |
jiahuiwen
|
bbc555db7c
|
删活动
|
2021-12-13 14:04:12 +08:00 |
yuanshuai
|
312ad1cd58
|
主线关卡限制条件增加
|
2021-12-13 12:04:33 +08:00 |
jiahuiwen
|
ea6ebeb278
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 11:56:42 +08:00 |
jiahuiwen
|
8a5b72f0fa
|
消除编译错误
|
2021-12-13 11:55:29 +08:00 |
jiahuiwen
|
450ab39a7e
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-12-13 11:38:56 +08:00 |
jiahuiwen
|
308f406daa
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-13 11:38:23 +08:00 |
jiahuiwen
|
292b395dfe
|
优化
|
2021-12-13 11:38:12 +08:00 |
jiahuiwen
|
a19352578e
|
登录检测已开启的活动,商店是否开启
|
2021-12-13 11:30:53 +08:00 |
yuanshuai
|
0b34d98e99
|
Merge branch 'master_test_gn' into master_test_gn_lifeGrid
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2021-12-13 10:49:37 +08:00 |
yuanshuai
|
ea545c50ac
|
主线关卡限制条件增加
|
2021-12-13 10:12:29 +08:00 |
yuanshuai
|
8a77b7c2d5
|
添加关卡附加条件功能提交
|
2021-12-10 18:43:49 +08:00 |
duhui
|
9a7a6f71f5
|
公会boss伤害超上限
|
2021-12-10 18:27:30 +08:00 |
duhui
|
8d7394d1ac
|
公会boss伤害超上限
|
2021-12-10 16:44:38 +08:00 |
duhui
|
1af8836d72
|
注释修改
|
2021-12-10 16:24:53 +08:00 |
duhui
|
143c7a5230
|
招募秘宝
|
2021-12-10 14:24:47 +08:00 |
yuanshuai
|
72637c0ec5
|
命格脚本修改
|
2021-12-10 14:03:45 +08:00 |
yuanshuai
|
09cd66d6ca
|
命格脚本优化
|
2021-12-10 11:03:32 +08:00 |
yuanshuai
|
9060e00553
|
命格脚本优化
|
2021-12-10 09:55:51 +08:00 |
jiahuiwen
|
02807f9c49
|
关闭 云梦祈福
|
2021-12-09 16:22:35 +08:00 |
jiahuiwen
|
50118efe42
|
优化打印
|
2021-12-09 15:34:45 +08:00 |
jiahuiwen
|
33546f01b2
|
增加保存
|
2021-12-09 15:26:51 +08:00 |
jiahuiwen
|
3ba82851fd
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-09 14:14:51 +08:00 |
jiahuiwen
|
afa8040533
|
竞技试炼
|
2021-12-09 14:14:39 +08:00 |
duhui
|
32a5f49782
|
连续礼包补充
|
2021-12-09 11:44:19 +08:00 |
duhui
|
c555ca977f
|
连续礼包,礼包id重复问题处理
|
2021-12-09 11:32:58 +08:00 |
yuanshuai
|
b8de907745
|
脚本优化
|
2021-12-09 10:11:14 +08:00 |
yuanshuai
|
be54f4627d
|
整理代码
|
2021-12-08 17:13:16 +08:00 |
yuanshuai
|
1455339b03
|
添加命格计算战斗力逻辑
|
2021-12-08 17:03:28 +08:00 |
yuanshuai
|
204eb5f959
|
命格脚本提交
|
2021-12-08 16:50:41 +08:00 |
xuexinpeng
|
d69aca969f
|
删除部分无用log
|
2021-12-08 13:28:06 +08:00 |
jiahuiwen
|
e754405dfe
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-08 13:20:02 +08:00 |
jiahuiwen
|
ad85622fe3
|
竞技试炼
|
2021-12-08 13:19:21 +08:00 |
xuexinpeng
|
ca60360b64
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-12-07 18:38:06 +08:00 |
xuexinpeng
|
9d893b37ad
|
战斗同步
|
2021-12-07 18:37:27 +08:00 |
jiahuiwen
|
e6d3b7a85c
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-12-07 17:59:54 +08:00 |
jiahuiwen
|
426b23d23f
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-12-07 17:58:45 +08:00 |
xuexinpeng
|
c6fc2fd87a
|
李海洋-gm降关卡
|
2021-12-07 17:02:43 +08:00 |
duhui
|
0914af5631
|
活动非空判断
|
2021-12-07 16:08:00 +08:00 |
duhui
|
946ae79b7c
|
补充
|
2021-12-07 15:24:37 +08:00 |