Commit Graph

1500 Commits (6b0af3d7fb8440ffb55c87f75de37c5ee50479f6)
 

Author SHA1 Message Date
gaoxin bab0c056eb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-07 17:35:23 +08:00
gaoxin a35b26a215 修改平分概率类型的技能的概率计算方式 2020-08-07 17:35:16 +08:00
gongjiawei fe738c1dea 音频更新 2020-08-07 17:33:40 +08:00
liujiaqi ca54d29c40 1132追击目标更正,神女魂印名称修正狂噬戮兽描述修正 2020-08-07 17:12:25 +08:00
liujiaqi 85433824da 狂噬戮兽魂印描述修正,神女魂印修正为妈祖魂印,1132技能追击目标修正 2020-08-07 16:40:02 +08:00
lihaiyang 5a428f6d4d 修改轩辕宝境未通关时显示的难度 2020-08-07 16:38:58 +08:00
lihaiyang 0ad0461004 宝物奖励 显示配置 2020-08-07 16:14:58 +08:00
lihaiyang 7d4a9ef74c 轩辕宝境首通奖励完全配置不需要相加 2020-08-07 16:14:07 +08:00
lihaiyang 8a7b0dd708 修改表头备注 2020-08-07 16:12:15 +08:00
lihaiyang cc63406888 奖励类型改为2-前后端都可以用 2020-08-07 15:48:00 +08:00
jiaoyangna 63f1dcb2c9 convertutf8..cs 提交 2020-08-07 15:19:25 +08:00
liujiaqi 800821f011 1132追击目标变更 2020-08-07 14:45:19 +08:00
zhangqiang f2d743a343 英雄合成预设更新 2020-08-07 14:23:05 +08:00
lihaiyang 9773fc1b2e 更换第一层副本怪物,添加被动技能 怪物星级加强 2020-08-07 11:25:09 +08:00
liujiaqi 487e321192 付费活动开启 2020-08-07 11:04:34 +08:00
gaoxin 723531298d 删除被动194额外附加伤害也会触发效果的并导致报错的问题, 2020-08-07 10:57:30 +08:00
ZhangBiao f09a0448bc 2020-08-07 10:34:18 +08:00
zhangqiang 93e1d880c8 英雄合成界面拼接 2020-08-06 18:34:04 +08:00
shihongyi 428ee21777 炸弹 回春 进背包 2020-08-06 18:24:21 +08:00
shihongyi 8dbd031fa7 无效属性置0 2020-08-06 18:20:32 +08:00
shihongyi a4f9309f37 星级等级上限 2020-08-06 18:17:51 +08:00
liujiaqi 240f0a0331 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 18:03:18 +08:00
liujiaqi ccee02a26a 开服狂欢三日登陆奖励更改为唤元神符 2020-08-06 18:03:02 +08:00
jiaoyangna 41cf013543 convert format 2020-08-06 17:45:30 +08:00
jiaoyangna 8d2576e185 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 17:37:48 +08:00
jiaoyangna 5c13a25bb5 encoding convert 2020-08-06 17:37:42 +08:00
jiaoyangna 16d4b6477d no message 2020-08-06 17:37:07 +08:00
jiaoyangna 1c505dd1e1 Merge branch 'xuanyuanbaojing' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing 2020-08-06 17:35:44 +08:00
jiaoyangna 22b02b5cca encoding convert 2020-08-06 17:35:07 +08:00
lihaiyang 6b149e6bca 阵营属性,加成比例,修改为 提升比例为攻击属性 降低改为降低攻击力 2020-08-06 17:07:00 +08:00
lihaiyang 856044d745 轩辕宝境 怪物属性微调 2020-08-06 17:03:09 +08:00
wangzhenxing e4cf5b8fd1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 18:02:20 +09:00
jiaoyangna 67f07c8214 代码转utf8格式 2020-08-06 17:59:23 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
wangzhenxing 416cfbde79 技能释放后摇时间添加0.2 2020-08-06 18:01:59 +09:00
gongjiawei 8a5d729f71 音频更新 2020-08-06 16:12:55 +08:00
ZhangBiao a125fe5840 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 15:05:50 +08:00
ZhangBiao 3522da8a3a 森罗去除遮罩 2020-08-06 15:05:33 +08:00
skuld 2eebab650e 替换 万象境图片 2020-08-06 10:57:17 +08:00
ZhangBiao ed373d1851 Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换 2020-08-06 10:43:28 +08:00
ZhangBiao 44497f73bd 神将置换页面制作1 2020-08-06 10:43:11 +08:00
zhangqiang 3bb0906865 法宝归元中文表 2020-08-06 10:38:55 +08:00
lihaiyang cc827dd743 74.75.76.77 改为1234 2020-08-06 10:38:19 +08:00
lihaiyang fa37dbc04b 修改特权礼包 为等级开启 75级开启 时间999999 2020-08-06 10:23:05 +08:00
shihongyi b617c30639 置换及合成qa 2020-08-06 09:43:22 +08:00
gaoxin fee7d18688 森罗幻境,修复非快速战斗怪物点不删除的问题 2020-08-05 22:47:21 +08:00
lihaiyang ca572b6294 为了不报错 特权活动时间类型临时改为5 2020-08-05 21:45:46 +08:00
lihaiyang 4d2100a22c 奖励组改为对应副本掉落对应宝物 2020-08-05 21:45:10 +08:00
Genkins 3f1eb6db0f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-05 21:20:22 +08:00
Genkins 7dd6f75e24 删除Spine UI对象时,释放模型资源 2020-08-05 21:20:13 +08:00