Commit Graph

2035 Commits (bd99b9c1ec26fce826ded72adf9498366ee6ed21)

Author SHA1 Message Date
altair 835a72257c 修改错误活动图片 2020-09-15 18:30:51 +08:00
zhangqiang eab93ec002 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 18:16:09 +08:00
zhangqiang 6f107f78fa 音效 2020-09-15 18:16:01 +08:00
gongjiawei d73435e7dc 音频更新 2020-09-15 18:13:09 +08:00
gaoxin a0d4042475 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 18:07:43 +08:00
gaoxin c03a03481b 修复接口报错导致卡死的问题 2020-09-15 18:07:25 +08:00
zhangqiang 39777d0361 音效 2020-09-15 17:53:43 +08:00
jiaoyangna 3d5ebd7f61 送神祠修改提交 2020-09-15 17:42:32 +08:00
zhangqiang 48cae7ec43 二次弹窗关闭音效 2020-09-15 16:52:12 +08:00
gongjiawei 838eac24ba 音频更新 2020-09-15 15:57:25 +08:00
zhangqiang ff7c4311b4 竞技场结算界面修改代码 2020-09-15 15:22:00 +08:00
gongjiawei 902d1bb2ec 音频更新 2020-09-15 15:15:33 +08:00
liujiaqi 95e270382d 链接符图标 2020-09-15 15:09:42 +08:00
gongjiawei a522e43572 音频更新 2020-09-15 15:02:00 +08:00
ZhangBiao 8fab058727 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 14:55:46 +08:00
ZhangBiao a217f483d2 成长基金"已达成"按钮消失 问题修改 2020-09-15 14:55:40 +08:00
ZhangBiao de0498cba8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-17 11:50:54 +08:00
ZhangBiao 7adae7f006 森罗召唤boss后使用炸弹报错问题修复 2020-09-17 11:50:44 +08:00
jiaoyangna 16fb68cd6b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 14:47:34 +08:00
jiaoyangna aacf1d029d 【十绝阵】敌人编队卡牌应使用无血条版本的边框 2020-09-15 14:47:15 +08:00
jiaoyangna f0f744602e 【累计充值】达成页签没红点 2020-09-15 11:21:55 +08:00
jiaoyangna 050df9638f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-15 10:28:39 +08:00
jiaoyangna 4d2c5e15ba 【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框 2020-09-15 10:28:34 +08:00
ZhangBiao af96f69236 设置界面增加动效 2020-09-15 10:28:11 +08:00
gongjiawei fc5ed55959 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:37:33 +08:00
gongjiawei 5d7663cd16 音频更新 2020-09-14 18:37:19 +08:00
jiaoyangna ff3c5f147e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:31:33 +08:00
jiaoyangna 9745834de4 添加动画 2020-09-14 18:31:21 +08:00
gongjiawei 9858c4143d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:29:35 +08:00
ZhangBiao e7bc8b0aff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-17 00:09:17 +08:00
ZhangBiao 44f6f55d19 月卡增加动效 2020-09-17 00:09:06 +08:00
ZhangBiao 72601bff4f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 23:30:29 +08:00
ZhangBiao 6aebe6f49e 周月卡 点将台动效添加 2020-09-16 23:30:21 +08:00
gongjiawei 8f01fe40eb 音频更新 2020-09-14 18:29:22 +08:00
zhangqiang 444fac23e8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 18:19:34 +08:00
zhangqiang 29ee4bf51e 注释公会副本刷新 修改音效 2020-09-14 18:19:26 +08:00
wangzhenxing 72536420dc 竞技场类型胜利条件修改 2020-09-14 16:46:56 +09:00
jiaoyangna 93dbd1648a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 15:31:54 +08:00
jiaoyangna 9846aebcf2 图鉴2460适配修改,【十绝阵】开启后没有显示主城入口,十绝阵活动结束后吗,入口显示0000不关闭,【青龙秘宝】活动描述和背景重叠 2020-09-14 15:31:33 +08:00
zhangqiang 4489d67d8e 积天豪礼修改显示数字 2020-09-14 15:29:04 +08:00
zhangqiang fafbaa3617 音效 2020-09-14 15:11:07 +08:00
wangzhenxing a85d909545 137 138被动效果修改 2020-09-14 16:03:54 +09:00
zhangqiang 1933a9b7ae Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 14:50:25 +08:00
zhangqiang c985f4d874 跳转公会 2020-09-14 14:50:18 +08:00
ZhangBiao 2d9643c127 点击万象境后 点击切换账号卡死问题修复 2020-09-14 14:39:24 +08:00
ZhangBiao e4ca9c100c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-14 14:24:01 +08:00
ZhangBiao 3594501654 大闹天宫 重置时把玩家踢出天宫密保 、天宫秘宝刷新bug修复, 2020-09-14 14:23:47 +08:00
zhangqiang b3898fe07a 音效修改 加 公会副本接不可扫荡推送 2020-09-14 13:54:45 +08:00
gaoxin cbb0a8462c 修改透传参数consumerId 为 角色id#商品id 修复sdk支付基金不刷新的问题, 2020-09-14 11:28:54 +08:00
jiaoyangna 5f5f6cb50a 【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失 2020-09-14 05:01:10 +08:00
gaoxin 62635bf604 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-12 19:24:53 +08:00
gaoxin ab9e397ee2 添加用于定位商品充值成功后无法刷新界面问题的log 2020-09-12 19:24:49 +08:00
jiaoyangna 48f4fb5913 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-12 15:31:40 +08:00
jiaoyangna 6a47476673 公会副本 添加动画 2020-09-12 15:24:20 +08:00
gaoxin 2d44877d6f 尝试修复战斗中重连偶现关卡数据丢失的问题 2020-09-11 21:09:14 +08:00
wangzhenxing 28655e9732 秒杀效果修改 2020-09-11 18:57:51 +09:00
jiaoyangna 728042f1f9 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 17:50:53 +08:00
jiaoyangna 68b1628c8c 破阵诛仙 2020-09-11 17:48:55 +08:00
wangzhenxing e80d4c7e6a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 18:07:27 +09:00
wangxiaolong 843762b810 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 18:02:27 +08:00
wangxiaolong d21481514c 添加网络层log输出 2020-09-11 18:02:11 +08:00
wangzhenxing 70697ee6df 好友切磋回合结束按照总伤害值和治疗值判断输赢 2020-09-11 18:00:53 +09:00
wangzhenxing 3b83d4224e boss免疫斩杀技能或生命百分比技能 2020-09-11 17:44:39 +09:00
gongjiawei 8f20874508 音频更新 2020-09-11 16:15:28 +08:00
ZhangBiao 1707762433 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
2020-09-11 12:03:42 +08:00
ZhangBiao 846724a9a0 开服福利层级修改 2020-09-11 12:02:23 +08:00
jiaoyangna b0280552a1 chichafengyun icon 提交,开服福利添加动画 2020-09-11 11:47:55 +08:00
jiaoyangna 8454ba4015 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 11:10:02 +08:00
jiaoyangna c25de2c1aa 森罗幻境动画删除 2020-09-11 11:09:58 +08:00
ZhangBiao ca7f382b7f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 11:04:12 +08:00
ZhangBiao 70c535e1d8 限时兑换 奖励错误修改 2020-09-11 11:04:04 +08:00
gaoxin 1a3970c1dc Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 10:44:26 +08:00
gaoxin 7a62bd904a 修复资源路径导致ab包循环引用无法加载游戏的问题 2020-09-11 10:44:08 +08:00
wangxiaolong eceda23f4f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 10:23:15 +08:00
wangxiaolong f8527290ab 添加判空处理 2020-09-11 10:23:05 +08:00
jiaoyangna acb66b113d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-11 10:21:15 +08:00
jiaoyangna dc7fe39497 活动记录值修改 2020-09-11 10:21:01 +08:00
gaoxin 52b7a2665e 通用资源位置移动 2020-09-10 21:30:48 +08:00
gaoxin 17f241564f ios添加获取底部高度的接口 2020-09-10 20:20:19 +08:00
gaoxin 857e255001 特效资源位置移动 2020-09-10 20:16:54 +08:00
gaoxin c3fc01d249 回滚网络连接修改,废物操作 2020-09-10 19:35:58 +08:00
jiaoyangna 8b8e390a8a 邮件添加动画 2020-09-10 18:40:22 +08:00
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 85a8d95d19 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 17:41:33 +08:00
zhangqiang 52c6a96dbb 天赋提示语 2020-09-10 17:41:25 +08:00
gaoxin 50a78b54ca 1080 * 1920 分辨率不再对背景进行放大处理 2020-09-10 17:27:33 +08:00
gaoxin 521e317377 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 17:26:58 +08:00
gaoxin f532b9bfcd 修复热更界面进度数字显示错误的问题 2020-09-10 17:26:51 +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 bccc1204e7 兑换码功能开启 2020-09-10 14:28:28 +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 29fc70a51a 修复 versionManager 变量名错误 2020-09-09 19:46:28 +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 e557130da8 十绝阵奖励偏移修改 2020-09-09 17:57:54 +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
gaoxin 590ede3c90 回滚布局文件 2020-09-09 11:32:49 +08:00
zhangqiang 4bcb51e164 添加寻宝排行榜 和 巅峰赛赛季更新修改 2020-09-09 11:20:29 +08:00
jiaoyangna d6e0895621 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-10 11:03:59 +08:00
DESKTOP-98AVA47\Administrator 5ac12cde11 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-12 00:13:47 +08:00
DESKTOP-98AVA47\Administrator 60f1c19c53 编译C#文件 2020-09-12 00:13:41 +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
seanlong 3840edc366 优化版本更新流程 2020-09-09 09:47:59 +08:00
seanlong f0f84d841c 修改generate 2020-09-09 09:46:44 +08:00
gaoxin b395ea2804 竞技场跳过30级后解锁 2020-09-08 20:16:14 +08:00
jiaoyangna e69cdaebfa 资源提交 2020-09-08 18:06:24 +08:00
gaoxin 63f7759c7a 引导人物修改 2020-09-08 18:03:38 +08:00
jiaoyangna 70df47683a 限时召唤提交 2020-09-08 17:56:49 +08:00
jiaoyangna ea62094ac2 图片提交 2020-09-08 17:52:47 +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
gongjiawei 4cf966d5b2 音频更新 2020-09-08 14:04:10 +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 c0d6feeb8d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-07 17:06:56 +08:00
gaoxin 0c95879fb9 修改新手引导剧情开始节点 2020-09-07 17:06:45 +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
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 f9350d662f 分辨率小于1080*1920的背景统一放大1.2倍 2020-09-05 20:05:50 +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
zhangqiang 4d6a9afa63 场景提交 2020-09-04 15:01:59 +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
Genkins 22b9eb795b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-03 21:19:08 +08:00
Genkins 927da716aa RoleRender Manager 2020-09-03 21:12:49 +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