Commit Graph

4593 Commits (962f0641b7ccac96b3248496570136461b18ca95)

Author SHA1 Message Date
lvxinran 24e773aad9 无尽修改初版 2021-05-23 18:06:21 +08:00
mengchengzhen 4a2df26e2e 福利红包 2021-05-21 18:52:19 +08:00
xuexinpeng 30c1a61b62 社稷大典邮件内容修改 2021-05-21 18:25:03 +08:00
xuexinpeng 34cd899b6e 山河社稷等级限制数据初始化 2021-05-21 16:29:33 +08:00
duhui 9fced9ba25 gm.修改公会信息 2021-05-21 15:28:16 +08:00
duhui eebf572d7d 自定义礼包码 2021-05-20 18:02:50 +08:00
xuexinpeng 133afbab21 组队类型限制 2021-05-20 17:08:06 +08:00
xuexinpeng 61c2b2b460 战斗lua脚本同步 2021-05-20 16:49:36 +08:00
xuexinpeng 7c7c3e6bb6 特权等级奖励 2021-05-20 15:41:33 +08:00
xuexinpeng a0db7928bf 山河社稷图最小战力回放 2021-05-19 15:27:00 +08:00
mengchengzhen 97d32d93dd 福利红包 2021-05-19 11:18:46 +08:00
duhui 222c10252b 修行3.0
神印展示增加,替换神印逻辑完善
2021-05-19 09:35:00 +08:00
xuexinpeng bc94b6290d 山河社稷图状态显示 2021-05-18 16:51:50 +08:00
xuexinpeng 8423d711dd 山河社稷图 2021-05-18 15:56:26 +08:00
xuexinpeng 30ebef6856 山河社稷图优化 2021-05-18 13:57:07 +08:00
xuexinpeng 9cb30eb9da 山河社稷图 2021-05-18 10:13:37 +08:00
lvxinran 78cb70af3a 物品数量修改 2021-05-17 21:09:21 +08:00
xuexinpeng 30115154eb Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage 2021-05-17 18:55:52 +08:00
xuexinpeng bc9bb14dda 山河社稷技能buffer 2021-05-17 18:55:19 +08:00
duhui b74e3525a7 修行名字颜色 2021-05-17 17:57:58 +08:00
xuexinpeng c509ed8444 Merge branch 'dev_dh_Practice' into master_test_mcz_hardstage
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
2021-05-17 11:19:30 +08:00
xuexinpeng 41ba1e238c 山河社稷图 2021-05-17 10:28:37 +08:00
duhui 23d1b68080 修行2.0 2021-05-17 09:37:16 +08:00
xuexinpeng e656ac4344 山河社稷 2021-05-15 17:04:02 +08:00
xuexinpeng 7e21e0df43 山河社稷 2021-05-15 15:05:11 +08:00
xuexinpeng a8e76d24db 山河社稷图 2021-05-14 15:36:50 +08:00
lvxinran d8e16aae9a 一键购买修改 2021-05-14 14:41:13 +08:00
lvxinran 89332f0d07 公会等级上限 2021-05-14 14:29:49 +08:00
lvxinran 442b550aa1 开服福利修改 2021-05-14 13:47:07 +08:00
duhui b51cd010a3 修行功能1.0 2021-05-14 11:12:47 +08:00
lvxinran c3749641b3 Merge branch 'master_prb_gn' into master_test_gn 2021-05-13 17:46:44 +08:00
lvxinran e113ab430c 限时抽卡修改 2021-05-13 17:46:34 +08:00
xuexinpeng 972b6dde78 山河社稷 2021-05-13 17:33:19 +08:00
lvxinran fc56f377a1 活动礼包刷新修改 2021-05-13 14:40:27 +08:00
xuexinpeng 885e0112ad 山河社稷 2021-05-13 14:39:44 +08:00
DESKTOP-98AVA47\Administrator e7ea5f645e 工会副本修改 2021-05-13 01:33:12 +07:00
lvxinran 17e2d80685 邮件领取奖励上限 2021-05-17 21:34:40 +08:00
lvxinran d3bcc1618f 限时抽卡的活动清除计数 2021-05-12 14:34:06 +08:00
mengchengzhen 8ab1fafc40 山河社稷图 2021-05-11 21:36:22 +08:00
mengchengzhen f561f686e9 山河社稷图 2021-05-11 21:31:07 +08:00
duhui 1d8fea9f96 修行,未完成提交 2021-05-11 17:59:49 +08:00
mengchengzhen ea4d1e03d6 山河社稷图 2021-05-11 16:25:00 +08:00
xuexinpeng 75e526697a 山河社稷更新星星事件 2021-05-11 15:48:59 +08:00
duhui 9457e48c5c 计算战力方法,部分注释旧逻辑删除,需要可回滚 2021-05-11 14:09:21 +08:00
xuexinpeng e8a6617225 Merge branch 'master_test_mcz_hardstage' of http://60.1.1.230/backend/jieling_server into master_test_mcz_hardstage 2021-05-11 11:38:55 +08:00
xuexinpeng b72978b56e 山河社稷图排行榜 2021-05-11 11:23:19 +08:00
mengchengzhen fbceab8579 新礼包五星推送 2021-05-11 11:04:53 +08:00
mengchengzhen 3de5a18eb7 山河社稷图 2021-05-11 10:59:59 +08:00
mengchengzhen 79ffc31fa8 山河社稷图 2021-05-11 10:59:39 +08:00
duhui 9faf6cb267 等级 2021-05-10 16:30:45 +08:00
duhui 77c25705f9 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-10 16:12:50 +08:00
duhui 88f1036659 等级回滚 2021-05-10 16:12:38 +08:00
duhui 514b1205eb 等级 2021-05-10 16:11:36 +08:00
mengchengzhen 489529c827 取消灵兽礼包 2021-05-10 16:03:12 +08:00
duhui c66939c575 最高等级 2021-05-10 14:39:38 +08:00
mengchengzhen e0462df216 新礼包灵兽礼包 2021-05-10 09:42:51 +08:00
mengchengzhen a8c23221a0 新礼包超值基金记录领取时间 2021-05-08 17:37:35 +08:00
lvxinran 9f0900a5a2 Merge branch 'master_prb_gn' into master_test_gn 2021-05-08 17:12:59 +08:00
mengchengzhen 8cf73a88c7 新礼包存储 2021-05-08 16:36:18 +08:00
mengchengzhen 87e02201de 工会排行bug 2021-05-13 18:29:49 +08:00
mengchengzhen 6677d92b45 山河社稷图 2021-05-08 16:35:17 +08:00
mengchengzhen 34e86ceb8d Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 21:21:17 +08:00
mengchengzhen 2d1a115cf0 Merge branch 'master_test_gn' into master_prb_gn 2021-05-08 21:03:39 +08:00
mengchengzhen 8cd82e7325 首冲bug防止问题方法 2021-05-08 21:03:29 +08:00
mengchengzhen c32f1e8fb4 Merge branch 'master_test_gn' into master_prb_gn 2021-05-08 20:50:10 +08:00
mengchengzhen f88c84f2dd 新礼包首冲bug 2021-05-08 20:50:00 +08:00
mengchengzhen c9f3eaaaa6 新礼包首冲bug指定时间5月6日18点 2021-05-06 21:21:05 +08:00
mengchengzhen acf6913dbf Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 17:11:43 +08:00
mengchengzhen dd9bc02661 新礼包推送两次bug 2021-05-06 17:11:27 +08:00
mengchengzhen 4eff03208d Merge branch 'master_test_gn' into master_prb_gn 2021-05-06 10:07:57 +08:00
mengchengzhen 36fc8911fc 新礼包indexbug修复 2021-05-06 10:06:12 +08:00
mengchengzhen 5363b52f2b 新礼包活动领取优化 2021-05-11 00:10:14 +08:00
lvxinran 575accafa7 累计充值钱数修改 2021-05-04 10:22:06 +08:00
lvxinran 0ac4200f7c 老玩家保存信息 2021-04-30 22:57:24 +08:00
mengchengzhen d2e6ae8048 Merge branch 'master_test_gn' into master_prb_gn 2021-04-30 13:38:39 +08:00
duhui 6c6767d9d6 Merge branch 'master_test_gn' into master_prb_gn 2021-04-29 20:20:51 +08:00
lvxinran 66b099bb58 Merge branch 'master_test_gn' into master_prb_gn 2021-05-01 04:31:46 +08:00
lvxinran 04bfe71ebf Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-05-01 04:31:18 +08:00
DESKTOP-98AVA47\Administrator d3bef43914 判空 2021-10-31 01:04:06 +07:00
mengchengzhen aa086627e4 新礼包 2021-05-31 02:58:35 +08:00
lvxinran 32aed0a1b2 报空修改 2021-05-01 04:31:13 +08:00
lvxinran 8c47a17aa6 Merge branch 'master_test_gn' into master_prb_gn 2021-05-01 00:55:45 +08:00
mengchengzhen 7d41aeec3a 新礼包 2021-04-30 01:44:11 +08:00
mengchengzhen e4f5617ddb 新礼包 2021-04-29 20:09:00 +08:00
mengchengzhen 21df5641ca 新礼包 2021-04-29 19:54:56 +08:00
mengchengzhen 19d8c11012 新礼包五星最后修改 2021-04-29 19:38:02 +08:00
mengchengzhen 76abb2383a 新礼包五星推送 2021-04-29 19:30:49 +08:00
mengchengzhen 1a1476fdf7 新礼包碎片合成推送 2021-04-29 18:51:37 +08:00
mengchengzhen 7085f15710 新礼包五星礼包优化 2021-04-29 18:09:36 +08:00
mengchengzhen cf1b1df861 新礼包 2021-04-30 00:32:48 +08:00
mengchengzhen 95a338f07f 新礼包每天刷新,推送时间 2021-04-29 17:16:39 +08:00
xuexinpeng e3c2f157f2 误操 作 2021-04-29 16:58:08 +08:00
xuexinpeng 6842cf869c Merge branch 'master_test_gn' into master_test_gn_arean 2021-04-29 16:33:46 +08:00
xuexinpeng a63900a3ec Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-29 16:31:29 +08:00
xuexinpeng 3b5fd18a3c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
新赛季重置积分后    挑战后从重置的分值累加
2021-04-29 16:24:21 +08:00
xuexinpeng 8264a1e0ad 踏碎凌霄战斗 2021-04-28 01:19:28 +08:00
mengchengzhen 697f129301 新礼包 2021-04-28 00:35:03 +08:00
mengchengzhen 48cf68f620 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-28 00:16:46 +08:00
lvxinran 6c8e14ba4d Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-30 23:08:12 +08:00
lvxinran f0838b269d 0伤害判断 2021-04-30 23:08:06 +08:00
lvxinran d593a41660 月卡改回 2021-04-30 20:30:48 +08:00
lvxinran 3c3beed1cf 月卡开启时间0点修改 2021-04-30 19:48:18 +08:00
lvxinran 80882ce656 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-30 19:36:47 +08:00
lvxinran 8cd48d6adb 空奖励修改 2021-04-30 19:36:34 +08:00
mengchengzhen 3a5f1a07aa 新礼包推送 2021-04-28 00:16:35 +08:00
mengchengzhen 2cfe67afe4 新礼包推送弹出 2021-04-27 22:28:08 +08:00
mengchengzhen 32900d9aa9 新礼包 2021-04-27 21:37:34 +08:00
mengchengzhen e8edb1fe95 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 21:20:19 +08:00
mengchengzhen 98b068f243 新礼包豪华基金 2021-04-27 21:18:46 +08:00
mengchengzhen c9db588348 新礼包 2021-04-27 19:27:28 +08:00
mengchengzhen 9f00d7a855 新礼包豪华基金邮件 2021-05-01 16:43:12 +08:00
mengchengzhen 747fd9bdb0 豪华基金每天奖励 2021-05-01 16:26:13 +08:00
lvxinran d9e5327137 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 15:53:28 +08:00
lvxinran 43e10b0ea8 修改入库读库错误 2021-04-27 15:53:23 +08:00
mengchengzhen 9b6ec67346 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 14:01:33 +08:00
mengchengzhen b1f6fbb581 新礼包添加每日充值金额 2021-04-27 13:58:54 +08:00
mengchengzhen 3af3a725c3 新礼包 2021-04-28 00:27:43 +08:00
lvxinran 91db235c90 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-27 13:40:20 +08:00
lvxinran 21973c02d6 免费不发送邮件 2021-04-27 13:40:09 +08:00
mengchengzhen c9580f6ba4 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-04-26 20:50:41 +08:00
mengchengzhen fcff8428e9 新礼包 2021-04-26 20:50:32 +08:00
lvxinran b7b9753b6f 邮件标题错误修改 2021-04-26 19:42:16 +08:00
lvxinran 3eb625070f 购买妖精双倍添加 2021-04-26 19:40:57 +08:00
lvxinran 2de2762b5d 报错修改 2021-04-26 19:09:36 +08:00
mengchengzhen f0db839fab Merge branch 'master_test_gn_mcz' into master_test_gn
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java
2021-04-26 19:04:40 +08:00
xuexinpeng d827c0057e 踏碎凌霄 2021-04-26 18:34:58 +08:00
mengchengzhen c0271abb3d 新礼包 2021-04-26 18:24:02 +08:00
mengchengzhen 2019129057 Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz 2021-04-26 17:29:25 +08:00
mengchengzhen 27aa32bd23 新礼包 2021-04-26 17:27:54 +08:00
xuexinpeng 197616887a Merge branch 'master_test_gn_arean' into master_test_gn 2021-04-26 16:27:19 +08:00
xuexinpeng 7fb75df1b6 踏碎凌霄 2021-04-26 16:25:14 +08:00
lvxinran d1a54c7377 充值 发邮件 发奖修改 2021-04-26 15:40:51 +08:00
duhui e9d4c76dd6 内部gm,跳过公会boss 2021-04-26 14:09:04 +08:00
mengchengzhen 972806ba8f 新礼包 2021-04-26 13:45:30 +08:00
mengchengzhen 54a3149de6 Merge branch 'master_test_gn_mcz' of http://60.1.1.230/backend/jieling_server into master_test_gn_mcz
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java
2021-04-26 12:01:08 +08:00
lvxinran ae93532942 大闹天宫招募节点宝物添加 2021-04-23 15:19:47 +08:00
mengchengzhen fca38c08d0 Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-22 17:46:43 +08:00
mengchengzhen 82cc2a5feb Merge branch 'master_test_gn' into master_test_gn_mcz2 2021-04-28 18:13:51 +08:00
mengchengzhen 2cac69ffcb 新礼包 2021-04-22 17:43:30 +08:00
mengchengzhen 7d91d069aa 新礼包测试 2021-04-22 13:55:20 +08:00
lvxinran 66a0486528 抽卡逻辑修改 2021-04-21 14:44:26 +08:00
lvxinran 3f0ecd8d6f 判断类型修改 2021-04-21 14:15:51 +08:00
lvxinran 96163db7b5 礼包优化 2021-04-21 14:03:40 +08:00
duhui c05d0ea2b6 首次挑战成功时改为不消耗次数 2021-04-21 11:30:04 +08:00
xuexinpeng 2c92ff12e6 Merge branch 'master_test_gn' into master_test_gn_arean 2021-05-04 00:25:29 +08:00
xuexinpeng 59b28c36e8 竞技场优化 赛季重置不清空积分,初始化为上赛季积分的百分比 2021-05-04 00:24:50 +08:00
mengchengzhen c48ad44e27 新礼包 2021-04-20 15:03:50 +08:00
mengchengzhen 30814f86a5 新礼包 2021-04-28 18:03:47 +08:00
duhui a41d8fff66 Merge branch 'dh_dev_cn_oblation' into master_test_gn
通用祭品
2021-04-20 14:44:01 +08:00
lvxinran 305f2879ed 社稷大典排行修改 2021-04-19 20:20:56 +08:00