Commit Graph

4730 Commits (c0271abb3d2ff3a8d221401834f7bbed6f2f0753)
 

Author SHA1 Message Date
duhui 78709a72e8 大闹天宫,英雄排序方式优化 2021-03-02 09:50:44 +08:00
duhui bb842b6ea6 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-03-01 11:50:16 +08:00
duhui 11fb77045f 非空验证 2021-03-01 11:50:02 +08:00
duhui 974891f80a 大闹天宫,遇敌 2021-03-01 11:01:24 +08:00
lvxinran e59fb7b4d0 Merge branch 'master_online_hw' into master_test_hw
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java
2021-02-28 13:24:55 +08:00
lvxinran d8ef8d9e64 本地化修改 2021-02-27 06:43:48 +08:00
lvxinran 34b1c6d891 阈值修改第一版 2021-02-26 15:40:57 +08:00
mengchengzhen 91e53bdf42 zabbix登陆限制监测 2021-02-26 14:09:29 +08:00
duhui 0c84c3f839 邮件背包已满提示处理 2021-02-26 11:31:50 +08:00
duhui 2dc01e8b26 大闹天宫,遇敌刷新逻辑修改 2021-02-26 11:29:44 +08:00
lvxinran 4a09b99d48 回滚临时代码 2021-02-26 00:22:20 +08:00
lvxinran 976e8bcafd 初始200级 2021-02-26 00:04:03 +08:00
lvxinran fc432b013e 200人测试 2021-02-25 23:59:23 +08:00
lvxinran bcc02f5447 添加虚拟账号代码 2021-02-25 23:56:55 +08:00
duhui 60231a23a5 鸿蒙阵,根据最大星级获取最大等级,走表 2021-02-25 11:11:54 +08:00
duhui 077bd10143 鸿蒙阵,根据星级取等级,先写死,后面版本更新 2021-02-25 10:53:55 +08:00
duhui 1099169d1f 大闹天宫,初版未完成 2021-02-25 10:34:05 +08:00
mengchengzhen d8160bdfb0 排行榜20位优化 2021-02-24 10:27:08 +08:00
mengchengzhen 91dd46a809 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-24 10:20:07 +08:00
mengchengzhen 4e82991332 新头像 2021-02-24 10:19:59 +08:00
lvxinran afe20ec571 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-24 00:07:20 +08:00
lvxinran 5a1f8e8268 删除公会 删除排行 2021-02-24 00:07:11 +08:00
lvxinran bf68a3b434 Merge branch 'master_test_hw' into master_test_hw_i18n 2021-02-23 18:20:04 +08:00
lvxinran 0895fd0886 越南语字段 2021-02-23 18:19:32 +08:00
whb cc2d7f9064 datatype 2021-02-23 15:54:00 +08:00
duhui f1847c33a0 鸿蒙阵,升级返回原始等级 2021-02-20 17:20:11 +08:00
duhui a4f7cb971f 鸿蒙阵,魂宝灵宝计算修改 2021-02-20 16:51:30 +08:00
lvxinran cc588bd1c1 代码恢复 2021-02-21 23:22:02 +08:00
lvxinran 806d107bf4 代码重置 2021-02-21 23:01:37 +08:00
duhui 944b5d5405 鸿蒙阵,魂灵宝bug修改 2021-02-19 15:50:46 +08:00
duhui 256fff3c57 鸿蒙阵,鸿蒙守卫魂宝灵宝,等级显示问题处理 2021-02-19 15:44:59 +08:00
lvxinran 371bf21d90 释放redis连接池 2021-02-19 15:09:46 +08:00
lvxinran 79902665e7 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-19 14:55:16 +08:00
duhui b1cc76ed6a 鸿蒙阵合并后修改 2021-02-19 11:29:56 +08:00
duhui 32b5f8d8fd Merge branch 'master_test_hw' into master_test_hw_hongmeng 2021-02-19 11:06:29 +08:00
lvxinran 860397c890 发奖修改 2021-02-05 15:00:12 +08:00
lvxinran a4077e200c 大闹天宫神将空位逻辑修改 2021-02-05 13:58:22 +08:00
duhui 6ed7ee4b2f 挂机奖励,结束时间,内存修改 2021-02-02 11:29:56 +08:00
duhui 751421144b 会长转移,空指针修改 2021-02-02 10:21:12 +08:00
duhui 8086106b52 挂机奖励修改,随机改一次一次算 2021-02-02 11:13:43 +08:00
duhui b363301111 Merge branch 'dh_dev_guaji' into master_test_hw 2021-02-01 22:55:14 +08:00
lvxinran 3c24ef97fc 删除 无用打印 2021-02-01 16:52:17 +08:00
lvxinran 5ed63868e5 工会邮件内容修改 2021-01-31 14:49:05 +08:00
lvxinran 5d9812cff2 兑换码时间控制 2021-01-31 13:55:57 +08:00
duhui 508eda57d8 挂机奖励修改 2021-01-29 10:52:56 +08:00
lvxinran f72e134f0f 抽卡逻辑 2021-01-28 17:53:22 +08:00
lvxinran a4dca69532 抽卡生效次数校验修改 2021-01-28 17:19:08 +08:00
lvxinran 1b2e00e478 修改抽卡逻辑 2021-01-28 17:05:37 +08:00
lvxinran 50824acdd9 抽卡计次修改 2021-01-28 16:41:54 +08:00
duhui 2fb09e6844 轩辕宝镜和逍遥游埋点 2021-01-28 15:42:27 +08:00