Commit Graph

1258 Commits (6f0b87c85885451649b669c6507b3bb75059af21)

Author SHA1 Message Date
JieLing 02b58da225 修复进入游戏报错 2020-09-21 18:26:54 +08:00
JieLing c7becc2fc6 Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw 2020-09-21 17:00:53 +08:00
ZhangBiao 8ee791ab0e 修复十绝阵卡死的问题 2020-09-21 16:57:30 +08:00
wangxiaolong 68e2fda511 添加日志输出 2020-09-21 16:55:18 +08:00
gaoxin 9f75396c03 修改tapdb设置服务器数据的调用位置 2020-09-21 16:48:04 +08:00
gaoxin b77d0c9725 删除战斗资源预加载的操作,预加载的资源会导致内存泄漏。 2020-09-21 16:47:49 +08:00
JieLing 1f203f6874 修复加载到登陆加载100%卡死的问题 2020-09-21 16:47:04 +08:00
zhangqiang d8013ccd8c 打开充值每日礼包 和 成长礼包 红点检测 2020-09-21 16:40:18 +08:00
gaoxin b3067cca48 修复切磋战斗结果只会显示失败的问题 2020-09-21 16:39:59 +08:00
JieLing 6034586a26 修复切换账号进入不同区服,会导致老账号默认区服错误的问题。 2020-09-19 16:59:56 +08:00
JieLing 600044eab5 修复跳转天宫商店会显示其他商店商品的问题 2020-09-18 13:56:36 +08:00
JieLing 4f4efeeea4 修复取消支付后无法再次发起支付的问题,同时取消了对网络延迟的处理 2020-09-15 18:55:33 +08:00
JieLing 943c04917e 将分割符换为 下划线 2020-09-14 12:59:53 +08:00
gaoxin dbb57924a6 修改透传参数consumerId 为 角色id#商品id 修复sdk支付基金不刷新的问题, 2020-09-14 11:29:58 +08:00
gaoxin 3fabc33ab6 添加用于定位商品充值成功后无法刷新界面问题的log 2020-09-12 19:32:03 +08:00
gaoxin 807a730802 尝试修复战斗中重连偶现关卡数据丢失的问题 2020-09-12 19:31:45 +08:00
JieLing 64fdc8784a 添加一些报错打印 2020-09-12 19:31:40 +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
gaoxin 4edb1c7925 修复可能在引导日常之前就可以领取日常奖励的问题 2020-09-07 15:38:12 +08:00
gaoxin a46ee1c52c 修复引导急速探索报错的问题 2020-09-07 15:26:37 +08:00
zhangqiang dc0c6320f1 代码漏提 2020-09-07 13:53:22 +08:00
gaoxin b62fe63c84 关闭战斗log 2020-09-05 20:40:33 +08:00
gaoxin 7afe25a5d2 界面适配修改,引导添加网络延时检测 2020-09-05 17:21:09 +08:00
zhangqiang f36b3c7879 shi pei 2020-09-05 16:16:10 +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 f6fde7a2c8 试炼副本增加动效 2020-09-04 18:04:54 +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
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 f9ed1f14be 化虚境动效添加 2020-09-04 17:21:21 +08:00
zhangqiang d1e44c360d xiugai 2020-09-04 17:21:16 +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
JieLing 86feac0023 Merge branch 'master_develop' into master_tishen_hw
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2020-09-04 15:08:23 +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 14ce57d5f0 2020-09-03 17:54:13 +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 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
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
zhangqiang b6c47a3762 当车迟抢夺编队为空时前端直接弹结果 2020-09-03 15:58:00 +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
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 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 b7abe8edd6 hero compound 2020-09-02 18:07:20 +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 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 ae1ed4b001 月卡界面屏幕适配修改, 2020-09-02 16:46:38 +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
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