Commit Graph

6925 Commits (8614a86275ccac115c3cac9f3d84be3a575030d6)
 

Author SHA1 Message Date
JieLing 8614a86275 Merge branch 'china/local' into china/test 2021-06-08 14:51:19 +08:00
JieLing 1de14aac24 Merge branch 'china/dev' into china/local 2021-06-08 14:50:05 +08:00
JieLing a3f87bb3e2 【包配置】删除对称号特效的配置 2021-06-08 14:32:21 +08:00
jiaoyangna 8df928f686 【ID1016261】
【灵兽宝阁】灵兽宝阁白泽假战斗结束报错
2021-06-08 14:29:58 +08:00
gaoxin edd8c055cb 【称号】显示再优化,老包也能正常显示 2021-06-08 14:17:31 +08:00
gaoxin 638b6e6d3b 【称号】优化称号在老包中的显示 2021-06-08 14:17:20 +08:00
gaoxin 22fc263d5b 【特效】修复新称号特效显示错误 2021-06-08 14:17:13 +08:00
JieLing 197f661868 Merge branch 'china/local' into china/test 2021-06-07 14:25:23 +08:00
JieLing 607da17ceb Merge branch 'china/dev' into china/local
# Conflicts:
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-06-07 14:18:09 +08:00
ZhangBiao 1cfcd3346c Revert "【右上角活动】红点修改"
This reverts commit bbfcdf16e6.
2021-06-07 13:45:48 +08:00
ZhangBiao bbfcdf16e6 【右上角活动】红点修改
(cherry picked from commit 6c31fa860d)
2021-06-07 13:39:57 +08:00
gaoxin a0c63bd443 Merge branch 'china/special' into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/UIManager.lua
2021-06-07 11:05:05 +08:00
JieLing 8d233c01eb 【禁言功能】 2021-06-07 10:57:05 +08:00
gaoxin 65b62e7116 【meta】 2021-06-04 22:34:10 +08:00
gaoxin 70d78be2f6 【更新界面】修改背景图的加载位置 2021-06-04 21:11:40 +08:00
gaoxin 770b4e57a5 【更新界面】删除背景处理 2021-06-04 20:35:33 +08:00
gaoxin 9c17db0f82 【登录】删除版号信息显示 2021-06-04 20:33:47 +08:00
gaoxin 1a14550cd7 【添加无损压缩的文件夹】 2021-06-04 20:31:58 +08:00
ZhangBiao a549f0c45b 【礼包】特效层级问题修改 2021-06-04 18:52:23 +08:00
ZhangBiao 39180183a9 【任务头像】红点问题修改 2021-06-04 18:41:32 +08:00
gaoxin 791233463b 【登录】更换登录图 2021-06-04 18:09:40 +08:00
gaoxin 22a4c87a5b 【背景图】优化背景图的大小 2021-06-04 18:06:44 +08:00
ZhangBiao f0cd4b3bc0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-04 16:10:28 +08:00
ZhangBiao 4b708011bc 【玩家信息】红点问题修复 和log清楚 2021-06-04 16:10:17 +08:00
gaoxin d448c1189a 【登录】修复logo配置不生效 2021-06-04 16:09:52 +08:00
gaoxin b30359d2f5 【战斗】心魔试炼背景图修改 2021-06-04 15:17:43 +08:00
gaoxin 746e92f23d 【战斗】日常副本,无尽副本,山河社稷图战斗背景修改 2021-06-04 15:01:48 +08:00
gaoxin c067b888d3 【登录视频】如果登录视频加载失败不再播放,战斗还原boss关卡不能跳过的功能 2021-06-04 14:53:37 +08:00
wangzhenxing 6158f0916a [福利红包]=====红包红点修改 2021-06-04 14:19:16 +08:00
JieLing 7118f60b9c 【version】喜扑version文件添加 2021-06-04 12:08:45 +08:00
gaoxin 9bb57b48a5 【 包配置】添加判空 2021-06-04 12:01:08 +08:00
gaoxin 50f10993c4 【包配置】不再使用包名进行配置 2021-06-04 11:49:12 +08:00
gaoxin bc65257ac7 【战斗】跳过提示修改为25级 2021-06-04 11:18:46 +08:00
gaoxin eda07761fc 【登录】尝试修复在登录界面无法使用sdk切换账号的问题 2021-06-04 10:47:07 +08:00
gaoxin f708fb6671 【登录视频】优化静态背景切换到视频的效果 2021-06-04 10:08:57 +08:00
gaoxin a83f6848a7 【闪屏】修复部分机型健康提示显示不全的问题 2021-06-04 09:49:08 +08:00
gaoxin 3eb84202f2 【登录】修改特效依然再喜扑的包里显示的问题 2021-06-03 23:03:09 +08:00
gaoxin 079afb4e8d Revert "【Debug】红点不消失问题debug日志添加"
This reverts commit d20e47535e.
2021-06-03 22:37:30 +08:00
gaoxin 793bb12c8c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 21:32:49 +08:00
gaoxin 8451c96e70 【工具】添加多选文件工具 2021-06-03 21:32:44 +08:00
JieLing a781bc3c48 【禁言功能】 2021-06-03 20:46:28 +08:00
ZhangBiao 2f6fc30733 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 20:33:18 +08:00
ZhangBiao cc03866a03 【日常任务】红点问题修改 2021-06-03 20:33:08 +08:00
gaoxin 682d1a6b39 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 19:50:07 +08:00
gaoxin d20e47535e 【Debug】红点不消失问题debug日志添加 2021-06-03 19:50:02 +08:00
ZhangBiao f0dfe05e7b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-03 19:44:48 +08:00
ZhangBiao 326b790bcf 【抽卡】界面报错修改 2021-06-03 19:44:39 +08:00
zhangqiang 1933ffa809 【神将升级】满级还显示升级按钮 2021-06-03 19:38:22 +08:00
gaoxin 4077e33390 【红点】箭头红点不消失修复 2021-06-03 19:30:57 +08:00
gaoxin fb6338de41 【挂机】修复伤害数字不消失 2021-06-03 19:10:41 +08:00