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 |