Commit Graph

4986 Commits (2da1f06bcb3492b3967674c0ab780413c0997b3e)
 

Author SHA1 Message Date
ZhangBiao 2da1f06bcb 【自选宝箱】还是修改
(cherry picked from commit 89c8179840)
2021-04-08 17:49:58 +08:00
ZhangBiao fdbf4d054b 【自选宝箱】
(cherry picked from commit 16db37cf29)
2021-04-08 17:49:52 +08:00
ZhangBiao a49fbd2183 【自选宝箱】文字提示
(cherry picked from commit cb5c940e25)
2021-04-08 17:49:44 +08:00
ZhangBiao f87aafafbc 【自选箱】遮盖文字修改
(cherry picked from commit adc2d56559)
2021-04-08 17:49:34 +08:00
jiaoyangna dd98250771 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-08 17:30:08 +08:00
jiaoyangna d86700277c 【ID1008675】
【图鉴优化】增加神将皮肤预览
2021-04-08 17:30:04 +08:00
jiaoyangna 5740120f53 【ID1008675】
【图鉴优化】增加神将皮肤预览
2021-04-08 17:24:36 +08:00
ZhangBiao c426b948a0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-08 16:39:11 +08:00
ZhangBiao 3833c53f68 【十五日登录、福星高照】修改 2021-04-08 16:39:02 +08:00
jiaoyangna 39144c20c6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-08 14:07:52 +08:00
jiaoyangna c48ec346f8 音频 提交 2021-04-08 14:07:48 +08:00
ZhangBiao bc15cb20f6 【十五日登陆】微调 2021-04-08 11:26:05 +08:00
jiaoyangna ce8ffa9607 充值界面充值跳转月卡页签之后切换其他页签 界面显示错误 修改 2021-04-08 10:50:19 +08:00
ZhangBiao d423390397 【十五日登录】特效+无尽副本编队问题 2021-04-07 20:27:56 +08:00
jiaoyangna 586d7eca06 限时召唤提交 2021-04-07 11:24:49 +08:00
jiaoyangna 034a8290e5 天书秘卷预设修改 2021-04-07 11:12:14 +08:00
jiaoyangna e5699cb8c7 天书秘卷 图片提交 2021-04-07 11:11:44 +08:00
jiaoyangna 2a0589b1d8 天书秘卷修改提交 2021-04-07 10:58:37 +08:00
jiaoyangna f6f48149b1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 17:42:05 +08:00
jiaoyangna 04721fe715 【ID1008672】
【逍遥游优化】解锁上方的地图后,进入选择界面默认滚动至相应的入口位置
2021-04-06 17:42:02 +08:00
ZhangBiao 0387c7cf33 【森罗幻境】根据英雄战力排序 2021-04-06 17:26:59 +08:00
jiaoyangna eac03c7d20 车迟斗法提交 2021-04-06 17:02:25 +08:00
jiaoyangna 0df3ee5ea8 车迟斗法描述修改 2021-04-06 16:50:51 +08:00
jiaoyangna 53d8603044 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 16:44:07 +08:00
jiaoyangna db80db31c2 升星神将显示名字修改 2021-04-06 16:44:04 +08:00
ZhangBiao 1647e05beb 【森罗小游戏】文字位置修改 2021-04-06 16:32:52 +08:00
ZhangBiao 7a59fe9d6a 【十五日登陆】增加红点
(cherry picked from commit 120106c6d0d8957d7e7f0bbce687fafd42a70277)
2021-04-06 16:20:36 +08:00
jiaoyangna 6641fa8814 车迟斗法倒计时 2021-04-06 16:16:52 +08:00
jiaoyangna 0d581ebb97 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 16:14:34 +08:00
ZhangBiao 63bcee6168 Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-04-06 15:51:24 +08:00
jiaoyangna bf4a9ffaa5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 15:20:17 +08:00
jiaoyangna 6e68ac5949 【ID1008671】
【升星优化】升星选择祭品神将时,增加显示内容
2021-04-06 15:20:00 +08:00
zhangqiang 0b85a85e18 【大闹天宫】 间隔阶段重登提示有问题 2021-04-06 15:11:29 +08:00
jiaoyangna 75feb507d1 【ID1008659】
【图鉴优化】图鉴添加排序规则,按照神将由强至弱进行排序
2021-04-06 14:51:26 +08:00
jiaoyangna 9115df155b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 14:43:48 +08:00
jiaoyangna 4244050881 【车迟斗法优化】调整挑战抢夺倒计时的位置、大小和颜色 2021-04-06 14:43:41 +08:00
ZhangBiao 119c499da3 【好友】删除后停留在原位 2021-04-06 14:26:47 +08:00
jiaoyangna fd08211e30 主题活动图标修改 2021-04-06 13:52:27 +08:00
ZhangBiao a862a66cd3 【十五日登录】提交 2021-04-06 12:07:03 +08:00
jiaoyangna b260d2d583 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-06 11:52:48 +08:00
jiaoyangna f1a8a740c7 【ID1008091】
【活动优化】超值基金购买后,主城超值基金入口倒计时消失
2021-04-06 11:52:44 +08:00
zhangqiang a9d77de2b2 【十绝阵】未产生宝箱时显示的领取截止时间错误 2021-04-06 11:38:25 +08:00
ZhangBiao 5ab1295c10 【好友】赠送好友友情点,每点一下都会播放动画 2021-04-06 11:17:22 +08:00
zhangqiang 86a99f3344 【无尽副本】一键上阵修改 2021-04-02 21:11:37 +08:00
gaoxin 0c4e2e5bf6 【bug】修复穿戴头像框时会报错的问题 2021-04-02 21:05:01 +08:00
ZhangBiao 53f095011e 【牛气冲天】特效层级修改
(cherry picked from commit 53308beca2)
(cherry picked from commit 672b5acd10caeca26906c4c9ddfb840fd3b121df)
2021-04-02 19:29:39 +08:00
ZhangBiao 53308beca2 【牛气冲天】特效层级修改 2021-04-02 19:27:35 +08:00
ZhangBiao d99899d37f 【十五日登陆】 2021-04-02 19:06:08 +08:00
jiaoyangna 3b229cd8fc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 17:13:29 +08:00
jiaoyangna 1b4807a144 itemview 关闭时设为true 2021-04-02 17:13:26 +08:00