gaoxin
|
fb4891d005
|
修复打开关卡界面报错的问题
|
2020-07-14 11:39:56 +08:00 |
ZhangBiao
|
39bd3e8523
|
限时召唤ui调整
|
2020-07-14 11:34:40 +08:00 |
ZhangBiao
|
0dada68c8b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-14 11:05:59 +08:00 |
ZhangBiao
|
eddaa95312
|
宝囊
|
2020-07-14 11:05:47 +08:00 |
shihongyi
|
65a82d10e2
|
归元
|
2020-07-14 10:15:25 +08:00 |
zhangqiang
|
7d724437ee
|
巅峰战提示等待其他玩家战斗结束提交
|
2020-07-14 10:12:07 +08:00 |
jiaoyangna
|
791af67033
|
【公会祭祀】祭祀进度条显示不准确
|
2020-07-13 20:47:11 +08:00 |
liujiaqi
|
6569de750f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 20:13:27 +08:00 |
liujiaqi
|
5b44b8fef5
|
4星武将技能名修改
|
2020-07-13 20:13:10 +08:00 |
skuld
|
0e72c7a8e7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 20:07:57 +08:00 |
skuld
|
b31020ec5f
|
调整献祭进度条位置
|
2020-07-13 20:07:19 +08:00 |
ZhangBiao
|
4c6369e51d
|
乾坤宝囊修改
|
2020-07-13 20:07:06 +08:00 |
jiaoyangna
|
143384da23
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 18:32:06 +08:00 |
jiaoyangna
|
0b26bb33c6
|
归元修改
|
2020-07-13 18:31:39 +08:00 |
jiaoyangna
|
96316f4b39
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 18:21:16 +08:00 |
shihongyi
|
1562e97756
|
归元
|
2020-07-13 18:21:10 +08:00 |
liujiaqi
|
e717a4fa78
|
七天狂欢第三天登录奖励,乾坤抽魂印道具自愿修改
|
2020-07-13 18:02:50 +08:00 |
gaoxin
|
48fc5c61fb
|
取消背景音乐加速
|
2020-07-13 18:01:58 +08:00 |
gaoxin
|
a4ffc54ba0
|
Merge branch '音效修改' into master_develop
|
2020-07-13 17:53:51 +08:00 |
gaoxin
|
a37151646a
|
战斗音效播放速度随战斗速度变化
|
2020-07-13 17:53:15 +08:00 |
altair
|
09ca881967
|
修改配音配置
|
2020-07-13 17:49:24 +08:00 |
jiaoyangna
|
4f959f8f9f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 17:32:49 +08:00 |
jiaoyangna
|
889d3abf68
|
【送神祠】归元,点敖丙报错
|
2020-07-13 17:32:24 +08:00 |
shihongyi
|
adaa54830d
|
归元
|
2020-07-13 17:24:30 +08:00 |
jiaoyangna
|
d2f25e1845
|
归元修改
|
2020-07-13 17:12:46 +08:00 |
JieLing
|
64e3bf0458
|
测试0.15.29
|
2020-07-13 17:10:59 +08:00 |
liujiaqi
|
07f2d763e6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:52:35 +08:00 |
liujiaqi
|
11add2dd81
|
乾坤魂印兑换图标资源
|
2020-07-13 16:52:16 +08:00 |
gaoxin
|
d25e87289c
|
修复打包后不能充值的bug
|
2020-07-13 16:50:41 +08:00 |
gaoxin
|
240818a620
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:49:11 +08:00 |
gaoxin
|
db1118aa9c
|
修复打包后不能充值得bug
|
2020-07-13 16:48:50 +08:00 |
JieLing
|
d10581150a
|
sdk修改配置
|
2020-07-13 16:47:39 +08:00 |
jiaoyangna
|
ff2e9aaaa3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:47:28 +08:00 |
jiaoyangna
|
d16ecd259a
|
【公会】公会成员信息点开报错
|
2020-07-13 16:46:59 +08:00 |
ZhangBiao
|
1645736a5c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:41:50 +08:00 |
ZhangBiao
|
416ba72c2f
|
森罗小游戏bug修改
|
2020-07-13 16:41:35 +08:00 |
shihongyi
|
4678a7e6ed
|
vipbugfix
|
2020-07-13 16:40:59 +08:00 |
gaoxin
|
bfd6a89b20
|
特效资源提交
|
2020-07-13 16:29:38 +08:00 |
jiaoyangna
|
f80ac29435
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 16:23:01 +08:00 |
jiaoyangna
|
b2c9b88991
|
【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解
|
2020-07-13 16:16:56 +08:00 |
shihongyi
|
f21a74ba75
|
归元、精炼宝物消耗
|
2020-07-13 16:06:06 +08:00 |
zhangqiang
|
a1ae3f6cb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-07-13 15:42:39 +08:00 |
zhangqiang
|
bc270de90d
|
提交
|
2020-07-13 15:39:29 +08:00 |
gaoxin
|
74a4d7e4dd
|
猪八戒特效资源提交
|
2020-07-13 15:38:20 +08:00 |
liujiaqi
|
1e50ce286d
|
技能生效范围和七日登录描述
|
2020-07-13 15:28:17 +08:00 |
kansa
|
1e2d9e646e
|
修改森罗幻境buff随机库
|
2020-07-13 15:20:19 +08:00 |
zhangqiang
|
926ff911da
|
一键上阵修改
|
2020-07-13 15:08:32 +08:00 |
jiaoyangna
|
3953a76280
|
【宝物】一键装备替下来的,不在背包显示
|
2020-07-13 15:00:07 +08:00 |
gaoxin
|
eba4b7cf50
|
shader引用文件提交
|
2020-07-13 13:38:34 +08:00 |
gaoxin
|
bd83a45de2
|
Merge branch 'master_test' into 接入SDK
# Conflicts:
# .gitignore
# Assets/ManagedResources/Audio/Skill/actor_voc.meta
# Assets/ManagedResources/PublicArtRes/Models/Materials.meta
# Assets/ManagedResources/~Lua/Config/Data.meta
|
2020-07-13 12:55:15 +08:00 |