Commit Graph

2066 Commits (39e9728561d2721f13f721d74bc004489ab34ae1)
 

Author SHA1 Message Date
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
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