Commit Graph

2107 Commits (c3b0f590d2255de9f02c4aea9849b3b485f6a9bb)
 

Author SHA1 Message Date
jiaoyangna d9e3cfe729 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-07 16:09:34 +08:00
jiaoyangna 0ab3d69773 青龙秘宝试炼排序提交 2020-09-07 16:09:29 +08:00
jiaoyangna c981f24ed0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-09-07 15:50:50 +08:00
jiaoyangna 4069c41f74 日常副本添加咸鱼积分奖励 2020-09-07 15:50:46 +08:00
ZhangBiao 40266d1120 删除一些log、修复升级豪礼红点bug 2020-08-31 16:32:27 +08:00
ZhangBiao a9098b6bc7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 16:07:04 +08:00
ZhangBiao 50dd63cd06 小游戏18按钮大小调整,前往下一层文字大小修改、 2020-08-31 16:06:57 +08:00
zhangqiang 946aaa36ea 处理神将归元 无尽和大闹天宫一级上阵问题 神将置换大闹天宫编队没血量问题 2020-08-31 15:54:12 +08:00
ZhangBiao 6e4d4e3dc7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 15:45:27 +08:00
ZhangBiao b5ac787e16 数独小游戏15 1:2屏幕适配错误修复
购买回春散数量不增加修改
2020-08-31 15:45:16 +08:00
gongjiawei c0c06f80a2 音频更新 2020-08-31 15:33:43 +08:00
ZhangBiao c7a290e605 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 15:22:28 +08:00
ZhangBiao 9bbe08043a 八日登陆刷新时间从24改道5 2020-08-31 15:22:22 +08:00
jiaoyangna 6d4e5dd390 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 15:01:25 +08:00
jiaoyangna 2bf39b8a9c 副本红点提交 2020-08-31 15:01:20 +08:00
gongjiawei de87fdacc5 音频更新 2020-08-31 15:00:43 +08:00
ZhangBiao d1e0e6e133 升级豪礼红点显示错误修复 2020-08-31 14:35:35 +08:00
jiaoyangna c73406ca13 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 13:58:52 +08:00
ZhangBiao b1f95890d3 天尊降世 领取顺序bug修复 2020-08-31 13:58:49 +08:00
jiaoyangna 366343b72b 副本红点修改提交 2020-08-31 13:58:47 +08:00
gongjiawei f4cae94b1e 音频更新 2020-08-31 12:05:52 +08:00
zhangqiang e75adfa009 图鉴添加天赋属性 2020-08-31 11:49:35 +08:00
zhangqiang daf0f8bca7 装备界面战力计算修改 2020-08-31 11:03:16 +08:00
jiaoyangna 9fd56a684d 去除宝箱黑色框 2020-08-31 10:40:23 +08:00
jiaoyangna 7576f7dd88 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-31 10:40:01 +08:00
jiaoyangna 0806d1d497 在副本未开启时不显示红点 2020-08-31 10:39:56 +08:00
gongjiawei 492a1edc94 木吒语音替换 音频混音调整 2020-08-31 10:11:39 +08:00
gaoxin 30ff681aca 删除无用视频资源 2020-08-29 17:41:04 +08:00
gaoxin fc9a5341f0 屏幕适配方式改为按高度适配,修复点击特效位置错误的问题 2020-08-29 17:22:46 +08:00
gaoxin a0535ffc12 lujit添加对64位代码的支持 2020-08-29 15:11:01 +08:00
gongjiawei e7f1782d40 音频更新 2020-08-28 18:39:56 +08:00
ZhangBiao bd810de402 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 18:37:24 +08:00
ZhangBiao a2c8352e29 装备文字过长、仙缘宝箱优化、充值妖晶提示问题 2020-08-28 18:37:16 +08:00
gongjiawei d3e27291d4 音频更新 2020-08-28 18:04:43 +08:00
jiaoyangna 6436392c8e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-29 17:36:42 +08:00
jiaoyangna 93602b9cfb commit 2020-08-29 17:36:28 +08:00
jiaoyangna 4e74194195 【优化】图鉴,选中阵营页签后,查看神将信息,点击返回,应该固定在之前选中的页签上 2020-08-29 17:35:49 +08:00
ZhangBiao de119179ca Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 17:29:52 +08:00
ZhangBiao a99aa6ef6e 还是红点检测 2020-08-28 17:29:38 +08:00
jiaoyangna 53cca0033b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-29 16:36:39 +08:00
jiaoyangna cbc73fd654 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-29 16:35:29 +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
gongjiawei 68cb69490b 音频更新 2020-08-28 17:25:12 +08:00
gongjiawei edc0193ab6 音频更新 2020-08-28 16:37:53 +08:00
ZhangBiao ccbf29ecf2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 16:35:17 +08:00
ZhangBiao 0c3b0e6326 车迟斗法副本界面红点 2020-08-28 16:35:08 +08:00
gaoxin b35000e14f 修复updatepanel进度条不显示的问题 2020-08-28 15:36:57 +08:00
gaoxin 02ec865150 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-28 15:30:02 +08:00