shihongyi
|
0caa56d2a9
|
置换功能
|
2020-08-05 15:38:20 +08:00 |
zhangqiang
|
ed53f7e760
|
Merge branch 'master_develop' into master_develop2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# data_execl/base_data/BeStronger.xlsx
# data_execl/base_data/EquipTalismana.xlsx
# data_execl/base_data/GlobalActivity.xlsx
|
2020-08-07 06:54:04 +08:00 |
shihongyi
|
1e55175acb
|
限时抽活动时间
|
2020-08-05 10:59:36 +08:00 |
zhangqiang
|
54148395b4
|
日常副本判断开启临时添加战力计算
|
2020-08-07 06:06:55 +08:00 |
jiaoyangna
|
dd4800f657
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 20:49:48 +08:00 |
jiaoyangna
|
1b7f35e41f
|
bg update
|
2020-08-04 20:49:42 +08:00 |
ZhangBiao
|
989703a0e4
|
乾坤宝盒单抽bug修复、四元阵赠送“元神玉”
|
2020-08-04 20:30:26 +08:00 |
ZhangBiao
|
6acaa8549d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 20:23:16 +08:00 |
ZhangBiao
|
ee28c18254
|
森罗bug修复
|
2020-08-04 20:22:56 +08:00 |
jiaoyangna
|
802286d743
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:41:22 +08:00 |
jiaoyangna
|
e9438df1b7
|
图鉴优化
|
2020-08-04 18:41:17 +08:00 |
zhangqiang
|
e45e6c9325
|
公会技能升级优化
|
2020-08-04 18:37:30 +08:00 |
liujiaqi
|
9fd25a6c98
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:24:09 +08:00 |
liujiaqi
|
6fb9b33978
|
新增挂机地图
|
2020-08-04 18:22:11 +08:00 |
ZhangBiao
|
7255baef99
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 18:19:38 +08:00 |
ZhangBiao
|
f548b53b46
|
开引导 在森罗杀进程 重新登陆后 不回到森罗
|
2020-08-04 18:19:20 +08:00 |
kansa
|
2ceb319c5f
|
新增挂机背景图1
|
2020-08-04 17:57:39 +08:00 |
gongjiawei
|
4c0c01cefe
|
音频更新
|
2020-08-04 17:47:38 +08:00 |
kansa
|
de8f04b9bc
|
修改十绝阵怪物预览的显示星级
|
2020-08-04 17:25:24 +08:00 |
zhangqiang
|
7b73f4ae77
|
升星成功界面加天赋解锁显示
|
2020-08-04 17:24:15 +08:00 |
liujiaqi
|
9823834bcf
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 16:26:06 +08:00 |
liujiaqi
|
cf8c32c645
|
我要变强点将神符换元神符描述修改,妈祖庇佑改为神女庇佑魂印
|
2020-08-04 16:25:52 +08:00 |
ZhangBiao
|
ade7ee88bc
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 16:19:06 +08:00 |
ZhangBiao
|
24381aba57
|
森罗bug修复
|
2020-08-04 16:18:48 +08:00 |
zhangqiang
|
e11b5fd7bb
|
寻宝红点修改 添加解锁新章节音效
|
2020-08-04 15:33:44 +08:00 |
gongjiawei
|
15494b2117
|
音频更新
|
2020-08-04 14:33:15 +08:00 |
kansa
|
c0730e64a3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 14:12:44 +08:00 |
liujiaqi
|
ba64ab34ff
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-04 14:12:32 +08:00 |
kansa
|
8b47a37eb3
|
推迟森罗幻境刷新时间
|
2020-08-04 14:12:12 +08:00 |
liujiaqi
|
b4cdaaafe4
|
累冲448档碎片奖励修正签到碎片奖励修正
|
2020-08-04 14:12:09 +08:00 |
zhangqiang
|
0a8bdc5765
|
援助 十绝阵 合成 提示性bug
|
2020-08-04 14:02:28 +08:00 |
shihongyi
|
28e158032e
|
统一 5星碎片只商店
|
2020-08-04 11:58:16 +08:00 |
gongjiawei
|
52e0c553f7
|
音频更新
|
2020-08-04 11:13:08 +08:00 |
liujiaqi
|
10dc26b855
|
开服狂欢第七日全民超值大小礼包调换位置
|
2020-08-04 11:11:18 +08:00 |
jiaoyangna
|
9a53f20f60
|
小游戏提交
|
2020-08-04 10:39:16 +08:00 |
gaoxin
|
04e6c2fb42
|
删除不必要的符号
|
2020-08-03 21:23:16 +08:00 |
gaoxin
|
01b6b4e1fd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 21:08:43 +08:00 |
gaoxin
|
b257aa2eef
|
dragview回滚
|
2020-08-03 21:08:38 +08:00 |
ZhangBiao
|
f6b827c922
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 20:02:10 +08:00 |
ZhangBiao
|
c2024a15cb
|
bug修复
|
2020-08-03 20:01:59 +08:00 |
zhangqiang
|
13cad0dd5b
|
排行榜切磋玩回来立绘丢了问题修改
|
2020-08-03 19:41:54 +08:00 |
shihongyi
|
de441aa61d
|
补充 环境 101~200 怪
|
2020-08-03 19:22:49 +08:00 |
gaoxin
|
5ed5f7b8c4
|
修改Loading界面资源位置
|
2020-08-03 18:49:24 +08:00 |
jiaoyangna
|
55aa9bb91c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 18:40:26 +08:00 |
jiaoyangna
|
6c6f28f634
|
fix bug
|
2020-08-03 18:40:20 +08:00 |
liujiaqi
|
b0a624aaff
|
孔雀明王、净光天女、幽魂姬主动技能描述修正,
孔雀明王、东陵圣母、杨戬、金翅大鹏、蚩尤天赋描述修正
治疗机制修改为治疗生命百分比最低单位
姜子牙6星激活特性属性修正,吕洞宾4阶突破天赋属性修正,孟婆4阶突破天赋属性修正,夜叉8星激活天赋属性修正,阎罗王8星激活属性天赋修正,水德星君2阶突破天赋属性修正,聚宝盆圣物描述修正
142107 150105 151109 146105 152109 10070102被动技能属性修正
|
2020-08-03 17:54:36 +08:00 |
jiaoyangna
|
3ff95a1796
|
fix bug
|
2020-08-03 17:23:28 +08:00 |
jiaoyangna
|
ffdb4c9666
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 17:07:35 +08:00 |
jiaoyangna
|
3c6043d32c
|
destroy guildmaincitypanel close playerheadview
|
2020-08-03 17:07:24 +08:00 |
ZhangBiao
|
ab93491cfe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-03 16:59:50 +08:00 |