zhangshanxue
|
ecc95a79a4
|
社稷大典公会排行
|
2020-10-28 12:14:06 +08:00 |
zhangshanxue
|
210f4a1529
|
社稷大典代码提交
|
2020-10-25 17:00:00 +08:00 |
zhangshanxue
|
6e7465f17d
|
Merge branch 'master_test_hw' into master_test_hw_sheji
|
2020-10-21 16:27:13 +08:00 |
zhangshanxue
|
9bc774ef2b
|
添加新币种
|
2020-10-19 23:25:14 +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
|
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 |
lvxinran
|
175b75a796
|
免费礼包、达人活动提交
|
2020-09-25 11:44:36 +08:00 |
zhangshanxue
|
0a565bb025
|
Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
|
2020-09-15 16:16:07 +08:00 |
zhangshanxue
|
f4dc939fc2
|
网页支付玩家定制化商品列表
|
2020-09-15 16:15:59 +08:00 |
lvxinran
|
bb6a149f89
|
天宫秘宝修改
|
2020-09-15 14:43:13 +08:00 |
jiahuiwen
|
c3aa0b815f
|
替换 System.out.println
|
2020-09-02 16:27:26 +08:00 |
jiahuiwen
|
d1eccf88b9
|
代码优化
|
2020-09-01 17:20:57 +08:00 |
jiahuiwen
|
c3be084f49
|
优化代码
|
2020-09-01 14:45:47 +08:00 |
jiahuiwen
|
8e31ca0acf
|
优化代码
|
2020-09-01 10:45:16 +08:00 |
zhangshanxue
|
a1b2d3e3f3
|
任务类型和充值计费点
|
2020-09-09 23:22:00 +08:00 |
lvxinran
|
5f9b70ea80
|
天宫秘宝积分购买添加 公会副本击杀奖励修改
|
2020-10-01 00:40:30 +08:00 |
zhangshanxue
|
bacd35c48e
|
测试充值
|
2020-08-25 18:29:17 +08:00 |
zhangshanxue
|
07595796fa
|
合分支
|
2020-08-24 23:36:16 +08:00 |
zhangshanxue
|
23ade886ae
|
Merge branch 'master' into master_test_hw
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
# tablemanager/src/main/java/config/SRechargeCommodityConfig.java
|
2020-08-24 23:16:18 +08:00 |
zhangshanxue
|
e77644359d
|
充值价格
|
2020-08-24 23:14:03 +08:00 |
lvxinran
|
a57bdbc37f
|
五星成长礼修改
|
2020-09-01 22:11:12 +08:00 |
lvxinran
|
d56aa73460
|
Merge branch 'master' into 公会副本
|
2020-08-22 15:39:33 +08:00 |
lvxinran
|
146c394e7a
|
公会副本提交
|
2020-08-22 15:38:31 +08:00 |
zhangshanxue
|
3ef43a64a7
|
灵动网页支付
|
2020-08-21 20:31:30 +08:00 |
lilei
|
7c7e5cf9f1
|
破阵诛仙系列任务
|
2020-08-21 16:36:46 +08:00 |
lvxinran
|
f7b77d668a
|
副本提交
|
2020-08-28 14:38:20 +08:00 |
lvxinran
|
c6a0354f81
|
公会副本提交,大闹天宫埋点提交
|
2020-08-20 23:02:13 +08:00 |
zhangshanxue
|
b83687ea23
|
revert 错误合并
|
2020-08-19 11:16:28 +08:00 |
lilei
|
50f33a02c0
|
Merge branch 'develop_treasure'
|
2020-08-19 09:47:27 +08:00 |
lvxinran
|
1b70b3c73a
|
公会副本
|
2020-08-18 19:42:50 +08:00 |
zhangshanxue
|
000b4466b3
|
充值和数据转换
|
2020-08-18 16:12:54 +08:00 |
lilei
|
f73829b5d4
|
青龙秘宝,新增部分任务类型
|
2020-08-17 15:01:28 +08:00 |
zhangshanxue
|
329cb6dcc2
|
充值类型更换
|
2020-08-14 23:18:18 +08:00 |
zhangshanxue
|
433ef98265
|
充值类型更换
|
2020-08-14 23:08:45 +08:00 |
lvxinran
|
7c9a366149
|
限时兑换修改
|
2020-08-21 11:42:31 +08:00 |
lvxinran
|
6dfd305c73
|
轩辕宝镜排行发奖
|
2020-08-17 05:08:35 +08:00 |
zhangshanxue
|
2b33f18c05
|
Merge branch 'equip_develop'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.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
# tablemanager/src/main/java/config/SSpecialConfig.java
|
2020-08-12 15:20:22 +08:00 |
lvxinran
|
00198786e9
|
轩辕宝镜代码提交
|
2020-08-15 13:42:36 +08:00 |
zhangshanxue
|
4e0dd14dce
|
英雄置换
|
2020-08-12 14:16:08 +08:00 |
zhangshanxue
|
efc21ecbf3
|
英雄置换
|
2020-08-10 15:26:19 +08:00 |
lvxinran
|
b5a0c8de0e
|
轩辕宝镜接口添加
|
2020-08-06 22:55:38 +08:00 |
lvxinran
|
ee0c50242b
|
轩辕宝镜提交
|
2020-08-06 22:54:25 +08:00 |
lvxinran
|
c8722e9047
|
装备成就修改,地图炸弹添加,全服邮件红点,装备分解归元修改,打点种类添加
|
2020-07-31 17:37:39 +08:00 |
zhangshanxue
|
3ab0b9c3a8
|
出包前bug
|
2020-08-02 23:44:02 +08:00 |
lvxinran
|
f7bdc25b3c
|
英雄归元、分解修改
|
2020-07-24 14:34:15 +08:00 |