Commit Graph

1851 Commits (9e7cd313760856b7ec93527ef59c71eed19f86d2)

Author SHA1 Message Date
JieLing 64fdc8784a 添加一些报错打印 2020-09-12 19:31:40 +08:00
JieLing 3d594a7d8e 文字表修改 2020-09-10 14:51:20 +08:00
JieLing e18ac274db 修复sdk无法登陆的问题 2020-09-10 14:50:25 +08:00
gaoxin efc9ff9daf 修改注册打点事件,将部分静态数据放在注册之前 2020-09-09 20:40:19 +08:00
gaoxin 701db5bb17 充值接口修改,sdk和本地走同一套接口 2020-09-09 20:13:23 +08:00
JieLing d440edea11 打开兑换码功能 2020-09-09 20:12:11 +08:00
zhangqiang 604de656df 巅峰赛战斗结束界面适配 2020-09-07 15:39:57 +08:00
gaoxin 4edb1c7925 修复可能在引导日常之前就可以领取日常奖励的问题 2020-09-07 15:38:12 +08:00
gaoxin a46ee1c52c 修复引导急速探索报错的问题 2020-09-07 15:26:37 +08:00
zhangqiang 5a917b1374 巅峰赛详情适配 2020-09-07 15:02:16 +08:00
zhangqiang dc0c6320f1 代码漏提 2020-09-07 13:53:22 +08:00
altair bf38fd1ab6 修改技能图片 2020-09-07 11:54:03 +08:00
gaoxin b62fe63c84 关闭战斗log 2020-09-05 20:40:33 +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
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
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 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
gongjiawei de87fdacc5 音频更新 2020-08-31 15:00:43 +08:00
ZhangBiao d1e0e6e133 升级豪礼红点显示错误修复 2020-08-31 14:35:35 +08:00
jiaoyangna c73406ca13 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 13:58:52 +08:00
ZhangBiao b1f95890d3 天尊降世 领取顺序bug修复 2020-08-31 13:58:49 +08:00
jiaoyangna 366343b72b 副本红点修改提交 2020-08-31 13:58:47 +08:00
gongjiawei f4cae94b1e 音频更新 2020-08-31 12:05:52 +08:00
zhangqiang e75adfa009 图鉴添加天赋属性 2020-08-31 11:49:35 +08:00
zhangqiang daf0f8bca7 装备界面战力计算修改 2020-08-31 11:03:16 +08:00
jiaoyangna 9fd56a684d 去除宝箱黑色框 2020-08-31 10:40:23 +08:00
jiaoyangna 7576f7dd88 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 10:40:01 +08:00
jiaoyangna 0806d1d497 在副本未开启时不显示红点 2020-08-31 10:39:56 +08:00
gongjiawei 492a1edc94 木吒语音替换 音频混音调整 2020-08-31 10:11:39 +08:00
gaoxin fc9a5341f0 屏幕适配方式改为按高度适配,修复点击特效位置错误的问题 2020-08-29 17:22:46 +08:00
gongjiawei e7f1782d40 音频更新 2020-08-28 18:39:56 +08:00
ZhangBiao bd810de402 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 18:37:24 +08:00
ZhangBiao a2c8352e29 装备文字过长、仙缘宝箱优化、充值妖晶提示问题 2020-08-28 18:37:16 +08:00
gongjiawei d3e27291d4 音频更新 2020-08-28 18:04:43 +08:00
jiaoyangna 6436392c8e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-29 17:36:42 +08:00
jiaoyangna 93602b9cfb commit 2020-08-29 17:36:28 +08:00
jiaoyangna 4e74194195 【优化】图鉴,选中阵营页签后,查看神将信息,点击返回,应该固定在之前选中的页签上 2020-08-29 17:35:49 +08:00
ZhangBiao de119179ca Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 17:29:52 +08:00
ZhangBiao a99aa6ef6e 还是红点检测 2020-08-28 17:29:38 +08:00
jiaoyangna 53cca0033b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-29 16:36:39 +08:00
jiaoyangna cbc73fd654 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-29 16:35:29 +08:00
jiaoyangna 628039ab92 prefab commit 2020-08-29 16:35:20 +08:00
jiaoyangna 638022dbad 【五星成长礼】拍脸图中间“战”字有阴影 2020-08-29 15:17:48 +08:00
jiaoyangna dd1493ee90 【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框 2020-08-29 15:14:09 +08:00
gongjiawei 68cb69490b 音频更新 2020-08-28 17:25:12 +08:00
JieLing 76f266785d Merge remote-tracking branch 'origin/master_develop' into master_test_hw 2020-08-28 16:57:32 +08:00
gongjiawei edc0193ab6 音频更新 2020-08-28 16:37:53 +08:00
ZhangBiao ccbf29ecf2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 16:35:17 +08:00
ZhangBiao 0c3b0e6326 车迟斗法副本界面红点 2020-08-28 16:35:08 +08:00
JieLing 1d34b2f754 Merge branch 'master_develop' into master_tishen_hw 2020-08-28 16:09:57 +08:00
JieLing 83b0ab25b2 打包资源ab包路径 2020-08-28 16:09:03 +08:00
gaoxin b35000e14f 修复updatepanel进度条不显示的问题 2020-08-28 15:36:57 +08:00
gaoxin 02ec865150 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 15:30:02 +08:00
gaoxin ad2ec00881 成长基金的显隐加入礼包是否存在的判断 2020-08-28 15:29:57 +08:00
jiaoyangna bf09d96840 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 14:06:15 +08:00
jiaoyangna 8d6c2d3adf 【宝物】金币不足,一键合成没有合理提示 2020-08-28 14:06:08 +08:00
ZhangBiao 238aa19209 神将情报点击装备查看详情 报错修改 2020-08-28 14:01:34 +08:00
ZhangBiao 77b4b7d3c8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 13:48:20 +08:00
ZhangBiao 01fc7cae51 森罗幻境奖励红点 2020-08-28 13:48:09 +08:00
gaoxin 2d9d097d98 修复巅峰赛按钮时间显示0的问题 2020-08-28 12:08:23 +08:00
ZhangBiao cdc5c07b84 天宫秘宝在副本界面的红点 2020-08-28 10:36:09 +08:00
ZhangBiao 4f64e56b95 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 10:19:03 +08:00
ZhangBiao 7c02e82218 森罗回春散bug修复 2020-08-28 10:14:46 +08:00
JieLing ac79186fca Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw 2020-08-28 03:14:22 +08:00
JieLing 5135d1627d Merge branch 'master_develop' into master_tishen_hw 2020-08-28 03:14:15 +08:00
gaoxin 259e0a1209 祈福文字修改 2020-08-28 03:12:54 +08:00
zhangqiang b367d73d7e login 添加Hw 2020-08-28 01:59:22 +08:00
JieLing 0a1f0ab643 Merge branch 'master_develop' into master_tishen_hw 2020-08-28 01:40:05 +08:00
gaoxin 5d03b4fea8 巅峰赛按钮当日五点开始显示 2020-08-28 01:24:32 +08:00
JieLing 1a5cc2efdb Merge branch 'master_develop' into master_tishen_hw 2020-08-28 00:51:16 +08:00
gaoxin 1452da3489 修复在地图中直接退出游戏,再进入游戏时部分功能提示在地图中的问题 2020-08-28 00:34:02 +08:00
gaoxin 0f5c4ad6d0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 00:24:12 +08:00
gaoxin c933276cea 试炼增益添加滑动效果 2020-08-28 00:24:06 +08:00
jiaoyangna 92a59bbe5a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 00:15:47 +08:00
jiaoyangna cc32ffadec hecheng 2020-08-28 00:15:32 +08:00
liujiaqi 02735594ba 血图标 2020-08-28 00:10:09 +08:00
jiaoyangna 8e5e508494 置换 commit 2020-08-28 00:09:07 +08:00
gaoxin e6c8e81c82 修复小游戏反复打开会报错的问题 2020-08-27 23:01:07 +08:00
jiaoyangna efd5a46eed 大闹天宫死亡置换修改提交 2020-08-27 22:52:51 +08:00
ZhangBiao d87f14b479 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 22:25:19 +08:00
ZhangBiao 013bed75d7 2020-08-27 22:25:10 +08:00
jiaoyangna 7aff7b3c5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 22:23:09 +08:00
jiaoyangna 80f59d54f1 置换编队检测还原 2020-08-27 22:23:04 +08:00
ZhangBiao fbbe8db26f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua
2020-08-27 22:11:02 +08:00
ZhangBiao 4a452addd1 天宫秘宝报错修改 2020-08-27 22:10:08 +08:00
jiaoyangna 94e0dc10df Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 21:42:25 +08:00
jiaoyangna 010f44b1b0 commit zhihuan 2020-08-27 21:41:30 +08:00
gaoxin a7fea145f6 修复日周月礼包不显示的问题 2020-08-27 21:40:01 +08:00
gaoxin aea5077487 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 21:34:43 +08:00
gaoxin b78d3e667e 每日充值金额显示不在计算差值 2020-08-27 21:34:38 +08:00
jiaoyangna f2f3b77260 biandui update 2020-08-27 21:29:03 +08:00
jiaoyangna f25bdb2d17 神将置换去掉检测编队 2020-08-27 21:17:47 +08:00
jiaoyangna 283ffca275 神将置换不检测无尽副本 2020-08-27 21:01:05 +08:00
jiaoyangna d0d5da6adc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 20:45:32 +08:00
jiaoyangna 3961935716 【神将置换】在大闹天宫编队中不需要提示已上阵,可以直接操作置换 2020-08-27 20:45:27 +08:00
gaoxin 99e56d7dcf Merge branch 'master_develop' into master_tishen_hw 2020-08-27 20:39:30 +08:00
altair 07bfcfe202 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 20:18:09 +08:00
altair 888078a2ef 替换技能文字图片资源 2020-08-27 20:17:25 +08:00
gaoxin 3af306318d 删除无用log 2020-08-27 20:00:33 +08:00
jiaoyangna ff4d3e35c1 pozhenzhuxian redpoint update 2020-08-27 19:52:05 +08:00
jiaoyangna 9ed09dc1d2 tiangong serecttreasure commit 2020-08-27 19:41:51 +08:00
zhangqiang fa3003fdc6 云梦祈福修改提交 2020-08-27 19:28:06 +08:00
gaoxin 2e74f05f60 海外工程相关修改 2020-08-27 19:18:31 +08:00