Commit Graph

1913 Commits (9ed09dc1d289bcf45ed4150dacd976b7ba22ec79)
 

Author SHA1 Message Date
jiaoyangna fa1f5a7c35 五星成长礼提交 2020-08-19 22:03:47 +08:00
ZhangBiao f9ffc1aa39 无尽细节修改 2020-08-19 19:37:59 +08:00
zhangqiang 869481a2cd 公会副本部分提交 2020-08-19 17:28:17 +08:00
ZhangBiao 32eadd13ef 试炼 2020-08-19 17:18:38 +08:00
lihaiyang 974aada991 公会副本解锁时候复制主线阵容 2020-08-19 17:14:09 +08:00
lihaiyang 41d7d849b6 公会购买次数配置特权 2020-08-19 15:26:06 +08:00
liujiaqi 87141ee852 新法宝资源 2020-08-19 14:23:59 +08:00
jiaoyangna 60095d336d qinglongserect commit 2020-08-19 14:12:42 +08:00
ZhangBiao 2f6042154b 2020-08-19 10:16:52 +08:00
jiaoyangna f439a78b34 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-19 10:05:09 +08:00
jiaoyangna 4e1236de8c qinglongserecttreasure commit 2020-08-19 10:05:01 +08:00
ZhangBiao 7e4b73dc27 两个副本,基本成型了 2020-08-18 21:03:55 +08:00
liujiaqi 911d3fabf9 新英雄资源及技能名称资源替换 2020-08-18 20:35:51 +08:00
lihaiyang 6b3697ccad 添加公会排行榜邮件 2020-08-18 20:18:12 +08:00
lihaiyang 935e4bb811 添加工会?tips配置 2020-08-18 20:08:47 +08:00
lihaiyang 7fb8634749 添加怪物血量仅显示用 2020-08-18 19:56:22 +08:00
lihaiyang f75c843751 Merge branch '0功能/公会副本' of http://60.1.1.230/gaoxin/JL_Client into 0功能/公会副本 2020-08-18 19:44:34 +08:00
lihaiyang 600c6094ec 添加军团经验仅显示用 2020-08-18 19:43:54 +08:00
zhangqiang c6b0acb7d8 Merge branch 'master_develop' into 0功能/公会副本
# Conflicts:
#	data_execl/base_data/MonsterConfig.xlsx
2020-08-18 19:36:17 +08:00
zhangqiang 1c5a338c53 Merge branch '0功能/公会副本' of http://60.1.1.230/gaoxin/JL_Client into 0功能/公会副本 2020-08-18 19:33:54 +08:00
zhangqiang 00f1060be7 公会副本提交初始界面 2020-08-18 19:33:31 +08:00
ZhangBiao e261370ff4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 19:17:43 +08:00
ZhangBiao f18973cea9 极速达人修改 2020-08-18 19:17:20 +08:00
wangzhenxing 0e6c9ce414 阎罗王被动根据异常类型加伤修改 2020-08-18 20:07:00 +09:00
lihaiyang 21ee34c964 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 18:49:21 +08:00
lihaiyang 6a809c25e2 轩辕宝境怪物添加被动 修改怪物属性 添加公会副本的怪物 2020-08-18 18:48:20 +08:00
lihaiyang 3696a0ec4f 公会副本怪物修改位置 2020-08-18 17:25:35 +08:00
ZhangBiao 8f786147d3 2020-08-18 16:36:24 +08:00
gongjiawei af6dcc4410 音频更新 2020-08-18 16:23:57 +08:00
ZhangBiao 448c5d3b17 无尽_新重做前的提交 2020-08-18 15:48:41 +08:00
jiaoyangna e2b2517ad0 live2d commit 2020-08-18 15:42:21 +08:00
jiaoyangna 95593175ec dailycarbonpanel update 2020-08-18 14:00:03 +08:00
ZhangBiao 8bad66a6c3 2020-08-18 10:50:09 +08:00
ZhangBiao c9cb029494 无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
2020-08-18 10:49:21 +08:00
ZhangBiao b0f0b654ec 无尽副本已经可以进去了
(cherry picked from commit a1737d6e7014963b19c97ccfb2d1c878d88bc295)
2020-08-18 10:48:52 +08:00
ZhangBiao 9f8b553626 试炼副本补日志
(cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492)
2020-08-18 10:46:33 +08:00
ZhangBiao 4ef8870c4d 试炼副本改到了一半
(cherry picked from commit 4e442c7614a669cee38e731edf627b2582b2547b)
2020-08-18 10:45:59 +08:00
ZhangBiao e2589d5301 提交打出的协议
(cherry picked from commit fe559cc210441192ba638b19d43749de5207c99e)
2020-08-18 10:45:37 +08:00
jiaoyangna a5209137f0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 10:34:27 +08:00
jiaoyangna 3e9fcb7e71 xuanyuan update 2020-08-18 10:33:19 +08:00
jiaoyangna 92447e21a8 列表优化提交 2020-08-18 10:22:24 +08:00
wangzhenxing 98eb034cfc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 10:26:44 +09:00
wangzhenxing d16361e4d1 纵排改为仇恨目标 2020-08-18 10:26:24 +09:00
lihaiyang 1974091d69 修改公会副本的怪物和技能id 2020-08-17 22:38:33 +08:00
lihaiyang b1268b9977 删除军团等级限制 2020-08-17 20:22:32 +08:00
lihaiyang 8f475634c9 公会副本排行榜配置 2020-08-17 20:20:17 +08:00
lihaiyang ca9043b734 排行榜区间配置到special表中 2020-08-17 20:19:50 +08:00
lihaiyang 5f95ed147b 关卡等级控制在65级 2020-08-17 19:19:52 +08:00
lihaiyang e5cb168709 公会副本配置 2020-08-17 18:22:09 +08:00
lihaiyang f55b1b64c3 工会购买挑战次数价格添加 2020-08-17 18:19:46 +08:00