Commit Graph

1533 Commits (88456863c2705c30ff5de86813a29b267b674560)

Author SHA1 Message Date
jiaoyangna 1c17724594 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 15:02:03 +08:00
jiaoyangna cb69e474b9 qinglong task redpoint commit 2020-08-27 14:53:27 +08:00
JieLing 987ad6a325 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 14:29:21 +08:00
JieLing 78729f680d 修复公会界面监听事件错误,导致公会技能升级卡顿的问题 2020-08-27 14:29:14 +08:00
gongjiawei 1f1eeb4889 音频更新 2020-08-27 14:17:48 +08:00
ZhangBiao 1243629056 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 13:59:21 +08:00
ZhangBiao 811418e222 森罗 无尽红点 2020-08-27 13:59:14 +08:00
JieLing 4fcb0d3881 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 12:47:20 +08:00
zhangqiang a2bd473d75 再次修改工会技能升级 2020-08-29 16:23:31 +08:00
zhangqiang 220a8f216e 大闹天宫背景 大闹天宫女例会比例 公会技能更新战力调整位置 2020-08-29 16:15:41 +08:00
JieLing 611bf1a91a 删除错误资源 2020-08-27 12:01:33 +08:00
jiaoyangna 8b27411fd8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 12:01:07 +08:00
jiaoyangna 19465ac1b2 【宝物】共鸣界面等级上限显示不正确 2020-08-27 12:01:01 +08:00
jiaoyangna a4b73c33b2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-01 00:06:49 +08:00
jiaoyangna 2833c3a269 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-01 00:06:24 +08:00
jiaoyangna 9bc710ce58 qinglong commit 2020-10-01 00:05:54 +08:00
JieLing 4160f6d2a5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 11:54:39 +08:00
liujiaqi e3ce0b2c1b 小女孩剧情位置修改 2020-08-27 11:54:32 +08:00
zhangqiang 162180894b 车迟抢夺记录排续 2020-08-29 15:40:24 +08:00
JieLing 0f3b38f85e 修复主界面巅峰赛按钮时间显示错误的问题 2020-08-27 11:49:58 +08:00
liujiaqi 3effb209bb 新男女角色 2020-08-27 11:27:05 +08:00
zhangqiang c315cf768d 竞技场排行 2020-08-27 10:52:35 +08:00
ZhangBiao 1e4f936810 无尽副本迷雾显示问题修改,无尽副本界面步数显示问题修复 2020-08-27 10:49:44 +08:00
zhangqiang 08a37d89d0 删除编队英雄去掉无尽副本判断 2020-08-27 09:40:25 +08:00
jiaoyangna d43d4970e7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 23:14:58 +08:00
jiaoyangna 1b5c0e361a qinglong commit 2020-08-26 23:14:51 +08:00
gaoxin 94612d54e4 剧情立绘替换 2020-08-26 23:10:03 +08:00
zhangqiang 47a16583ee 达人排行点击事件修复 2020-08-26 23:07:04 +08:00
gaoxin db0a09ab68 修复副本界面通关后战斗力背景图标不关闭的问题 2020-08-26 22:37:31 +08:00
gaoxin 3dc8330e4b 修复连续点击导致战斗界面打开多次导致报错,立绘重叠的问题 2020-08-26 22:37:23 +08:00
zhangqiang 241a858968 首冲十星展示 法宝返回顺序修复 2020-08-26 22:15:23 +08:00
jiaoyangna a7c7bd26ff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 21:57:23 +08:00
jiaoyangna 50a40cc7b6 破阵诛仙修改 2020-08-26 21:57:10 +08:00
zhangqiang 7044422ebf 装备合成bug修复 2020-08-26 21:55:39 +08:00
jiaoyangna 9a0d461ada jwel commit 2020-08-26 21:37:19 +08:00
jiaoyangna 1cdaf20d08 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 21:35:04 +08:00
jiaoyangna a6e3ddcd7d 【宝物】精炼,弹服务器开小差 2020-08-26 21:34:48 +08:00
zhangqiang 012a01ec20 移动主界面虚化坛位置 2020-08-26 21:27:58 +08:00
zhangqiang 812450c032 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:56:48 +08:00
zhangqiang 6dec0b0307 修改公会技能升级 更新英雄战力 2020-08-26 20:56:28 +08:00
gaoxin dbebfeddf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:54:37 +08:00
gaoxin ee71156c2c 修复背包界面装备战斗力不显示的问题 2020-08-26 20:53:56 +08:00
jiaoyangna 1482d308cb 日常副本修改 2020-08-26 20:37:31 +08:00
jiaoyangna b987f3124a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:31:07 +08:00
jiaoyangna 1cc497b2fd qinglong commit 2020-08-26 20:30:52 +08:00
gaoxin 8b0c138f68 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:20:53 +08:00
gaoxin 4b41b5def9 副本界面显示优化 2020-08-26 20:20:40 +08:00
jiaoyangna f28c176f18 add activity status 2020-08-26 20:17:37 +08:00
jiaoyangna 3c6a636d0d qinglong commit 2020-08-26 20:04:36 +08:00
jiaoyangna 03048116e4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:04:13 +08:00
jiaoyangna c2ec9c93f8 【秘宝试炼】周试炼刷新后时间显示负,青龙秘宝结束不关闭 2020-08-26 20:04:02 +08:00
zhangqiang 86361419cc 神将合成bug 2020-08-26 19:44:29 +08:00
ZhangBiao f47dc8f441 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 19:08:31 +08:00
ZhangBiao 134b70ce33 成长礼包美元符号位置 2020-08-26 19:08:21 +08:00
gaoxin a972b4993b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:33:57 +08:00
gaoxin e834044de0 修复战斗最后一回合结束还会再打一次的问题 2020-08-26 18:33:47 +08:00
jiaoyangna 8a4f24ce77 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:29:35 +08:00
jiaoyangna f62a007edb qinglong commit 2020-08-26 18:29:27 +08:00
ZhangBiao 87891b2798 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:29:10 +08:00
ZhangBiao 42b0ffe95d 月基金价格修改 2020-08-26 18:29:02 +08:00
gaoxin 093c6d1f41 竞技场按钮功能未开启不再显示 2020-08-26 18:18:12 +08:00
gaoxin 46403f1431 创建角色界面显示优化 2020-08-26 18:17:43 +08:00
gaoxin 80e2f16169 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:58:51 +08:00
gaoxin fcf0557f01 修复公会boss立绘会创建多次的问题 2020-08-26 17:58:46 +08:00
gaoxin bab4148db6 主界面十绝阵,巅峰赛按钮添加 2020-08-26 17:58:23 +08:00
ZhangBiao ed22b5b9d2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:57:12 +08:00
ZhangBiao 8dd4feeead 乾坤宝囊特效增加 2020-08-26 17:56:59 +08:00
zhangqiang 730a39cd69 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:45:32 +08:00
zhangqiang efaa3e51cc 公会副本刷新问题 2020-08-26 17:45:18 +08:00
ZhangBiao ca6862831a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:22:03 +08:00
ZhangBiao 09c72dc362 神将界面点击前往化虚坛提示75级问题修改 2020-08-26 17:21:50 +08:00
jiaoyangna 4fd97151a5 qinglong commit 2020-08-26 17:13:27 +08:00
jiaoyangna 265f0f8781 qinglong commit 2020-08-26 17:08:04 +08:00
ZhangBiao 1f35f84243 四元阵赠送20置换玉提示 2020-08-26 16:59:19 +08:00
zhangqiang 1b8f1631b7 巅峰战八强替换资源 2020-08-26 16:43:07 +08:00
jiaoyangna d8d8dc5721 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 16:32:17 +08:00
jiaoyangna 24b4852ea7 qinglong commit 2020-08-26 16:32:12 +08:00
gaoxin cafdcbcd40 聊天刷新时间延长为每5秒刷新一次 2020-08-26 16:29:52 +08:00
ZhangBiao c5e245fca4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 16:22:49 +08:00
ZhangBiao dc9615b4fc 无尽进图武神将问题、取消对话战斗结束神将数据界面 2020-08-26 16:22:37 +08:00
jiaoyangna e1a2a7cd52 qinglong commit 2020-08-26 16:15:52 +08:00
jiaoyangna b3774c7a44 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:57:12 +08:00
jiaoyangna 22fa2b0d4c qinglong commit 2020-08-26 15:57:06 +08:00
gaoxin ec45a9688d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:51:41 +08:00
gaoxin 57a3c0ce37 首充引导10级开放 2020-08-26 15:51:36 +08:00
zhangqiang 64802afd2b 巅峰战编队提示bug提交 2020-08-26 15:47:01 +08:00
gaoxin 15f355b402 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:16:23 +08:00
gaoxin 9ff8dbf943 我要变强界面匹配当前版本修改 2020-08-26 15:16:17 +08:00
ZhangBiao 0db40d1c9b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:14:37 +08:00
ZhangBiao d644b64450 删除限时活动中的五行成长礼,试炼副本治疗神将不能一键上阵 2020-08-26 15:14:27 +08:00
zhangqiang d51276f132 公会副本提交 2020-08-26 15:10:33 +08:00
jiaoyangna d17427269a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:04:52 +08:00
jiaoyangna 1d3e961196 qinglong commit 2020-08-26 15:04:41 +08:00
zhangqiang 384b3b35c3 编队修改 2020-08-26 15:00:13 +08:00
jiaoyangna 3deb27c862 跳转无尽副本修改 2020-08-26 14:53:31 +08:00
jiaoyangna 8d41c89eee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 14:51:15 +08:00
jiaoyangna 7f9c8122c4 跳转修改提交 2020-08-26 14:51:10 +08:00
wangzhenxing 8a285e4227 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:24:54 +09:00
jiaoyangna f8fc1da3b3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 15:23:26 +08:00
jiaoyangna 66fb6f04d4 box update 2020-08-26 15:23:20 +08:00
zhangqiang 63ce11cda4 替换底图 2020-08-26 15:18:44 +08:00
wangzhenxing c9638f15e9 检测不灭效果还原 2020-08-26 15:24:37 +09:00
jiaoyangna a52ea7f6b7 qinglong commit 2020-08-26 14:04:26 +08:00
JieLing ad7bd17a38 修复八日登陆扫光错误的问题 2020-08-26 13:53:39 +08:00
JieLing be1d62a888 修复登陆界面扫光显示错误的问题 2020-08-26 13:47:26 +08:00
JieLing 33538bdaa3 字体文件需要手动删除材质后再添加才会生效 2020-08-26 13:43:16 +08:00
gaoxin 6451739628 艺术字体文件修改 2020-08-26 13:37:16 +08:00
JieLing c23947edcd 艺术字体优化 2020-08-26 13:35:33 +08:00
wangzhenxing 0a255a5c1f 选择对位英雄逻辑修改 2020-08-26 14:11:00 +09:00
gaoxin d73b816bb3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 12:26:33 +08:00
gaoxin b0222ccd61 艺术字体替换,美元显示优化 2020-08-26 12:26:19 +08:00
jiaoyangna 676fec2f81 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 12:23:26 +08:00
jiaoyangna 78ea78303d 日常 轩辕 列表优化 2020-08-26 12:23:10 +08:00
gaoxin a4c5383917 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 11:41:26 +08:00
zhangqiang 4bc63fb367 编队bug 2020-08-26 11:26:32 +08:00
ZhangBiao a86e5b6d4c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 11:19:58 +08:00
ZhangBiao cc9c498c7d 云梦祈福刷新按钮、乾坤商店白片 2020-08-26 11:19:37 +08:00
gaoxin fa787f83d5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 11:11:27 +08:00
gaoxin b175890bc3 累充活动金额处理 2020-08-26 11:11:14 +08:00
jiaoyangna 59204790d2 xuanyuan commit 2020-08-26 10:58:41 +08:00
jiaoyangna 03712f9069 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 10:19:00 +08:00
jiaoyangna 06abcb4ee3 宝物commit 2020-08-26 10:18:46 +08:00
ZhangBiao c293aba881 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 10:18:38 +08:00
ZhangBiao 09ed357e08 森罗敌人信息显示界面空白问题修改 2020-08-26 10:18:31 +08:00
jiaoyangna 03ec954c9c 删除log 2020-08-26 10:16:16 +08:00
gaoxin b8f87fa28f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 09:44:04 +08:00
zhangqiang 8eb1e19f85 公会副本时间 2020-08-26 09:40:32 +08:00
gaoxin b7bf5e975a 删除白驹工作室 2020-08-26 09:40:03 +08:00
JieLing fcc9a5eb2a 修复打开限时活动界面报错的问题 2020-08-25 21:55:13 +08:00
JieLing 1ac3dbb7f6 五星成长礼原价显示走表配置 2020-08-25 21:35:00 +08:00
JieLing b1774c3853 累充界面金额转换为美元显示 2020-08-25 21:21:34 +08:00
JieLing 94a1aaea9f 修复部分界面艺术字体不显示显示的问题 2020-08-25 20:44:55 +08:00
JieLing 934b78e022 珍奇宝阁排序修改,198礼包放到最前面 2020-08-25 20:39:03 +08:00
JieLing abd9e6b65a 好友切磋添加结果显示 2020-08-25 20:28:32 +08:00
JieLing 745150e59a 修复破阵诛仙界面销毁后,再次打开报错,显示异常的问题 2020-08-25 19:48:14 +08:00
JieLing 7c786a4573 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 19:26:58 +08:00
JieLing b28309e14e 资源位置移动 2020-08-25 19:26:51 +08:00
zhangqiang 2ea0c63999 日常副本 2020-08-25 18:39:57 +08:00
ZhangBiao d37af43f37 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:35:19 +08:00
ZhangBiao 617cb53270 森罗回春散星星、升级礼包调整 2020-08-25 18:35:04 +08:00
altair ae760879c5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:33:38 +08:00
altair a8352e16e0 修改特效预设 2020-08-25 18:33:29 +08:00
zhangqiang f223c0c3e1 副本修改 2020-08-25 18:24:17 +08:00
jiaoyangna ca137cd5a5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:17:20 +08:00
jiaoyangna 13d2a5f81a 装备宝物修改 2020-08-25 18:17:15 +08:00
JieLing 223234f582 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 18:00:42 +08:00
JieLing 5a89f52577 充值商品价格改为按配置显示 2020-08-25 17:59:34 +08:00
JieLing 2eeb381608 登陆界面资源替换 2020-08-25 17:56:55 +08:00
zhangqiang 060cc081bb 修改bug 2020-08-25 17:50:52 +08:00
ZhangBiao e6946944b0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 17:31:16 +08:00
ZhangBiao 58aa9c2dce 每日豪礼 显示升级礼包 资源修改 2020-08-25 17:29:03 +08:00
JieLing 399f033bd6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 16:33:11 +08:00
JieLing 0da90f06a5 添加无敌吸血盾的判断 2020-08-25 16:33:04 +08:00
wangzhenxing 7d11f4b25f 还原之前死亡逻辑 2020-08-25 17:27:48 +09:00
jiaoyangna d1ab290cf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua
2020-08-25 16:26:13 +08:00
jiaoyangna 87cc8867c7 宝物 commit 2020-08-25 16:23:41 +08:00
JieLing 8e9e944279 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-25 16:18:27 +08:00
ZhangBiao c6293a0566 月卡资源替换 2020-08-25 16:09:59 +08:00
wangzhenxing 6eaedb249d 解决 【ID1008832】
【技能】单独两个金翅大鹏,都触发了不灭,应该是先触发不灭的一方失败
2020-08-25 17:09:46 +09:00
jiaoyangna 9aceba1aa2 轩辕宝镜预设提交 2020-08-25 16:59:57 +08:00
JieLing ff27e11daa 修复第五章会导致挂机界面卡死的问题 2020-08-25 16:06:06 +08:00
JieLing f4292f1f08 无极青莲技能效果添加 2020-08-25 15:57:19 +08:00
JieLing 30cb8b37cf 登陆接口添加admin 2020-08-25 15:51:35 +08:00
JieLing 2ef85759a1 无敌盾,眩晕效果添加 2020-08-25 15:49:52 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
zhangqiang 1efd100e31 奖励弹窗路径修改 公会副本选择框修改 2020-08-25 15:39:57 +08:00
zhangqiang 0ba113ddbc 首冲修改提交 2020-08-25 15:25:27 +08:00
zhangqiang f0c1ad1b71 首冲 2020-08-25 15:09:53 +08:00
JieLing 34b2d555b6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 15:01:25 +08:00
JieLing 42a73022ac 连续充值背景体寒 2020-08-25 15:01:02 +08:00
zhangqiang fe44f28958 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FirstRecharge/FirstRechargePanel.prefab
2020-08-25 14:49:13 +08:00
zhangqiang 77706e50cc 首冲有礼加特效 2020-08-25 14:46:57 +08:00
ZhangBiao e3b872d31a 元-》$ 2020-08-25 14:37:28 +08:00
ZhangBiao 1496c5e29a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 13:57:35 +08:00
ZhangBiao 6f6758bf14 元—>$的替换 2020-08-25 13:57:21 +08:00
JieLing 4a7917b6ef Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:53:57 +08:00
JieLing 6c1452fa51 创建角色界面资源修改,修复打包后引导消失的问题 2020-08-25 11:53:25 +08:00
jiaoyangna bfc45c822e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:52:33 +08:00
jiaoyangna 62a0d2f41a 帮助位置修改 2020-08-25 11:52:27 +08:00
ZhangBiao 29457a4ea0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:43:06 +08:00
ZhangBiao b34d02fa47 每日礼包一键购买按钮置灰 2020-08-25 11:42:55 +08:00
jiaoyangna 5c62cc19a7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:38:31 +08:00
jiaoyangna f3aca22b37 commit help_type 2020-08-25 11:38:23 +08:00
jiaoyangna 8d69d04d09 添加帮助 2020-08-25 11:37:48 +08:00
ZhangBiao e9fefa1ea1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:25:54 +08:00
ZhangBiao 51672e6e9a 八日登陆资源替换 2020-08-25 11:25:41 +08:00
JieLing 593530d5d5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:23:10 +08:00
jiaoyangna 8fb4e8cf13 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:22:05 +08:00
jiaoyangna 9ad0593572 qinglong redpoint commit 2020-08-25 11:21:42 +08:00
zhangqiang 1ec1329fdf 公会副本入口提交 2020-08-25 11:18:20 +08:00
JieLing 661e5ba157 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:10:11 +08:00
zhangqiang 714545c75d 魂印效果图替换 修改公会副本 2020-08-25 10:40:13 +08:00
zhangqiang 9b2b85f6b5 关闭sdk数据打点,使用海外sdk时需打开 2020-08-25 10:21:31 +08:00
ZhangBiao 6f182e075a 天宫秘宝 解锁额外奖励文字提示修改,提示”置换玉不足“ 2020-08-25 10:05:15 +08:00
JieLing 6a2ce4b305 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 09:44:23 +08:00
JieLing e0ab42e9c5 删除对files.unity3d的解密处理 2020-08-25 09:44:17 +08:00
JieLing 4aef89ab59 艺术字文件修改 2020-08-24 23:59:37 +08:00
JieLing c14f7c4526 美元资源替换,艺术字体添加, 2020-08-24 23:58:33 +08:00
gaoxin f373453cd2 修复主界面显示有缝隙的问题 2020-08-24 22:06:42 +08:00
ZhangBiao 7ed3549506 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 21:10:14 +08:00
ZhangBiao 1382118441 成就点击进入是青龙 问题修复 2020-08-24 21:09:36 +08:00
zhangqiang a5c401bd34 提交 2020-08-24 20:55:03 +08:00
ZhangBiao 4a80694e19 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
2020-08-24 20:38:44 +08:00
ZhangBiao d02a997cb0 天宫秘宝额外奖励界面 2020-08-24 20:37:41 +08:00
jiaoyangna 7ef2347d47 【破阵诛仙/超值基金】主城入口计时,够一天显示天,小于一天应该显示时分秒 2020-08-24 20:15:18 +08:00
jiaoyangna ccb38eb3a7 qinglong commit 2020-08-24 20:10:52 +08:00
jiaoyangna 1ad1aaa2d4 qinglong update 2020-08-24 19:45:18 +08:00
jiaoyangna 1a72381fad qinglong update 2020-08-24 19:37:58 +08:00
JieLing 37a152d311 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 19:09:45 +08:00
JieLing 45c39f3ce8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 18:38:16 +08:00
JieLing 0c3c78e3a7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 18:21:14 +08:00
gaoxin d21f6f215d 修复进入战斗报错的问题 2020-08-24 18:20:54 +08:00
JieLing 28cc0fde3e 修复sdk事件系统,未初始化数据的问题 2020-08-24 18:01:58 +08:00
JieLing 516cb2d318 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 18:01:13 +08:00
gaoxin 185a4b3d75 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 17:57:08 +08:00
gaoxin 06e3fb5de7 国内版本支付参数上传 2020-08-24 17:56:55 +08:00
wangzhenxing f007e185f8 116效果添加注释 2020-08-24 18:55:07 +09:00
ZhangBiao b463deccca Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 18:51:29 +08:00
ZhangBiao 76f5a343eb 云梦祈福入口时间、青龙秘宝时间显示 2020-08-24 18:51:05 +08:00
zhangqiang 8f5d7c7783 副本修改 2020-08-24 18:41:14 +08:00
ZhangBiao 23ebaf5756 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 18:24:53 +08:00
ZhangBiao 52195c17ea 天宫秘宝标题修改 2020-08-24 18:24:42 +08:00
jiaoyangna 0a416d68d0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua
2020-08-24 17:46:31 +08:00
gaoxin 0804789e68 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 17:43:33 +08:00
gaoxin d4530f6ccf 修复新人物资源导致的报错 2020-08-24 17:43:28 +08:00
jiaoyangna f484789ac5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 17:36:22 +08:00
jiaoyangna a162238af0 commit spine 2020-08-24 17:35:41 +08:00
wangzhenxing c38fdf9784 珍奇宝阁排序修改 2020-08-24 18:29:18 +09:00
gaoxin b1f7318f11 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 17:18:36 +08:00
gaoxin 02c213aca8 挂机地图新增 2020-08-24 17:17:21 +08:00
ZhangBiao ec6cf58003 天尊降世入口资源替换 2020-08-24 17:04:45 +08:00
JieLing 4496fa67a6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 16:56:52 +08:00
jiaoyangna 68e88e0f0d commit spine 2020-08-24 16:49:20 +08:00
jiaoyangna 122c86444a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 16:44:11 +08:00
jiaoyangna d1e4f04b21 spine commit 2020-08-24 16:43:48 +08:00
gaoxin 65aeee839d 战斗背景图修改 2020-08-24 16:34:35 +08:00
zhangqiang 3a209ba629 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 16:31:34 +08:00
JieLing e35c45a515 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 16:31:09 +08:00
zhangqiang b36ebe510c 修改宝物分解 2020-08-24 16:29:27 +08:00
jiaoyangna ecd7717cf1 commit spine 2020-08-24 16:26:05 +08:00
wangzhenxing ff791bb871 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 17:18:34 +09:00
wangzhenxing 46df2e7418 添加116效果 2020-08-24 17:16:43 +09:00
jiaoyangna e67934ca50 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 16:08:50 +08:00
jiaoyangna f05c6094b5 恭送英雄宝物修改提交 2020-08-24 16:08:03 +08:00
ZhangBiao 4b59561b3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta
2020-08-24 16:08:01 +08:00
ZhangBiao 6013365ad1 剑影仙踪特效更新 2020-08-24 16:07:08 +08:00
gaoxin d7c34ec63d 创建角色界面立绘位置调整 2020-08-24 16:03:21 +08:00
JieLing b82e9ec3ef jar包资源删除 2020-08-24 15:50:58 +08:00
gaoxin 85b5641162 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 15:46:11 +08:00
jiaoyangna 6e5cb7d922 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 15:41:03 +08:00