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
|
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 |
gaoxin
|
97eaf77009
|
主界面底部界面经验条显示调整
|
2020-09-01 17:12:00 +08:00 |
gaoxin
|
eeecbca77a
|
部分界面适配调整
|
2020-09-01 16:56:45 +08:00 |
zhangqiang
|
c4bc262356
|
图鉴 编队 开服
|
2020-09-01 16:54:07 +08:00 |
zhangqiang
|
51e88c5f34
|
寻宝自动选择逻辑修改
|
2020-09-01 16:45:11 +08:00 |
gaoxin
|
d405d09c05
|
登录界面动画修改
|
2020-09-01 16:17:20 +08:00 |
gaoxin
|
a4ac6034b6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 16:10:41 +08:00 |
gaoxin
|
ad887c2b7f
|
添加全屏显示的ui父节点,并将所有弹窗都放入该节点
|
2020-09-01 16:10:36 +08:00 |
gongjiawei
|
687cfbae20
|
音频更新
|
2020-09-01 15:54:55 +08:00 |
ZhangBiao
|
895f4fcbc8
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 15:32:43 +08:00 |
ZhangBiao
|
91061ae00a
|
无尽红点刷新修复
|
2020-09-01 15:32:24 +08:00 |
gaoxin
|
b939439eb2
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 15:31:11 +08:00 |
gaoxin
|
3d3a51fbb0
|
重连和登录时断开之前的socket连接
|
2020-09-01 15:31:06 +08:00 |
ZhangBiao
|
4dbbdbd54b
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 14:53:42 +08:00 |
ZhangBiao
|
822f4a2294
|
森罗界面适配
|
2020-09-01 14:53:12 +08:00 |
gaoxin
|
aea9b03f5f
|
模拟刘海屏
|
2020-09-01 14:44:51 +08:00 |
gaoxin
|
c6bdebeffb
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
|
2020-09-01 14:38:29 +08:00 |
gaoxin
|
ae349123df
|
部分界面屏幕适配调整
|
2020-09-01 14:38:02 +08:00 |
gongjiawei
|
e6678daff0
|
音频更新
|
2020-09-01 12:03:40 +08:00 |
zhangqiang
|
aabef68ccb
|
气泡提交
|
2020-09-01 11:50:24 +08:00 |
ZhangBiao
|
0975c28ca6
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 11:25:46 +08:00 |
ZhangBiao
|
e74c120d01
|
大闹天宫重置红点、无尽副本界面红点
|
2020-09-01 11:25:38 +08:00 |
jiaoyangna
|
3a791c802e
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 10:23:51 +08:00 |
jiaoyangna
|
33a6471c05
|
【宝物】共鸣界面等级上限显示不正确
|
2020-09-01 10:23:35 +08:00 |
zhangqiang
|
cf7b336eef
|
漏提
|
2020-09-01 09:37:51 +08:00 |
zhangqiang
|
a6fa4453e6
|
需求主城或关卡停留过长添加聊天气泡
|
2020-08-31 20:52:50 +08:00 |
ZhangBiao
|
69cc5d4e86
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 19:54:21 +08:00 |
ZhangBiao
|
9942bd50bb
|
回春散使用bug修复
|
2020-08-31 19:54:14 +08:00 |
zhangqiang
|
70a17dc502
|
法宝添加红点提示
|
2020-08-31 19:47:57 +08:00 |
zhangqiang
|
40610b0c19
|
献祭修改
|
2020-08-31 18:19:38 +08:00 |
gaoxin
|
e912a4c3ad
|
修复按钮点击动画不生效的问题
|
2020-08-31 17:59:46 +08:00 |
gaoxin
|
63d8a08e27
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 17:39:22 +08:00 |
gaoxin
|
eb8cab2aeb
|
修复商店物品购买所需物品商品数量和拥有的数量相同时会显示不可购买的问题
|
2020-08-31 17:39:18 +08:00 |
zhangqiang
|
081dd22758
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 17:19:27 +08:00 |
zhangqiang
|
595df16baf
|
公会副本添加提示判断
|
2020-08-31 17:19:14 +08:00 |
jiaoyangna
|
9e7a95788f
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 17:10:38 +08:00 |
jiaoyangna
|
e5bccae20b
|
【成就】点击任务,没有自动选择有红点的页签
|
2020-08-31 17:10:33 +08:00 |
gaoxin
|
40378ced12
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 17:06:22 +08:00 |
gaoxin
|
fbcaa5b83f
|
修复装备界面套装属性显示会累加的问题
|
2020-08-31 17:06:14 +08:00 |
zhangqiang
|
bac91deb69
|
公会副本添加边界判断
|
2020-08-31 17:02:58 +08:00 |
jiaoyangna
|
ed758d3a37
|
五星拍脸
|
2020-08-31 16:50:15 +08:00 |
ZhangBiao
|
c72aa2bd21
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 16:32:36 +08:00 |
jiaoyangna
|
d9e3cfe729
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-07 16:09:34 +08:00 |
jiaoyangna
|
0ab3d69773
|
青龙秘宝试炼排序提交
|
2020-09-07 16:09:29 +08:00 |
jiaoyangna
|
c981f24ed0
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-07 15:50:50 +08:00 |
jiaoyangna
|
4069c41f74
|
日常副本添加咸鱼积分奖励
|
2020-09-07 15:50:46 +08:00 |
ZhangBiao
|
40266d1120
|
删除一些log、修复升级豪礼红点bug
|
2020-08-31 16:32:27 +08:00 |
ZhangBiao
|
a9098b6bc7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 16:07:04 +08:00 |
ZhangBiao
|
50dd63cd06
|
小游戏18按钮大小调整,前往下一层文字大小修改、
|
2020-08-31 16:06:57 +08:00 |
zhangqiang
|
946aaa36ea
|
处理神将归元 无尽和大闹天宫一级上阵问题 神将置换大闹天宫编队没血量问题
|
2020-08-31 15:54:12 +08:00 |
ZhangBiao
|
6e4d4e3dc7
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 15:45:27 +08:00 |
ZhangBiao
|
b5ac787e16
|
数独小游戏15 1:2屏幕适配错误修复
购买回春散数量不增加修改
|
2020-08-31 15:45:16 +08:00 |
gongjiawei
|
c0c06f80a2
|
音频更新
|
2020-08-31 15:33:43 +08:00 |
ZhangBiao
|
c7a290e605
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 15:22:28 +08:00 |
ZhangBiao
|
9bbe08043a
|
八日登陆刷新时间从24改道5
|
2020-08-31 15:22:22 +08:00 |
jiaoyangna
|
6d4e5dd390
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-31 15:01:25 +08:00 |
jiaoyangna
|
2bf39b8a9c
|
副本红点提交
|
2020-08-31 15:01:20 +08:00 |