Commit Graph

1417 Commits (92b2c3d6fb97f28a756fb0261d0f80c94c0b68e1)

Author SHA1 Message Date
ZhangBiao c1ce67f7c3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 18:25:46 +08:00
ZhangBiao 156e81ab7b 天宫秘宝到时间踢出去 2020-09-10 18:25:39 +08:00
gaoxin 41aa573c68 再次尝试修复同时连接两个socket的问题 2020-09-10 18:09:30 +08:00
zhangqiang 52c6a96dbb 天赋提示语 2020-09-10 17:41:25 +08:00
zhangqiang 1b3c626708 加音效 2020-09-10 17:08:09 +08:00
ZhangBiao dd4c91a46c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 16:53:23 +08:00
ZhangBiao ca65ebbe49 限时兑换添加到叱咤风云中 2020-09-10 16:53:06 +08:00
jiaoyangna 442daa6312 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 20:23:42 +08:00
jiaoyangna c2f7b1e7ce 破阵诛仙提交 2020-09-10 20:23:35 +08:00
jiaoyangna 3d99e2a46c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 18:08:26 +08:00
jiaoyangna 89f937e9ac 破阵诛仙提交 2020-09-10 18:08:21 +08:00
zhangqiang c27c237fac 音效 2020-09-10 16:30:52 +08:00
jiaoyangna fa33af7eea 限时提交 2020-09-10 16:18:54 +08:00
zhangqiang 5e92ce5f73 部分音效加入 2020-09-10 15:54:06 +08:00
jiaoyangna 6eed7b719d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 15:37:34 +08:00
jiaoyangna f2015e8c98 日常任务修改 2020-09-10 15:36:17 +08:00
jiaoyangna 2998453d49 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 15:28:24 +08:00
jiaoyangna e492dc6813 破阵诛仙提交 2020-09-10 15:28:19 +08:00
jiaoyangna 24365446a2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 14:44:56 +08:00
jiaoyangna a06e4abf56 乾坤宝盒修改提交 2020-09-10 14:44:51 +08:00
gaoxin 2bf4247d59 修复sdk无法登录 2020-09-10 14:25:30 +08:00
gaoxin 70a575cbb3 部分界面不再常驻内存 2020-09-10 14:25:02 +08:00
jiaoyangna 3e5e41b8ff 破阵诛仙提交 2020-09-10 13:40:07 +08:00
wangzhenxing 49f0c19cea 争霸赛胜负规则修改 2020-09-10 11:50:12 +09:00
gaoxin bf9cdac6b7 修改注册打点事件,将部分静态数据放在注册之前 2020-09-09 20:17:40 +08:00
gaoxin a8e9974854 修改充值接口报错 2020-09-09 19:45:40 +08:00
gaoxin bdacc0c703 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 18:47:23 +08:00
gaoxin 64f382c54d 充值接口修改,sdk和本地走同一套接口 2020-09-09 18:47:17 +08:00
ZhangBiao ac87815d64 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 17:25:33 +08:00
ZhangBiao 4af6f84f03 2020-09-09 17:25:27 +08:00
ZhangBiao f927da56e1 十绝阵排名bug修复 2020-09-09 15:20:56 +08:00
gaoxin b9481babee 部分界面音效添加 2020-09-09 13:59:22 +08:00
zhangqiang 4bcb51e164 添加寻宝排行榜 和 巅峰赛赛季更新修改 2020-09-09 11:20:29 +08:00
jiaoyangna c68cec489a 修改破阵诛仙子活动开启的条件判断 2020-09-10 11:03:47 +08:00
jiaoyangna 18ec0b7b20 限时召唤提交 2020-09-10 10:55:29 +08:00
ZhangBiao b209b5ae28 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:52:58 +08:00
ZhangBiao 462ad7b96b 主题活动界面适配调整 2020-09-09 10:52:50 +08:00
jiaoyangna d84b25c7a6 限时召唤提交 2020-09-10 09:33:27 +08:00
zhangqiang c87812cec5 打印 2020-09-09 10:41:42 +08:00
zhangqiang 6e04bd3404 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:37:02 +08:00
zhangqiang bf541ed4b0 寻宝达人替换资源 2020-09-09 10:36:55 +08:00
gaoxin 0393da682c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:36:52 +08:00
gaoxin b395ea2804 竞技场跳过30级后解锁 2020-09-08 20:16:14 +08:00
gaoxin 63f7759c7a 引导人物修改 2020-09-08 18:03:38 +08:00
jiaoyangna 70df47683a 限时召唤提交 2020-09-08 17:56:49 +08:00
ZhangBiao d36bd93b2d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 17:33:56 +08:00
ZhangBiao f56be71560 主题活动修改 2020-09-08 17:16:08 +08:00
jiaoyangna fb9b646553 限时召唤提交 2020-09-08 16:57:19 +08:00
gaoxin 37316136f1 剧情添加转场效果 2020-09-08 15:31:38 +08:00
zhangqiang f6abc4a22e 公会副本倒计时结束 加成buff 重置 2020-09-08 12:01:05 +08:00
gaoxin b65581fe71 引导战斗添加 2020-09-08 11:58:34 +08:00
ZhangBiao f451ac76f5 2020-09-08 10:56:23 +08:00
ZhangBiao 7a375b767c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 10:32:58 +08:00
ZhangBiao c67d731374 天宫秘宝增加购买校验 2020-09-08 10:32:49 +08:00
jiaoyangna 53524225f9 动画添加提交 2020-09-08 10:09:21 +08:00
jiaoyangna 6ac2b5a5f9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-08 09:32:45 +08:00
gaoxin 32b8705ab1 引导战斗流程添加 2020-09-07 18:25:31 +08:00
gaoxin 0c95879fb9 修改新手引导剧情开始节点 2020-09-07 17:06:45 +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
jiaoyangna a15206e938 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-07 10:01:13 +08:00
jiaoyangna 5e3e27c056 预设添加动画代码提交 2020-09-07 10:01:08 +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
zhangqiang f36b3c7879 shi pei 2020-09-05 16:16:10 +08:00
gaoxin d05b5d43f1 android p 以上机型屏幕适配添加 2020-09-05 15:21:41 +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 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 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
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 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 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
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
zhangqiang 1908ce2ee8 破阵诛仙 2020-09-02 14:07:57 +08:00