Commit Graph

845 Commits (6a2ce4b305eacdbc878f05ab42c82f2bc1492ad0)

Author SHA1 Message Date
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 c14f7c4526 美元资源替换,艺术字体添加, 2020-08-24 23:58:33 +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
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
gaoxin d21f6f215d 修复进入战斗报错的问题 2020-08-24 18:20:54 +08:00
gaoxin 06e3fb5de7 国内版本支付参数上传 2020-08-24 17:56:55 +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
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
jiaoyangna 68e88e0f0d commit spine 2020-08-24 16:49:20 +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
zhangqiang b36ebe510c 修改宝物分解 2020-08-24 16:29:27 +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
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
jiaoyangna d7258b7fa5 一键装备提交 2020-08-24 15:40:58 +08:00
gaoxin e806410e8a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-24 15:25:23 +08:00
ZhangBiao 36d96dcd84 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 15:20:13 +08:00
ZhangBiao 939fa0227a 无尽入口例会、化虚进入修复、剪影仙踪 2020-08-24 15:20:00 +08:00
jiaoyangna 7c069c390d 一键装备报错修改 2020-08-24 15:08:21 +08:00
gaoxin 2abfd842cf Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 15:01:26 +08:00
gaoxin 395c41ef79 Merge branch 'temp' into master_develop 2020-08-24 14:36:54 +08:00
gaoxin 74951cedd8 修复登录界面错误,修复战斗背景音乐缺失的问题 2020-08-24 14:35:45 +08:00
jiaoyangna af58044b17 【宝物】宝物合成,合成预览和恭喜获得不一致 2020-08-24 14:31:44 +08:00
jiaoyangna 264bf8d4f0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 14:01:25 +08:00
jiaoyangna 80a7f569f7 qinglong commit 2020-08-24 14:00:15 +08:00
zhangqiang 1949d1148f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-24 13:59:22 +08:00
zhangqiang 6deae3c54c 公会副本次数修改 送神祠修改bug 2020-08-24 13:59:08 +08:00
jiaoyangna a58f779771 【送神祠】卡牌归元和分解 背景图片串了 2020-08-24 10:38:58 +08:00