Commit Graph

944 Commits (bdb9eeba2dab0f3627bdefdb50ca6dcd27f836f9)

Author SHA1 Message Date
zhangqiang b93d7d0435 提交 2020-10-15 15:43:35 +08:00
yuanshuai faff35373b 预设提交 2020-10-15 14:28:27 +08:00
jiaoyangna e12a075e2c bosstij 2020-10-15 14:16:57 +08:00
zhangqiang eaf610e9c2 提交 2020-10-14 19:41:33 +08:00
zhangqiang b37b584d68 提交 2020-10-14 17:10:36 +08:00
ZhangBiao 74b9f4ec3a Merge branch 'master_develop' into 0活动开发聚集地/社稷大典
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
2020-10-14 14:39:04 +08:00
ZhangBiao f45e820dad Merge branch 'master_develop' into 0活动开发聚集地/社稷大典 2020-10-14 14:03:57 +08:00
jiaoyangna aa4c2a3f9c 势不可挡 提交 2020-10-13 20:36:01 +08:00
zhangqiang c939bab156 提交 2020-10-13 19:14:34 +08:00
zhangqiang f28501a893 提交 2020-10-13 16:32:50 +08:00
ZhangBiao 3b19043f34 森罗幻境 炸弹使用描述修改 2020-10-13 14:00:41 +08:00
zhangqiang bf2804f080 提交 2020-10-13 13:56:41 +08:00
jiaoyangna bd99b9c1ec 限时兑换层级错误修改 2020-10-12 18:30:14 +08:00
jiaoyangna 864535ca9b Merge branch 'master_devlop_ys' of http://60.1.1.230/gaoxin/JL_Client into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua
2020-10-11 11:11:49 +08:00
yuanshuai 8487c445a3 逍遥游资源预设脚本提交 2020-10-15 10:53:00 +08:00
jiaoyangna db5dbbf700 boss 提交 2020-10-11 11:10:07 +08:00
jiaoyangna 5bf0f64989 boss 和 转盘数据 提交 2020-10-11 09:40:22 +08:00
jiaoyangna ba75aab424 仙缘事件界面提交 2020-10-10 19:18:27 +08:00
yuanshuai 57c7fd0890 逍遥游脚本资源预设提交 2020-10-14 16:57:35 +08:00
jiaoyangna a2cd90016f Merge branch 'master_develop' into master_devlop_ys
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-10 15:07:52 +08:00
zhangqiang d2f9ffd2db 线上活动 森罗幻境达人前端显示 2020-10-10 14:51:50 +08:00
jiaoyangna 85dbe2d053 主题活动修改 2020-10-10 14:37:04 +08:00
ZhangBiao a40150c3cd 通用排名奖励界面创建 2020-10-10 11:54:13 +08:00
ZhangBiao 46edb1a00c 中心部分点击领取奖励 2020-10-09 19:38:15 +08:00
ZhangBiao 533dc2a8fd 修改了图片下方显示,下一步增加长按 2020-10-09 17:11:02 +08:00
ZhangBiao 927cc43b0d 社稷大典代码完善提交v1 2020-10-09 14:59:14 +08:00
ZhangBiao 1112953786 社稷大典 2020-10-09 09:30:02 +08:00
jiaoyangna 5e97e20e57 十绝阵特效修改 2020-09-30 17:10:58 +08:00
yuanshuai f4879ab650 逍遥游地图相关预设脚本修改 2020-09-29 18:19:15 +08:00
ZhangBiao d15da5d1e7 主题活动预设修改 2020-09-29 15:59:16 +08:00
ZhangBiao f0ccc8caf5 丹心碧血 预设提交 2020-09-29 15:54:26 +08:00
ZhangBiao 71cd037aa4 Merge branch 'master_develop' into 0活动开发聚集地/社稷大典 2020-09-29 15:52:38 +08:00
ZhangBiao 6524be790b 设计大点界面 2020-09-29 15:51:25 +08:00
wangzhenxing ed1d0e6150 灵兽修改提交 2020-09-29 16:13:06 +09:00
zhangqiang ef70664094 适配 2020-09-28 16:57:03 +08:00
yuanshuai 42d8a70a24 逍遥游地图界面提交 2020-09-28 16:30:52 +08:00
zhangqiang cccab99a11 灵兽提交 2020-09-28 11:22:47 +08:00
ZhangBiao 22832d895e 社稷大典 2020-09-27 16:00:15 +08:00
zhangqiang 0a3f59befa 灵兽提交 2020-09-27 11:46:09 +08:00
ZhangBiao d527c81d11 2020-09-27 10:15:05 +08:00
gaoxin 96ac81c098 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-27 13:33:39 +08:00
gaoxin 525e229273 部分界面头像特效添加 2020-09-27 13:33:10 +08:00
zhangqiang 637d910b5c 灵 受 2020-09-25 18:41:07 +08:00
ZhangBiao 5b47c9c889 虚位以待字体颜色修改 2020-09-25 18:16:37 +08:00
ZhangBiao af8e68da78 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-02 00:18:39 +08:00
ZhangBiao 90cab5221d 三界降魔 2020-10-02 00:18:17 +08:00
yuanshuai 9a5846943a 逍遥游入口界面预设脚本提交 2020-09-25 17:02:38 +08:00
jiaoyangna af8b461b50 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-10 16:39:53 +08:00
jiaoyangna de81143689 积天豪礼修改 2020-10-10 16:39:30 +08:00
ZhangBiao 9b9c094f3b Merge branch '0活动开发聚集地/三界除魔' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2020-09-25 15:28:37 +08:00
ZhangBiao bec9ecf6d3 三界降魔 2020-09-25 15:24:59 +08:00
jiaoyangna cae421024a 积天豪礼添加动画 2020-09-25 14:59:05 +08:00
zhangqiang f40b2050ad 灵兽培养部分初始脚本 2020-09-25 14:48:10 +08:00
wangzhenxing 3bf0fbc623 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-09-25 11:46:12 +09:00
zhangqiang d485681b07 灵兽出战界面预设提交 2020-09-25 11:40:57 +08:00
wangzhenxing e92fb73587 灵兽逻辑提交 2020-09-25 11:45:43 +09:00
ZhangBiao e98973ff5a 三界降魔 2020-09-24 20:47:16 +08:00
gaoxin 69563a13c7 每日一键购买礼包金额显示添加 2020-09-24 20:25:27 +08:00
gaoxin 142d8ccf0e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 19:16:43 +08:00
gaoxin 293a4baaa5 优化挂机时长特权显示,涉及表:PrivilegeTypeConfig 2020-09-24 19:16:38 +08:00
jiaoyangna d600c57b0f 【挂机宝箱优化】挂机宝箱上显示当前挂机时长,精确到分 2020-09-24 17:55:36 +08:00
jiaoyangna c9c943da32 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-24 17:53:53 +08:00
jiaoyangna bfc32b4541 百宝商会时间修改 2020-09-24 17:53:48 +08:00
zhangqiang 65e5b41dee 竞技场排序 车迟抢夺排序 试炼节点缩小 2020-09-24 17:15:57 +08:00
ZhangBiao 665a5483eb 三界降魔 2020-09-24 17:07:12 +08:00
ZhangBiao 551dcaa01d 三界降魔 2020-09-23 20:27:29 +08:00
jiaoyangna 4389beca87 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-23 16:56:53 +08:00
jiaoyangna 2269c50897 【活动需求】百宝商会,免费礼包红点 2020-09-23 16:56:06 +08:00
zhangqiang 5f8b1027ee 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-23 14:51:33 +08:00
zhangqiang 6a5eb99853 灵兽资源提交 2020-09-21 11:01:49 +08:00
jiaoyangna cfd1f8d51b 添加动画 2020-09-18 13:43:52 +08:00
ZhangBiao 5cd8e621dc 限时活动,限时兑换、礼包抢购增加动效 2020-09-16 14:09:31 +08:00
ZhangBiao 60172f3089 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-16 10:52:16 +08:00
ZhangBiao 13fff17277 在线奖励一键领取 2020-09-16 10:52:09 +08:00
jiaoyangna 35c5de3561 适配修改提交 2020-09-18 18:34:02 +08:00
jiaoyangna 3d5ebd7f61 送神祠修改提交 2020-09-15 17:42:32 +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
jiaoyangna aacf1d029d 【十绝阵】敌人编队卡牌应使用无血条版本的边框 2020-09-15 14:47:15 +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
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
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
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 e7918aa3dc 排行榜适配 2020-09-22 14:51:27 +08:00
zhangqiang 078906049f 巅峰战适配 2020-09-22 13:59:11 +08:00
jiaoyangna 6a47476673 公会副本 添加动画 2020-09-12 15:24:20 +08:00
jiaoyangna 68b1628c8c 破阵诛仙 2020-09-11 17:48:55 +08:00
jiaoyangna b0280552a1 chichafengyun icon 提交,开服福利添加动画 2020-09-11 11:47:55 +08:00
ZhangBiao 70c535e1d8 限时兑换 奖励错误修改 2020-09-11 11:04:04 +08:00
jiaoyangna 8b8e390a8a 邮件添加动画 2020-09-10 18:40:22 +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 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
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
gaoxin bccc1204e7 兑换码功能开启 2020-09-10 14:28:28 +08:00
jiaoyangna 3e5e41b8ff 破阵诛仙提交 2020-09-10 13:40:07 +08:00
ZhangBiao e557130da8 十绝阵奖励偏移修改 2020-09-09 17:57:54 +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 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
jiaoyangna fb9b646553 限时召唤提交 2020-09-08 16:57:19 +08:00
gaoxin 37316136f1 剧情添加转场效果 2020-09-08 15:31:38 +08:00
gaoxin b65581fe71 引导战斗添加 2020-09-08 11:58:34 +08:00
jiaoyangna 53524225f9 动画添加提交 2020-09-08 10:09:21 +08:00
gaoxin 32b8705ab1 引导战斗流程添加 2020-09-07 18:25:31 +08:00
zhangqiang 604de656df 巅峰赛战斗结束界面适配 2020-09-07 15:39:57 +08:00
gaoxin a46ee1c52c 修复引导急速探索报错的问题 2020-09-07 15:26:37 +08:00
zhangqiang 5a917b1374 巅峰赛详情适配 2020-09-07 15:02:16 +08:00
gaoxin 06afe99236 宽屏边缘用图片代替黑边 2020-09-05 19:02:20 +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
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
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 5a861862d5 商店添加动画 2020-09-04 16:54:58 +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
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 8232879006 车迟排名界面调整、日常本底部适配、万象境“新”字bug修复 2020-09-04 14:30:39 +08:00
zhangqiang 1c59eb5ff4 编队提示文字适配 2020-09-04 11:33:33 +08:00
ZhangBiao ca036d6d0a 天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验 2020-09-03 18:16:20 +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
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
zhangqiang 2612f04dc4 shipei 2020-09-03 16:24:04 +08:00
zhangqiang 2f32484379 shipei 2020-09-03 16:19:13 +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
zhangqiang b6c47a3762 当车迟抢夺编队为空时前端直接弹结果 2020-09-03 15:58:00 +08:00
ZhangBiao e9e6378995 general_bomb 适配调整 2020-09-03 14:07:02 +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
ZhangBiao c3b0f590d2 好友增加一键领取红点 2020-09-03 10:50:25 +08:00
gaoxin 6e400a4db1 屏幕适配提交 2020-09-02 22:29:33 +08:00
gaoxin 315c9b864a 屏幕适配 2020-09-02 20:46:21 +08:00
gaoxin b3dab63ca4 屏幕适配修改 2020-09-02 20:27:21 +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 2b33e3859b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-02 18:07:44 +08:00
jiaoyangna b7abe8edd6 hero compound 2020-09-02 18:07:20 +08:00
zhangqiang ef1b812ebd shipei 2020-09-02 18:02:52 +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 e415076e53 主界面适配资源替换 2020-09-02 17:04:44 +08:00
gaoxin 3104734cfe Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-02 16:46:47 +08:00
gaoxin ae1ed4b001 月卡界面屏幕适配修改, 2020-09-02 16:46:38 +08:00
zhangqiang 88456863c2 shipei 2020-09-02 16:44:04 +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
zhangqiang 939e9b3c77 shi pei 2020-09-02 15:54:28 +08:00
gaoxin 1f3ba7abf7 充值,首充,幸运探宝界面适配修改 2020-09-02 14:44:07 +08:00
gaoxin 8c8697d31d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-02 14:19:20 +08:00
gaoxin 7563aad66f 活动界面适配调整 2020-09-02 14:19:10 +08:00
zhangqiang aeb70ab707 dainfengsai 2020-09-02 14:16:06 +08:00
zhangqiang 1908ce2ee8 破阵诛仙 2020-09-02 14:07:57 +08:00
zhangqiang 9d757ba068 适配 2020-09-02 13:45:14 +08:00
ZhangBiao 39e9728561 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
2020-09-02 13:36:17 +08:00
jiaoyangna 8b60b15dd6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:31:07 +08:00
jiaoyangna 8d11549d86 大闹天宫红点修改 2020-09-09 10:30:39 +08:00
jiaoyangna 730c2719a5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-09 10:11:52 +08:00
jiaoyangna 8d19f5c583 prefab commit 2020-09-09 10:11:47 +08:00
ZhangBiao e3e95e2379 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
gaoxin 13ab0dc54f 小弹窗界面屏幕适配修改 2020-09-02 10:29:55 +08:00
zhangqiang e845bc5fe1 车迟 十绝阵 英雄详情 适配 2020-09-02 09:49:17 +08:00
zhangqiang e5dd48c072 shipei 2020-09-01 19:53:59 +08:00
jiaoyangna 933aadbf65 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-01 18:36:18 +08:00
jiaoyangna 00b75cc097 prefab commit 2020-09-01 18:36:14 +08:00
zhangqiang f68a1b868a 四元阵 抽卡 兽潮主 2020-09-01 17:35:10 +08:00
gaoxin 68f9b89773 loadingpanel界面适配调整 2020-09-01 17:13:30 +08:00
gaoxin 97eaf77009 主界面底部界面经验条显示调整 2020-09-01 17:12:00 +08:00
gaoxin eeecbca77a 部分界面适配调整 2020-09-01 16:56:45 +08:00
zhangqiang c4bc262356 图鉴 编队 开服 2020-09-01 16:54:07 +08:00
gaoxin ad887c2b7f 添加全屏显示的ui父节点,并将所有弹窗都放入该节点 2020-09-01 16:10:36 +08:00
ZhangBiao 4dbbdbd54b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-01 14:53:42 +08:00
ZhangBiao 822f4a2294 森罗界面适配 2020-09-01 14:53:12 +08:00
gaoxin c6bdebeffb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
2020-09-01 14:38:29 +08:00
gaoxin ae349123df 部分界面屏幕适配调整 2020-09-01 14:38:02 +08:00
zhangqiang aabef68ccb 气泡提交 2020-09-01 11:50:24 +08:00
ZhangBiao e74c120d01 大闹天宫重置红点、无尽副本界面红点 2020-09-01 11:25:38 +08:00
zhangqiang fc2fd03f44 线上问题 : 工会宣言两处遮挡问题 2020-09-24 14:29:41 +08:00
zhangqiang 1e9443b288 线上问题 : 提示挑战关卡升级被聊天遮挡 2020-09-24 12:53:39 +08:00
zhangqiang a6fa4453e6 需求主城或关卡停留过长添加聊天气泡 2020-08-31 20:52:50 +08:00
zhangqiang 70a17dc502 法宝添加红点提示 2020-08-31 19:47:57 +08:00
zhangqiang 40610b0c19 献祭修改 2020-08-31 18:19:38 +08:00
ZhangBiao 50dd63cd06 小游戏18按钮大小调整,前往下一层文字大小修改、 2020-08-31 16:06:57 +08:00
ZhangBiao b5ac787e16 数独小游戏15 1:2屏幕适配错误修复
购买回春散数量不增加修改
2020-08-31 15:45:16 +08:00
gaoxin fc9a5341f0 屏幕适配方式改为按高度适配,修复点击特效位置错误的问题 2020-08-29 17:22:46 +08:00
jiaoyangna 628039ab92 prefab commit 2020-08-29 16:35:20 +08:00
jiaoyangna 638022dbad 【五星成长礼】拍脸图中间“战”字有阴影 2020-08-29 15:17:48 +08:00
jiaoyangna dd1493ee90 【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框 2020-08-29 15:14:09 +08:00
ZhangBiao 01fc7cae51 森罗幻境奖励红点 2020-08-28 13:48:09 +08:00
gaoxin c933276cea 试炼增益添加滑动效果 2020-08-28 00:24:06 +08:00
gaoxin 82606d8fbe 每日周月礼包根据后端数据判断显隐 2020-08-27 18:35:32 +08:00
ZhangBiao 82ec03a605 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:16:02 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
gaoxin 1ce0e4b15c 战斗怒气文字修改 2020-08-27 17:26:55 +08:00
jiaoyangna 09f27f8d3d des update 2020-08-27 16:16:08 +08:00
jiaoyangna 104311a51a prefab commit 2020-08-27 16:07:03 +08:00
jiaoyangna ca618e9f33 add xuanyuan des 2020-08-27 16:05:46 +08:00
jiaoyangna 19465ac1b2 【宝物】共鸣界面等级上限显示不正确 2020-08-27 12:01:01 +08:00
zhangqiang c315cf768d 竞技场排行 2020-08-27 10:52:35 +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 4b41b5def9 副本界面显示优化 2020-08-26 20:20:40 +08:00
ZhangBiao 134b70ce33 成长礼包美元符号位置 2020-08-26 19:08:21 +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 bab4148db6 主界面十绝阵,巅峰赛按钮添加 2020-08-26 17:58:23 +08:00
ZhangBiao 8dd4feeead 乾坤宝囊特效增加 2020-08-26 17:56:59 +08:00
zhangqiang 1b8f1631b7 巅峰战八强替换资源 2020-08-26 16:43:07 +08:00
jiaoyangna 22fa2b0d4c qinglong commit 2020-08-26 15:57:06 +08:00
gaoxin 9ff8dbf943 我要变强界面匹配当前版本修改 2020-08-26 15:16:17 +08:00
JieLing ad7bd17a38 修复八日登陆扫光错误的问题 2020-08-26 13:53:39 +08:00
JieLing c23947edcd 艺术字体优化 2020-08-26 13:35:33 +08:00
gaoxin b0222ccd61 艺术字体替换,美元显示优化 2020-08-26 12:26:19 +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
jiaoyangna 59204790d2 xuanyuan commit 2020-08-26 10:58:41 +08:00
JieLing b1774c3853 累充界面金额转换为美元显示 2020-08-25 21:21:34 +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
zhangqiang f223c0c3e1 副本修改 2020-08-25 18:24:17 +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 2eeb381608 登陆界面资源替换 2020-08-25 17:56:55 +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
ZhangBiao c6293a0566 月卡资源替换 2020-08-25 16:09:59 +08:00
jiaoyangna 9aceba1aa2 轩辕宝镜预设提交 2020-08-25 16:59:57 +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
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 6407abc8c9 【社稷大典】提交8 漏题补 2020-10-26 11:53:53 +08:00
ZhangBiao 0bf6e05add 【社稷大典】提交6 2020-10-24 18:58:07 +08:00
ZhangBiao a2a870f421 【社稷大典】提交4 2020-10-24 18:41:21 +08:00
ZhangBiao a62dc62ead 【社稷大典】提交 2020-10-24 18:20:43 +08:00
yuanshuai 3b10d60477 自动游历功能屏蔽 2020-10-20 16:25:14 +08:00
yuanshuai 885de6fe9b 逍遙游自动游历开启 相关脚本资源提交 2020-10-20 16:17:13 +08:00
JieLing 94b5898ba0 【逍遥游】优化奖励界面显示 2020-10-20 02:21:32 +08:00
JieLing bb2b8b1818 【竞技场】修复奖励界面打不开的问题 2020-10-20 01:56:42 +08:00
jiaoyangna d39c078888 xiaoyao commit 2020-10-19 23:37:24 +08:00
yuanshuai 0d4fd1a210 骰子动画添加提交 2020-10-19 22:56:56 +08:00
ZhangBiao a40b0dab17 逍遥游 commit 2020-10-19 22:38:57 +08:00
ZhangBiao 021692dc42 逍遥commit 2020-10-19 22:36:43 +08:00
yuanshuai a19942820e 自动游历功能屏蔽 2020-10-19 21:40:53 +08:00
yuanshuai 3b8317a897 逍遥游红点提交 2020-10-19 21:40:48 +08:00
yuanshuai 131d1aab1b 【逍遥游】红点和帮助弹窗提交 2020-10-19 21:39:48 +08:00
gaoxin 19135670ce Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2020-10-19 20:40:14 +08:00
gaoxin 364c9c99fc 【逍遥游】功能合并到local分支 2020-10-19 20:37:53 +08:00
ZhangBiao 56f5856a71 宝箱个数减负 2020-10-19 20:10:53 +08:00
ZhangBiao 4c5065ccf7 竞技场界面修改 2020-10-19 18:52:36 +08:00
ZhangBiao 09c3da664e 通用奖励界面 设计大典->竞技场界面修改 2020-10-19 13:54:08 +08:00
ZhangBiao bae7d6550e 竞技场界面修改 2020-10-16 19:36:21 +08:00
jiaoyangna 9706c45942 主题活动修改 2020-10-10 16:15:27 +08:00
jiaoyangna aa9878a1f2 势不可挡 提交 2020-10-10 16:14:18 +08:00
jiaoyangna 04e6526819 神州令修改提交 2020-10-15 21:48:41 +08:00
ZhangBiao 2469c75f90 森罗幻境 炸弹使用描述修改
(cherry picked from commit 3b19043f34)
(cherry picked from commit 677dca14e7)
2020-10-13 14:01:47 +08:00
zhangqiang f2d3f045aa 森罗幻境提交1 2020-10-12 14:46:05 +08:00
ZhangBiao 2e45c0cd83 主题活动预设修改 2020-10-15 14:05:24 +08:00
zhangqiang fc45eaf562 四元阵单抽卡适配 2020-09-28 17:53:46 +08:00
jiaoyangna 6f0b87c858 轩辕适配修改,文字颜色修改 2020-09-28 16:56:22 +08:00
JieLing 170b706504 修复引导商店报错 2020-09-28 11:13:11 +08:00
JieLing 823ae72aec 修复0元礼包无法购买的问题,修复引导合成碎片卡死 2020-09-28 10:27:06 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
JieLing c3cce0b06e 百宝商会活动添加 2020-09-27 16:52:40 +08:00
ZhangBiao def3e829ff 三界降魔 2020-09-27 16:44:39 +08:00
ZhangBiao 97f9b8f671 遴选三界除魔 2020-09-27 16:44:31 +08:00
ZhangBiao d601794a17 三界降魔 2020-09-27 16:43:49 +08:00
ZhangBiao e9b994126e 三界降魔 2020-09-27 16:43:42 +08:00
ZhangBiao c4706208ef 三界除魔功能添加 2020-09-27 16:43:33 +08:00
gaoxin 5b7e3c7a9b 每日一键购买礼包金额显示添加 2020-09-27 16:15:46 +08:00
zhangqiang bd6fdce461 遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-27 16:12:21 +08:00
gaoxin 7b7def3f8f 勇冠三军,叱咤风云活动添加 2020-09-27 16:09:55 +08:00
ZhangBiao e3b387b8af 十绝阵奖励偏移修改 2020-09-22 17:39:14 +08:00
JieLing d440edea11 打开兑换码功能 2020-09-09 20:12:11 +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 62a0d2f41a 帮助位置修改 2020-08-25 11:52:27 +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
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
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
gaoxin f373453cd2 修复主界面显示有缝隙的问题 2020-08-24 22:06:42 +08:00
zhangqiang a5c401bd34 提交 2020-08-24 20:55:03 +08:00
jiaoyangna ccb38eb3a7 qinglong commit 2020-08-24 20:10:52 +08: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 52195c17ea 天宫秘宝标题修改 2020-08-24 18:24:42 +08:00
gaoxin d4530f6ccf 修复新人物资源导致的报错 2020-08-24 17:43:28 +08: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
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 395c41ef79 Merge branch 'temp' into master_develop 2020-08-24 14:36:54 +08:00