xuexinpeng
|
913af67528
|
身外化身
|
2022-04-22 17:26:59 +08:00 |
xuexinpeng
|
9a73862291
|
化身之力
|
2022-04-22 11:26:52 +08:00 |
xuexinpeng
|
ed181d79ee
|
启动报错
|
2022-04-22 09:57:33 +08:00 |
xuexinpeng
|
699836479c
|
身外化身
|
2022-04-21 18:08:16 +08:00 |
duhui
|
e26b1e18ae
|
【探索玩法增加探索商店】
|
2022-04-18 15:05:46 +08:00 |
xuexinpeng
|
efc3368d0a
|
挑战副本
|
2022-04-15 14:52:04 +08:00 |
xuexinpeng
|
a325ba0451
|
挑战副本
|
2022-04-14 18:23:30 +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
|
eca27060c5
|
playerskill 添加字段
|
2022-03-21 17:14:08 +08:00 |
xuexinpeng
|
293e9869b4
|
探索事件
|
2022-03-21 16:33:26 +08:00 |
yuanshuai
|
dc0c9819bd
|
神魔阵营功能脚本提交
|
2022-03-18 16:45:25 +08:00 |
xuexinpeng
|
738ef9c1e2
|
探索事件
|
2022-03-18 11:50:59 +08:00 |
duhui
|
f7848be28d
|
东海寻仙活动:初版未测试
|
2022-03-16 14:35:28 +08:00 |
xuexinpeng
|
4ce354caa5
|
战力冲刺排行榜调整
|
2022-02-25 11:52:23 +08:00 |
duhui
|
1210a30798
|
【补充】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:43:08 +08:00 |
duhui
|
0b1295cb61
|
【优化】升星操作增加鸿蒙阵等级限制
|
2022-02-17 14:14:19 +08:00 |
jiahuiwen
|
802a85021e
|
神将可控制进入版本时间优化
|
2022-02-15 11:34:25 +08:00 |
jiahuiwen
|
6053cf9db9
|
神将可控制进入版本时间
|
2022-02-10 11:28:33 +08:00 |
duhui
|
121bd7924f
|
超值基金活动修改
|
2022-01-24 17:10:11 +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 |
duhui
|
3e3e5ee1bf
|
牛气冲天任务优化
|
2022-01-18 10:06:09 +08:00 |
jiahuiwen
|
fc6bf6f613
|
家园任务bug
|
2022-01-17 18:58:56 +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 |
duhui
|
8946f22d57
|
【法宝聚灵&跨服rpc】
1、聚灵表添加新列
2、rpc方法添加catch,简化log
|
2022-01-06 14:59:08 +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 |
duhui
|
9e433e1969
|
【家园功能1.1.5】
1、家园特权功能添加
|
2021-12-30 16:09:24 +08:00 |
yuanshuai
|
bf8386326b
|
飞升技能相关修改
|
2021-12-29 18:23:17 +08:00 |
xuexinpeng
|
4ea6f544cb
|
探索
|
2021-12-29 17:26:42 +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
|
3c5f29e2e5
|
探索 测试 不扣消耗
|
2021-12-28 14:33:23 +08:00 |
duhui
|
bee333690e
|
【家园功能1.0.4】无用代码删除,不影响原有逻辑
|
2021-12-27 14:57:24 +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
|
6f3c8768bf
|
【家园功能1.0】待联调
|
2021-12-24 17:07:57 +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
|
9253e775f0
|
探索
|
2021-12-21 16:46:24 +08:00 |
jiahuiwen
|
a97bca5c9b
|
升星配方调整补偿
|
2021-12-21 09:55:12 +08:00 |
yuanshuai
|
8c7c2c00cc
|
漏提交
|
2021-12-16 16:26:09 +08:00 |
jiahuiwen
|
6f38da5b27
|
回退修复
|
2021-12-15 18:42:12 +08:00 |
jiahuiwen
|
81f4241511
|
神将回退漏提
|
2021-12-14 17:59:06 +08:00 |
yuanshuai
|
b865fac770
|
新增经验和金币收益道具脚本提交
|
2021-12-14 17:37:27 +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
|
8a77b7c2d5
|
添加关卡附加条件功能提交
|
2021-12-10 18:43:49 +08:00 |
duhui
|
143c7a5230
|
招募秘宝
|
2021-12-10 14:24:47 +08:00 |
jiahuiwen
|
50118efe42
|
优化打印
|
2021-12-09 15:34:45 +08:00 |
yuanshuai
|
204eb5f959
|
命格脚本提交
|
2021-12-08 16:50:41 +08:00 |
duhui
|
92a1305eaf
|
大闹天宫优化
|
2021-12-06 15:35:18 +08:00 |
duhui
|
2717cdefec
|
连续礼包优化
|
2021-12-02 15:16:02 +08:00 |
yuanshuai
|
d97164a2db
|
天地洪炉选择up添加限制
|
2021-12-05 15:05:28 +08:00 |
jiahuiwen
|
81e10b1e8c
|
消除报错
|
2021-11-29 14:00:40 +08:00 |
jiahuiwen
|
cff11e010c
|
剧情关不需要战斗
|
2021-11-27 17:35:07 +08:00 |
duhui
|
1893a900ff
|
Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
# globalidserver/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
# globalidserver/src/main/java/com/global/thrift/idl/InnerResult.java
# globalidserver/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
# serverlogic/src/main/java/com/global/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/java/com/global/thrift/idl/InnerResult.java
# serverlogic/src/main/java/com/global/thrift/idl/RPCgTGRequestIFace.java
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Pokemon.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PropertyItem.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/RechargeResult.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/Result.java
# serverlogic/src/main/java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
# serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
# serverlogic/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/java/com/world/thrift/idl/InnerResult.java
# serverlogic/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
# serverlogic/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
# serverlogic/src/main/thrift/idl/core.thrift
# serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/InnerResult.java
# serverlogic/src/main/thrift/idl/gen-java/com/global/thrift/idl/RPCgTGRequestIFace.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/ArenaOfHero.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/CrossArenaManager.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/InvalidOperException.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Pokemon.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PropertyItem.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/PurpleMansionSeal.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RPCMatchRequestIFace.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/RechargeResult.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/Result.java
# serverlogic/src/main/thrift/idl/gen-java/com/ljsd/jieling/thrift/idl/TeamPosHeroInfo.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerInvalidOperException.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/InnerResult.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCgTwRequestIFace.java
# serverlogic/src/main/thrift/idl/gen-java/com/world/thrift/idl/RPCwTgRequestIFace.java
# tablemanager/src/main/java/config/SLodeRankReward.java
# tablemanager/src/main/java/config/STrumpBook.java
# worldserver/src/main/java/com/world/thrift/idl/InnerInvalidOperException.java
# worldserver/src/main/java/com/world/thrift/idl/InnerResult.java
# worldserver/src/main/java/com/world/thrift/idl/RPCgTwRequestIFace.java
# worldserver/src/main/java/com/world/thrift/idl/RPCwTgRequestIFace.java
|
2021-11-26 09:41:35 +08:00 |
jiahuiwen
|
294bae6c89
|
修仙修改
|
2021-11-24 11:30:48 +08:00 |
duhui
|
cbf61cfafc
|
身外化身提交
|
2021-11-17 16:47:25 +08:00 |
xuexinpeng
|
1a60f70002
|
跨服灵脉秘境
|
2021-11-25 09:22:00 +08:00 |
xuexinpeng
|
8615af222f
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-18 18:00:22 +08:00 |
yuanshuai
|
889720d392
|
法宝聚灵技能修改
|
2021-11-19 16:42:33 +08:00 |
xuexinpeng
|
1acf753951
|
跨服灵脉秘境
|
2021-11-18 18:27:33 +08:00 |
xuexinpeng
|
e7e12c7228
|
跨服灵妙秘境
|
2021-11-17 16:35:43 +08:00 |
yuanshuai
|
f8aa4e339b
|
法宝聚灵功能提交
|
2021-11-17 13:18:27 +08:00 |
xuexinpeng
|
0b75d24326
|
灵脉秘境
|
2021-11-12 11:54:05 +08:00 |
xuexinpeng
|
b791353eb9
|
灵脉秘境
|
2021-11-12 09:39:03 +08:00 |
yuanshuai
|
8649778e5c
|
灵兽宝阁功能修改
|
2021-11-25 18:26:02 +08:00 |
xuexinpeng
|
46e112e56a
|
玉虚积分修改
|
2021-11-14 00:29:44 +08:00 |
xuexinpeng
|
c92e5b1b7a
|
【玉虚优化】优化分数丢失规则: +新增表格内修正分数
|
2021-11-04 18:10:21 +08:00 |
xuexinpeng
|
3e3fb783ee
|
周卡表结构变化
|
2021-11-11 16:45:48 +08:00 |
yuanshuai
|
9e22fed4ad
|
Merge branch 'master_test_gn_godsoul' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2021-11-03 19:03:22 +08:00 |
yuanshuai
|
45d11881a1
|
漏提交
|
2021-11-02 10:28:26 +08:00 |
xuexinpeng
|
fc2d33d4c9
|
周卡相关
|
2021-11-01 13:18:29 +08:00 |
duhui
|
cdd3b6b7dd
|
玲珑宝阁,奖池分活动
|
2021-10-29 17:19:44 +08:00 |
yuanshuai
|
048adc9c64
|
神魂相关脚本提交
|
2021-10-22 16:56:32 +08:00 |
jiahuiwen
|
967d5dc035
|
修仙属性flot 改int
|
2021-10-22 14:56:16 +08:00 |
yuanshuai
|
266fd9526b
|
修行技能升级限制修改
|
2021-10-22 13:38:56 +08:00 |
yuanshuai
|
cd8777c449
|
修行技能相关脚本修改提交
|
2021-10-21 14:34:21 +08:00 |
yuanshuai
|
db2b1d7283
|
Merge branch 'master_test_gn_practiceSkill' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/HeroManager.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java
|
2021-10-20 18:38:33 +08:00 |
duhui
|
70b19c8beb
|
御剑行功能优化
|
2021-11-03 23:46:27 +08:00 |
jiahuiwen
|
a7b02e8627
|
兼容策划删 RechargeCommodityConfig 表数据
|
2021-10-20 17:11:38 +08:00 |
duhui
|
606b22a670
|
御剑行合并
|
2021-10-20 13:44:18 +08:00 |
duhui
|
942338df7d
|
活动时间兼容
|
2021-10-19 18:25:02 +08:00 |
jiahuiwen
|
302a8a0f2d
|
【新功能】主角修为
【新功能】山河社稷图增加每日扫荡
|
2021-10-19 17:10:06 +08:00 |
yuanshuai
|
75872a85e9
|
Merge branch 'master_test_gn' into master_test_gn_practiceSkill
|
2021-10-19 15:40:38 +08:00 |
yuanshuai
|
4b3a1a1e42
|
修行技能逻辑提交
|
2021-10-19 15:40:05 +08:00 |
jiahuiwen
|
358c920cd6
|
修仙表增加字段
|
2021-10-19 12:09:30 +08:00 |
jiahuiwen
|
a14a205cfa
|
修仙技能
|
2021-10-19 11:13:36 +08:00 |
xuexinpeng
|
ecba1854dd
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2021-10-16 11:44:24 +08:00 |
jiahuiwen
|
f9eda6dfe0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
# Conflicts:
# tablemanager/src/main/java/config/SAchievementConfig.java
|
2021-10-15 18:21:48 +08:00 |
jiahuiwen
|
7c0c66be39
|
【成就优化】根据开服时间决定服务器内的成就
|
2021-10-15 18:20:59 +08:00 |
duhui
|
2f4715b599
|
Merge branch 'dh_dev_cow' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2021-10-15 17:18:43 +08:00 |
duhui
|
6d8a430fab
|
牛气冲天兼容
|
2021-10-15 17:16:17 +08:00 |
yuanshuai
|
82dd1bd33e
|
Merge branch 'master_test_gn_push' into master_test_gn
|
2021-10-15 16:52:58 +08:00 |
yuanshuai
|
bf0652a4ad
|
二期推送需求修改提交
|
2021-10-15 10:54:06 +08:00 |
jiahuiwen
|
09591d21e0
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-10-14 19:38:11 +08:00 |
jiahuiwen
|
44ffcea125
|
坐骑技能
|
2021-10-14 19:38:02 +08:00 |
xuexinpeng
|
e5736e509e
|
yxld10/14
|
2021-10-14 17:27:59 +08:00 |
yuanshuai
|
92b027d90c
|
根据充值金额推送礼包代码修改
|
2021-10-14 16:44:14 +08:00 |
duhui
|
bfc5667bb8
|
Merge branch 'master_test_gn' into dh_dev_ridingsward
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2021-10-14 16:18:26 +08:00 |
duhui
|
7ab321cc75
|
成就任务优化,兼容开服时间条件
|
2021-10-14 15:36:48 +08:00 |
yuanshuai
|
8dceb89111
|
白金装备提交
|
2021-10-14 13:47:14 +08:00 |
duhui
|
1e7cc6dea2
|
御剑飞行
|
2021-10-14 11:12:23 +08:00 |
xuexinpeng
|
433e651a6c
|
Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2021-10-13 19:58:49 +08:00 |
xuexinpeng
|
c6d45cbecf
|
yx10.13测试bug
|
2021-10-13 19:52:46 +08:00 |
xuexinpeng
|
fef22e4ae3
|
yx1.匹配规则的修改
2.战斗回放战力显示
3.玩家初始化积分
|
2021-10-09 20:24:50 +08:00 |
xuexinpeng
|
a03ee2095c
|
玉虚论道10.8
|
2021-10-09 10:57:12 +08:00 |
jiahuiwen
|
bb6ef14fcf
|
点石成金基础收益随着玩家等级提升,玩家等级提升时 发放道具进背包
|
2021-10-08 11:11:24 +08:00 |
yuanshuai
|
235a3d3a8c
|
Merge branch 'master_test_gn_likable' into master_test_gn
|
2021-09-29 15:45:09 +08:00 |
xuexinpeng
|
8437b6f9ea
|
海洋改掉落
|
2021-09-29 14:34:00 +08:00 |
xuexinpeng
|
4a1f019c1a
|
玉虚论道
|
2021-09-28 19:15:13 +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 |
jiahuiwen
|
77e0ed5e38
|
注释 SArenaRobotConfig 类中 玉虚论道 相关代码
|
2021-09-26 22:22:49 +08:00 |
yuanshuai
|
970b3911f8
|
好感度脚本提交
|
2021-09-26 19:43:02 +08:00 |
jiahuiwen
|
8bc3f13117
|
白金装备技能
|
2021-09-26 18:50:43 +08:00 |
duhui
|
a52efb87e1
|
跨服,返回第几周
|
2021-10-02 18:44:00 +08:00 |
yuanshuai
|
c900a018ec
|
好感度脚本提交
|
2021-09-24 14:10:02 +08:00 |
duhui
|
f69e502d39
|
七界遗物buf修改
|
2021-09-24 11:51:17 +08:00 |
yuanshuai
|
8dc19f2d98
|
好感度代码提交
|
2021-09-23 17:22:40 +08:00 |
duhui
|
ef3c6e81c7
|
网页支付
|
2021-09-22 18:34:44 +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
|
dfbf4285a0
|
Merge branch 'dh_dev_qijie' into master_test_gn
|
2021-09-22 13:57:54 +08:00 |
jiahuiwen
|
5d4ef3ac50
|
BlessingConfigNew 表 basicPoolId 改 String
|
2021-09-18 10:43:52 +08:00 |
duhui
|
ff3f04af63
|
合并代码2
|
2021-09-17 14:21:01 +08:00 |
duhui
|
18f91727e4
|
第一版
(cherry picked from commit 12c3d5d1ba0766fc17b69959690a656dabf14fc6)
|
2021-09-17 14:13:29 +08:00 |
xuexinpeng
|
9b3aaad6ee
|
玉虚论道
|
2021-09-15 14:36:21 +08:00 |
xuexinpeng
|
96df236aa1
|
玉虚论道
|
2021-09-14 19:27:08 +08:00 |
yuanshuai
|
0d7c337ced
|
【四象心法】添加技能属性加成
|
2021-09-14 11:36:38 +08:00 |
xuexinpeng
|
d6ffd5e348
|
玉虚论道第一版
|
2021-09-11 21:14:25 +08:00 |
yuanshuai
|
5e3b41c2df
|
表字段添加
|
2021-09-10 14:39:31 +08:00 |
yuanshuai
|
e819858d77
|
Revert "四象心法"
This reverts commit 9178024c9f .
|
2021-09-09 20:25:53 +08:00 |
yuanshuai
|
9178024c9f
|
四象心法
|
2021-09-09 16:58:28 +08:00 |
xuexinpeng
|
c367fce248
|
玉虚论道
|
2021-09-06 11:33:10 +08:00 |
jiahuiwen
|
0cf0f239d0
|
宝物品质 宝物精炼 轩辕宝境 礼包推送
|
2021-09-02 13:46:53 +08:00 |
duhui
|
19c3a04559
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into dev_dh_fourSpirit2
|
2021-09-02 15:17:00 +08:00 |
duhui
|
a298850c48
|
网页支付
|
2021-08-25 17:32:14 +08:00 |
duhui
|
3b843d949b
|
四灵代码合并
|
2021-08-31 11:56:33 +08:00 |
xuexinpeng
|
2aa6058f2e
|
首发预约邮件
|
2021-08-16 16:04:36 +08:00 |
duhui
|
c5debd98ad
|
Merge branch 'master_test_gn_arena' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2021-07-30 18:43:07 +08:00 |
xuexinpeng
|
744a0d4e5b
|
【逐胜之巅优化】功能改为在开服指定天数后开启
|
2021-07-31 10:56:29 +08:00 |
xuexinpeng
|
a1aaf10802
|
【逐胜之巅优化】功能改为在开服指定天数后开启
|
2021-07-29 16:02:59 +08:00 |
duhui
|
d51a4715e0
|
跨发,十绝阵功能合并
|
2021-07-28 14:02:13 +08:00 |
lvxinran
|
94f9847844
|
合并分支
|
2021-07-31 00:01:41 +08:00 |
duhui
|
b037147e07
|
记录版本号和重启时间
|
2021-07-23 13:55:12 +08:00 |
lvxinran
|
9a0f8b6395
|
称号添加
|
2021-08-01 00:28:27 +08:00 |
duhui
|
18df433074
|
心愿抽卡, 优化提交
|
2021-07-21 18:21:15 +08:00 |
lvxinran
|
c414784114
|
删除多余代码
|
2021-07-21 13:59:02 +08:00 |
lvxinran
|
88871d789a
|
Merge branch 'master_test_gn' into master_test_gn_arena
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
|
2021-08-01 08:08:27 +08:00 |