xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135 Commits 1 Branch 0 Tags
d9e1bc2bcbf7f42fd46347d4589b2cfe293183ef
Commit Graph
83 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
luying d9e1bc2bcb fix bug 远征关卡最后一关获取失败 2020-11-20 16:49:55 +08:00
luying 9d2208a41c 更新秘境json表 2020-11-20 11:31:13 +08:00
luying e6421497d1 修复出兵表 2020-11-20 10:44:47 +08:00
luying 225d55f98f fix 修复远征当前血量和最大血量无法匹配bug 2020-11-19 10:37:39 +08:00
luying 4f9d996003 fix 秘境json字段 2020-11-18 13:39:32 +08:00
luying 80b8f1bac7 fix bug 远征显示下一关等 2020-11-17 17:37:05 +08:00
luying 0e2f043f93 修改远征创建记录逻辑 2020-11-17 10:07:59 +08:00
luying d5a5cfc270 fix bug 修复计算最强5人战力 2020-11-16 09:56:53 +08:00
luying ada3cfe849 秘境本挑战次数 2020-11-13 18:06:53 +08:00
luying 9574bada4f web-server js文件 2020-11-13 11:42:00 +08:00
luying b0a0bbc71b 战力计算，远征战力筛选 2020-11-12 18:21:05 +08:00
luying 40c16587b3 修改排行榜返回字段 2020-11-12 18:16:10 +08:00
luying 4688bad6d3 天梯排行榜添加字段 2020-11-12 14:56:04 +08:00
luying 2b4fec3127 天梯调整 2020-11-11 20:51:09 +08:00
luying 7ad1b703d3 fix，修复后台批量添加武将bug 2020-11-11 16:46:54 +08:00
luying b792f22f94 后台添加武将批量添加 2020-11-11 13:42:38 +08:00
luying 894f1dc9d5 修复时差bug 2020-11-11 11:53:54 +08:00
luying 58f0eef142 后台添加添加元宝功能 2020-11-10 19:47:10 +08:00
luying 5a700b87c7 fix 修复刷新任务数量错误 2020-11-10 19:46:52 +08:00
luying 76e8157ad3 天梯派遣刷新逻辑 2020-11-11 17:09:54 +08:00
luying 7fa9fe99ee 添加远征每日重置 2020-11-09 17:41:24 +08:00
luying 541e8a391d 修改天梯派遣星级条件 2020-11-09 13:48:36 +08:00
luying 04ecef03b5 添加天梯排行榜，修复setHour有时差的bug 2020-11-06 17:31:23 +08:00
luying bd93d9dc1c fix 联调时遇到的问题 2020-11-05 19:33:39 +08:00
luying ff6b8bcdca 每日添加购买次数逻辑 2020-11-05 11:54:57 +08:00
luying 6020037aa6 镇念塔调整 2020-11-04 20:12:54 +08:00
luying 4effd85f2a fix 每日挑战次数限制 2020-10-31 13:40:11 +08:00
luying 70e88a33a5 fix again 获取奇遇使用不重复关卡id 2020-10-30 20:12:35 +08:00
luying 858b79339c 修复当出现相同关卡id时记录会混乱的bug 2020-10-30 15:00:12 +08:00
luying 222b9c6e12 添加远征匹配玩家方法 2020-10-28 19:29:59 +08:00
luying 3377e0f99c 修复奇遇bug 2020-10-28 14:38:48 +08:00
luying db040b2438 更新json 2020-10-27 19:19:41 +08:00
luying c25f95942c fix 修复联调时发现的bug 2020-10-27 16:50:16 +08:00
luying a74b659590 远征添加战场前校验和战后掉落 2020-10-26 13:55:16 +08:00
luying 115a846e46 fix bug 奇遇刷新时间 2020-10-26 11:28:29 +08:00
luying 79ca79a6f4 fix 本地运行端口占用问题 2020-10-23 18:05:46 +08:00
luying 94c632649b 修改数据库表统一格式 2020-10-23 14:39:27 +08:00
luying bae1d3d83d fix 升级经验 2020-10-22 16:55:56 +08:00
luying 318d45e50e 添加保存R剧本接口 2020-10-22 11:05:49 +08:00
luying 3d031088b7 结算获取消耗品和金币 2020-10-21 16:48:54 +08:00
luying aa0b2ba9ee 后台添加清空账号功能 2020-10-21 10:14:19 +08:00
luying 7b65c1856b 添加主角等级升级逻辑 2020-10-20 20:18:15 +08:00
luying 3332d16cc6 添加获得武将碎片 2020-10-20 17:53:58 +08:00
luying 2711fafd9f fix bug 武将名和职业名篡位 2020-10-20 17:51:43 +08:00
luying f618d6c36a 去除默认的赵云 2020-10-20 17:01:58 +08:00
luying 8da723ab4b 奇遇本刷新机制调整 2020-10-20 16:15:21 +08:00
luying 16085ca55d 关卡添加消耗品结算，奇遇的坐标改为点id 2020-10-20 11:38:13 +08:00
luying a96c4c4182 fix 修复发布遇到的bug 2020-10-19 18:23:02 +08:00
luying 47a5843bdb 扫荡奖励添加哪一次掉落的 2020-10-19 17:52:34 +08:00
luying 0da6b7c169 后台添加推送奇遇事件功能 2020-10-19 17:31:45 +08:00
luying 99e50c9c36 fix 修复奇遇本答题逻辑 2020-10-19 16:56:22 +08:00
luying 81bce4f57b GM后台修改status code 2020-10-17 16:40:08 +08:00
luying c5f07ae36b fix 合并影响的编译错误 2020-10-17 10:46:03 +08:00
luying fbe0972536 Merge branch 'statusCode' of gitlab.trgame.cn:zyztech/zyz_server 
Conflicts:
	game-server/app/servers/battle/handler/eventBattleHandler.ts
 2020-10-17 10:18:52 +08:00
luying a027317124 主线，每日，奇遇，远征修改错误码 2020-10-16 20:42:14 +08:00
luying 20828f9194 fix:修改奇遇本逻辑 2020-10-16 18:57:21 +08:00
luying df879279cb 添加环境变量local 2020-10-16 17:52:54 +08:00
luying bd6646c6fe 修改util为公共地址 2020-10-16 14:54:28 +08:00
luying 85940779d2 添加主动获取奇遇事件，奇遇添加答题逻辑 2020-10-15 18:31:36 +08:00
luying 764de8669a 整理代码结构，使用service 2020-10-15 15:36:47 +08:00
luying c5bb06ba7d fix: 修复远征部分编译错误 2020-10-15 12:11:32 +08:00
luying 2b1575516f 远征结算和宝箱领取 2020-10-14 20:17:05 +08:00
luying 57d60be3a2 奇遇随机添加权重 2020-10-14 17:19:09 +08:00
luying 7652f63414 远征本主界面及匹配机器人 2020-10-13 19:16:58 +08:00
luying 682e95561d fix bug 新增武将、装备，等级无法生效 2020-10-13 17:11:32 +08:00
luying 77c2b0b35a 修改resource资源结构 2020-10-12 14:52:36 +08:00
luying 7047f01cbf 领取奇遇事件 2020-10-10 16:37:57 +08:00
luying 2a62b31797 事件本检查时间刷新并推送 2020-10-09 20:26:53 +08:00
luying b74ba7757d 修改字段 2020-09-30 18:44:29 +08:00
luying 160f32bf9e 添加主线关卡和每日关卡 2020-09-29 17:03:01 +08:00
luying e448704dc7 添加json上传功能 2020-09-24 20:09:51 +08:00
luying 5392f0b861 fix bug 检查文件首层地址不应该固定 2020-09-24 13:22:59 +08:00
luying 363acd58c1 热更新上传添加权限 2020-09-24 10:02:19 +08:00
luying 3f5fa47b1b 添加后台热更新上传 2020-09-23 19:47:09 +08:00
luying 9f57e52445 后台添加修改密码、编辑、记录等功能 2020-09-22 15:14:00 +08:00
luying 780562979e 后台添加权限管理 2020-09-22 11:10:45 +08:00
luying bcbed5959f 添加后台连接用的后端 2020-09-22 11:09:15 +08:00
luying 51b0912db7 fix 冗余引入 2020-09-14 18:26:26 +08:00
luying b976859469 Merge branch 'master' into feature/normalBattle 2020-09-14 18:24:30 +08:00
luying be2093b82a fix 合并时回退了的package 2020-09-14 18:02:36 +08:00
luying 693a87cd89 修改关卡记录逻辑 2020-09-14 15:38:04 +08:00
luying b6725151d0 Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server into feature/normalBattle 
Conflicts:
	game-server/startGameServer.sh
	web-server/package.json
 2020-09-14 10:55:46 +08:00
luying 0880f26aa1 reset 2020-09-14 10:53:47 +08:00