gaoxin
|
f9350d662f
|
分辨率小于1080*1920的背景统一放大1.2倍
|
2020-09-05 20:05:50 +08:00 |
gaoxin
|
06afe99236
|
宽屏边缘用图片代替黑边
|
2020-09-05 19:02:20 +08:00 |
gaoxin
|
4ca09780a0
|
引导添加检测类型
|
2020-09-05 17:24:46 +08:00 |
gaoxin
|
7afe25a5d2
|
界面适配修改,引导添加网络延时检测
|
2020-09-05 17:21:09 +08:00 |
gaoxin
|
338b7b4375
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-05 16:44:07 +08:00 |
gaoxin
|
3103a4122b
|
设置,几天好礼界面内容修改
|
2020-09-05 16:43:53 +08:00 |
zhangqiang
|
f8508a8663
|
shipei
|
2020-09-05 16:43:25 +08:00 |
gaoxin
|
68c9726917
|
屏幕适配修改
|
2020-09-05 16:39:10 +08:00 |
zhangqiang
|
21e7bf2e80
|
shi pei
|
2020-09-05 16:28:52 +08:00 |
zhangqiang
|
f36b3c7879
|
shi pei
|
2020-09-05 16:16:10 +08:00 |
zhangqiang
|
0d82f376b0
|
shi pei
|
2020-09-05 15:28:44 +08:00 |
gaoxin
|
37f2fd9bdf
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-05 15:21:55 +08:00 |
gaoxin
|
d05b5d43f1
|
android p 以上机型屏幕适配添加
|
2020-09-05 15:21:41 +08:00 |
zhangqiang
|
c35058767b
|
shi pei
|
2020-09-05 15:20:30 +08:00 |
zhangqiang
|
96e795c7c5
|
全屏界面 背景图片适配脚本 自行挂载
|
2020-09-05 14:22:53 +08:00 |
gaoxin
|
fb6a6c9da5
|
添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备
|
2020-09-05 12:30:00 +08:00 |
gaoxin
|
92a8b93b50
|
修改屏幕的适配方式,修改计算屏幕位置的方法
|
2020-09-05 12:15:58 +08:00 |
zhangqiang
|
9937727ede
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 18:35:40 +08:00 |
zhangqiang
|
6b55198f12
|
周月礼包替图
|
2020-09-04 18:35:30 +08:00 |
ZhangBiao
|
aec554c002
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 18:06:49 +08:00 |
ZhangBiao
|
f6fde7a2c8
|
试炼副本增加动效
|
2020-09-04 18:04:54 +08:00 |
zhangqiang
|
cbad6e10cd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:51:05 +08:00 |
zhangqiang
|
bbd5d3bda2
|
成长基金
|
2020-09-04 17:50:50 +08:00 |
ZhangBiao
|
4b50f8408b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:46:35 +08:00 |
ZhangBiao
|
63cde2092d
|
无尽副本界面动效增加
|
2020-09-04 17:46:27 +08:00 |
gongjiawei
|
69a4bc320d
|
音频更新
|
2020-09-04 17:44:39 +08:00 |
zhangqiang
|
f6a3178926
|
xiugai
|
2020-09-04 17:34:59 +08:00 |
ZhangBiao
|
606ecfe6b2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:33:53 +08:00 |
ZhangBiao
|
5330808e19
|
送神祠动效增加
|
2020-09-04 17:33:42 +08:00 |
zhangqiang
|
56092d5572
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:21:51 +08:00 |
ZhangBiao
|
14206a0cba
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:21:31 +08:00 |
ZhangBiao
|
f9ed1f14be
|
化虚境动效添加
|
2020-09-04 17:21:21 +08:00 |
zhangqiang
|
d1e44c360d
|
xiugai
|
2020-09-04 17:21:16 +08:00 |
gongjiawei
|
2c872553ba
|
音頻跟新
|
2020-09-04 17:18:05 +08:00 |
ZhangBiao
|
7da522065d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 17:03:45 +08:00 |
ZhangBiao
|
70d3fcfe9f
|
断器阁动效增加
|
2020-09-04 17:03:37 +08:00 |
jiaoyangna
|
7dbf679a40
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 16:55:27 +08:00 |
jiaoyangna
|
5a861862d5
|
商店添加动画
|
2020-09-04 16:54:58 +08:00 |
liujiaqi
|
332e32bb22
|
宝物资源
|
2020-09-04 16:50:14 +08:00 |
gongjiawei
|
59481b302a
|
音频更新
|
2020-09-04 15:28:27 +08:00 |
JieLing
|
86feac0023
|
Merge branch 'master_develop' into master_tishen_hw
# Conflicts:
# ProjectSettings/ProjectSettings.asset
|
2020-09-04 15:08:23 +08:00 |
jiaoyangna
|
f6686cb1ae
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 15:06:19 +08:00 |
jiaoyangna
|
b3b001c0df
|
装备魂印黑边
|
2020-09-04 15:05:14 +08:00 |
zhangqiang
|
4d6a9afa63
|
场景提交
|
2020-09-04 15:01:59 +08:00 |
ZhangBiao
|
70f553b732
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 14:35:25 +08:00 |
ZhangBiao
|
502fa23bd1
|
关两个垃圾log
|
2020-09-04 14:35:18 +08:00 |
ZhangBiao
|
8232879006
|
车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
|
2020-09-04 14:30:39 +08:00 |
zhangqiang
|
82b1d2595a
|
Merge branch 'master_develop' into master_tishen_hw
|
2020-09-04 13:47:12 +08:00 |
zhangqiang
|
1c59eb5ff4
|
编队提示文字适配
|
2020-09-04 11:33:33 +08:00 |
gaoxin
|
18f5055d20
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-04 10:26:03 +08:00 |
gaoxin
|
f7d939b016
|
关闭登录流程
|
2020-09-04 10:25:40 +08:00 |
zhangqiang
|
6d15b0171e
|
工会副本
|
2020-09-04 10:23:57 +08:00 |
gaoxin
|
30697705be
|
每次销毁界面时清理一次不用的资源,界面打开音效配置添加
|
2020-09-04 10:03:35 +08:00 |
Genkins
|
22b9eb795b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 21:19:08 +08:00 |
Genkins
|
927da716aa
|
RoleRender Manager
|
2020-09-03 21:12:49 +08:00 |
gaoxin
|
e6e5c39cdd
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 19:50:44 +08:00 |
gaoxin
|
d1facab9de
|
重复引用的资源路径修改
|
2020-09-03 19:50:26 +08:00 |
ZhangBiao
|
ca036d6d0a
|
天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
|
2020-09-03 18:16:20 +08:00 |
ZhangBiao
|
bc26eaff73
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 17:54:31 +08:00 |
ZhangBiao
|
14ce57d5f0
|
|
2020-09-03 17:54:13 +08:00 |
gongjiawei
|
f84a683088
|
音频更新
|
2020-09-03 16:58:54 +08:00 |
ZhangBiao
|
0d6c12bd58
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 16:51:16 +08:00 |
ZhangBiao
|
ce9ca7937a
|
无尽副本剩余行动力微调
|
2020-09-03 16:51:07 +08:00 |
zhangqiang
|
ca67dc9457
|
louti
|
2020-09-03 16:45:40 +08:00 |
zhangqiang
|
8827fccbaf
|
去掉编队索引赋值
|
2020-09-03 16:43:08 +08:00 |
jiaoyangna
|
a372dd7a5e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 16:32:26 +08:00 |
jiaoyangna
|
2f9c449e31
|
新手引导预设修改
|
2020-09-10 16:32:19 +08:00 |
ZhangBiao
|
dbb941851c
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 16:30:35 +08:00 |
ZhangBiao
|
c51e180255
|
十绝阵界面适配调整、修改排行单位错误
|
2020-09-03 16:30:28 +08:00 |
zhangqiang
|
352f338abe
|
界面战力不一致
|
2020-09-03 16:03:14 +08:00 |
ZhangBiao
|
6e860dde51
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 15:59:24 +08:00 |
ZhangBiao
|
d39a324917
|
森罗文字提示修改
|
2020-09-03 15:59:13 +08:00 |
ZhangBiao
|
5b0a96c40f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 15:14:22 +08:00 |
jiaoyangna
|
8a84e8feaa
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-10 15:08:20 +08:00 |
jiaoyangna
|
36b66f03e1
|
【破阵诛仙】 在线结束,主城入口显示0000不消失,点击入口黑屏
|
2020-09-10 15:08:13 +08:00 |
ZhangBiao
|
3e46c0804c
|
特权商城礼包顺序问题修复
|
2020-09-03 15:14:08 +08:00 |
ZhangBiao
|
b7f59ef2fe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 14:42:41 +08:00 |
zhangqiang
|
2612f04dc4
|
shipei
|
2020-09-03 16:24:04 +08:00 |
zhangqiang
|
2f32484379
|
shipei
|
2020-09-03 16:19:13 +08:00 |
ZhangBiao
|
04b18aa4ad
|
竞技场有免费次数 时提示红点
|
2020-09-03 14:42:31 +08:00 |
wangzhenxing
|
3232e4126f
|
effect: 116 兼容金翅大鹏10星天赋
|
2020-09-03 15:20:27 +09:00 |
jiaoyangna
|
cf0cd114fe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 14:13:48 +08:00 |
jiaoyangna
|
6a951e8fd7
|
神将,进阶提交
|
2020-09-03 14:12:32 +08:00 |
ZhangBiao
|
854404515d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 14:07:10 +08:00 |
zhangqiang
|
b6c47a3762
|
当车迟抢夺编队为空时前端直接弹结果
|
2020-09-03 15:58:00 +08:00 |
ZhangBiao
|
e9e6378995
|
general_bomb 适配调整
|
2020-09-03 14:07:02 +08:00 |
gaoxin
|
71851d1662
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 11:37:40 +08:00 |
gaoxin
|
bc982203a8
|
界面适配调整
|
2020-09-03 11:37:36 +08:00 |
gongjiawei
|
73fd866ae9
|
音频更新
|
2020-09-03 11:16:33 +08:00 |
jiaoyangna
|
bd2bce5474
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-03 10:55:34 +08:00 |
jiaoyangna
|
ce839831d7
|
【提示优化】修改处于多个编队的神将作为进阶材料、以及进行神将置换时的文字提示
|
2020-09-03 10:55:16 +08:00 |
ZhangBiao
|
c3b0f590d2
|
好友增加一键领取红点
|
2020-09-03 10:50:25 +08:00 |
gaoxin
|
6e400a4db1
|
屏幕适配提交
|
2020-09-02 22:29:33 +08:00 |
gaoxin
|
315c9b864a
|
屏幕适配
|
2020-09-02 20:46:21 +08:00 |
gaoxin
|
b3dab63ca4
|
屏幕适配修改
|
2020-09-02 20:27:21 +08:00 |
gaoxin
|
b2d9620c73
|
界面适配修改
|
2020-09-02 19:30:56 +08:00 |
wangzhenxing
|
9473b158e4
|
释放技能逻辑修改,如果角色在释放技能前死了就把队列里要释放的技能都不做处理,只有死亡后才触发的技能才会释放和有不灭的英雄的技能
|
2020-09-02 19:01:11 +09:00 |
ZhangBiao
|
5959deaefa
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 18:33:45 +08:00 |
ZhangBiao
|
3c0c8e3f15
|
【页签优化】部分页签设定按照玩家等级开启
|
2020-09-02 18:33:17 +08:00 |
zhangqiang
|
4c000c6cb3
|
shipei
|
2020-09-02 18:27:03 +08:00 |
jiaoyangna
|
2b33e3859b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 18:07:44 +08:00 |
jiaoyangna
|
b7abe8edd6
|
hero compound
|
2020-09-02 18:07:20 +08:00 |
zhangqiang
|
ef1b812ebd
|
shipei
|
2020-09-02 18:02:52 +08:00 |
jiaoyangna
|
d40da31aad
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua
|
2020-09-02 18:01:01 +08:00 |
jiaoyangna
|
7342bc3bd9
|
commit
|
2020-09-02 17:59:39 +08:00 |
zhangqiang
|
571b8e082a
|
shipei
|
2020-09-02 17:38:56 +08:00 |
gaoxin
|
aabec9c31d
|
下边添加适配效果
|
2020-09-02 17:33:46 +08:00 |
gaoxin
|
3df07f557c
|
合成界面屏幕适配修改
|
2020-09-02 17:31:49 +08:00 |
jiaoyangna
|
b97569c645
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 17:22:22 +08:00 |
jiaoyangna
|
d2e94cfdea
|
hero compound and replace
|
2020-09-02 17:21:54 +08:00 |
gaoxin
|
01d215097b
|
修复新的ui结构导致引导报错的问题
|
2020-09-02 17:10:19 +08:00 |
gaoxin
|
e415076e53
|
主界面适配资源替换
|
2020-09-02 17:04:44 +08:00 |
gaoxin
|
3104734cfe
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 16:46:47 +08:00 |
gaoxin
|
ae1ed4b001
|
月卡界面屏幕适配修改,
|
2020-09-02 16:46:38 +08:00 |
zhangqiang
|
88456863c2
|
shipei
|
2020-09-02 16:44:04 +08:00 |
gongjiawei
|
61d8b372d6
|
音频更新
|
2020-09-02 16:19:28 +08:00 |
gaoxin
|
541d4277c7
|
部分界面屏幕适配修改
|
2020-09-02 16:11:53 +08:00 |
ZhangBiao
|
58540f1556
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 16:10:40 +08:00 |
ZhangBiao
|
926f8d7669
|
一件添加好友和添加界面调整
|
2020-09-02 16:10:32 +08:00 |
jiaoyangna
|
5b68ae2cb9
|
tujian commit
|
2020-09-12 14:12:26 +08:00 |
zhangqiang
|
939e9b3c77
|
shi pei
|
2020-09-02 15:54:28 +08:00 |
jiaoyangna
|
f0d60cfca0
|
tujian commit
|
2020-09-02 15:36:45 +08:00 |
jiaoyangna
|
35712b99de
|
xuanyuan commit
|
2020-09-02 15:31:02 +08:00 |
jiaoyangna
|
bb43d526b2
|
【背包优化】无可分解装备和魂印时添加提示
|
2020-09-02 14:47:53 +08:00 |
gaoxin
|
1f3ba7abf7
|
充值,首充,幸运探宝界面适配修改
|
2020-09-02 14:44:07 +08:00 |
gaoxin
|
8c8697d31d
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 14:19:20 +08:00 |
gaoxin
|
7563aad66f
|
活动界面适配调整
|
2020-09-02 14:19:10 +08:00 |
zhangqiang
|
c2eeeb2dc1
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-02 14:16:19 +08:00 |
zhangqiang
|
aeb70ab707
|
dainfengsai
|
2020-09-02 14:16:06 +08:00 |
zhangqiang
|
1908ce2ee8
|
破阵诛仙
|
2020-09-02 14:07:57 +08:00 |
zhangqiang
|
9d757ba068
|
适配
|
2020-09-02 13:45:14 +08:00 |
ZhangBiao
|
09fa5b2586
|
uimanager增加界面判空
|
2020-09-02 13:37:09 +08:00 |
ZhangBiao
|
39e9728561
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
|
2020-09-02 13:36:17 +08:00 |
jiaoyangna
|
f8e5364152
|
【图鉴优化】取消图鉴界面的全部分类
|
2020-09-09 11:10:47 +08:00 |
jiaoyangna
|
8b60b15dd6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:31:07 +08:00 |
jiaoyangna
|
8d11549d86
|
大闹天宫红点修改
|
2020-09-09 10:30:39 +08:00 |
jiaoyangna
|
730c2719a5
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-09 10:11:52 +08:00 |
jiaoyangna
|
8d19f5c583
|
prefab commit
|
2020-09-09 10:11:47 +08:00 |
ZhangBiao
|
e3e95e2379
|
森罗 无尽 流程优化和界面调整
|
2020-09-02 13:35:29 +08:00 |
gaoxin
|
95460eff7e
|
删除无用log
|
2020-09-02 10:30:37 +08:00 |
gaoxin
|
13ab0dc54f
|
小弹窗界面屏幕适配修改
|
2020-09-02 10:29:55 +08:00 |
zhangqiang
|
e845bc5fe1
|
车迟 十绝阵 英雄详情 适配
|
2020-09-02 09:49:17 +08:00 |
gaoxin
|
d7a813f6f3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 20:30:39 +08:00 |
gaoxin
|
8988ec5823
|
修复网络连接掉线无法重连的问题,
|
2020-09-01 20:30:34 +08:00 |
zhangqiang
|
e5dd48c072
|
shipei
|
2020-09-01 19:53:59 +08:00 |
jiaoyangna
|
933aadbf65
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 18:36:18 +08:00 |
jiaoyangna
|
00b75cc097
|
prefab commit
|
2020-09-01 18:36:14 +08:00 |
zhangqiang
|
f68a1b868a
|
四元阵 抽卡 兽潮主
|
2020-09-01 17:35:10 +08:00 |
gaoxin
|
56b7486287
|
主界面上下适配资源添加
|
2020-09-01 17:16:28 +08:00 |
gaoxin
|
68f9b89773
|
loadingpanel界面适配调整
|
2020-09-01 17:13:30 +08:00 |