Commit Graph

8281 Commits (c1e192943c2f757f08e3a49618f8616d98a166ff)
 

Author SHA1 Message Date
ZhangBiao 93469872a7 【主题活动】提交 2021-07-23 17:15:04 +08:00
zhangqiang beb91b9407 【拍脸报错】 2021-07-23 16:43:51 +08:00
wangzhenxing 3dc2970f1f [功能]============15日登陆预告预设修改,整点自动刷新 2021-07-23 16:27:33 +08:00
ZhangBiao d114a6404a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 15:56:00 +08:00
ZhangBiao bd5b473246 【大闹天宫】增加层数显示 2021-07-23 15:55:49 +08:00
zhangqiang 3b15f14d97 【跨服天梯】世界等级 2021-07-23 15:54:39 +08:00
wangzhenxing 887f071868 [功能]============15日登陆预告预设提交 2021-07-23 15:30:40 +08:00
zhangqiang 545e6cd8af 【跨服天梯】世界等级提交 2021-07-23 15:28:15 +08:00
ZhangBiao 31e8aa5d00 【山河社稷图】关闭关卡界面入口 2021-07-23 15:22:51 +08:00
ZhangBiao 3eee03aca7 【新副本界面】等级提示错误修复 2021-07-23 14:55:33 +08:00
JieLing 7c5f8eb006 Merge remote-tracking branch 'origin/china/test' into china/jumpserver 2021-07-23 14:20:03 +08:00
wangzhenxing 79a1a5acc0 [功能]============称号显示修改 2021-07-23 14:15:53 +08:00
ZhangBiao dc4fbe89e5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 14:11:50 +08:00
ZhangBiao b5fd7ba8f6 【新副本界面】刷新时间和引导修改 2021-07-23 14:11:29 +08:00
jiaoyangna 92738c45a7 超值基金红点修改 2021-07-23 13:48:07 +08:00
jiaoyangna ffeacc6bf0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 13:45:43 +08:00
jiaoyangna 4af32b0a85 超值基金红点修改提交 2021-07-23 13:45:40 +08:00
zhangqiang 731715ed35 【功能引导】幸运探宝开启,界面不会自动切换到幸运探宝入口 2021-07-23 13:43:34 +08:00
DESKTOP-98AVA47\Administrator ce89a20050 活动时间修改 2021-07-23 11:47:15 +08:00
DESKTOP-98AVA47\Administrator 7703a9e740 红点修改提交 2021-07-23 11:45:13 +08:00
DESKTOP-98AVA47\Administrator 022681face 红点修改提交 2021-07-23 11:36:44 +08:00
ZhangBiao 2164685f0c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 11:27:38 +08:00
ZhangBiao 8981c707ba 【主题活动】分页提交 2021-07-23 11:27:28 +08:00
wangzhenxing 02cea65055 [称号]====跨服称号资源提交 2021-07-23 11:20:05 +08:00
DESKTOP-98AVA47\Administrator 6986b0d3a1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 11:17:53 +08:00
DESKTOP-98AVA47\Administrator 6f8cb042bb 报错修改提交 2021-07-23 11:17:50 +08:00
wangzhenxing d0d533cecc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 11:08:03 +08:00
wangzhenxing f7029c2ef0 [功能]==============15日登陆添加 预告 2021-07-23 11:07:46 +08:00
zhangqiang 350f13371a 【逍遥游】掉落问题修改 2021-07-23 10:58:13 +08:00
ZhangBiao 3d105fae48 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:36:13 2021-07-23 10:36:13 +08:00
ZhangBiao 7f53ab4371 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:35:43 2021-07-23 10:35:43 +08:00
ZhangBiao 133bce077e bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:35:05 2021-07-23 10:35:06 +08:00
ZhangBiao 4ebfef77f6 bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,10:34:30 2021-07-23 10:34:31 +08:00
DESKTOP-98AVA47\Administrator 821f012981 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 20:25:35 +08:00
DESKTOP-98AVA47\Administrator 01f9ec621d 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 20:25:32 +08:00
gaoxin 6461dbc161 【灵兽特惠】修复全面屏时间显示位置错误 2021-07-22 20:16:30 +08:00
DESKTOP-98AVA47\Administrator ede748149f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 20:03:14 +08:00
DESKTOP-98AVA47\Administrator 875325fabb 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 20:03:03 +08:00
ZhangBiao ac3178d7f6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 19:55:37 +08:00
DESKTOP-98AVA47\Administrator 25aed04450 报错修改 2021-07-22 19:55:19 +08:00
ZhangBiao 79aab3d3b4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 19:53:39 +08:00
ZhangBiao a33be944cc 【万象商会】提交 2021-07-22 19:53:25 +08:00
DESKTOP-98AVA47\Administrator f676618e42 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 19:50:38 +08:00
gaoxin 0db39ccbe3 Merge branch 'china/ios' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
2021-07-22 19:39:14 +08:00
gaoxin a16d134d2d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 19:37:13 +08:00
gaoxin 1d49490fe3 【热更工具】提交热更文件到git时,如果目录不存在则创建 2021-07-22 19:37:06 +08:00
gaoxin a228c18c50 【MapPlayerView】随机使用lua原生的方法 2021-07-22 19:36:17 +08:00
gaoxin 9d7a51fd57 【容错】登录容错添加,服务器发送不存在的活动时,不再卡死 2021-07-22 19:35:22 +08:00
zhangqiang c3b68ef28a 【跨服】修改跨服排行未解锁提示文字 2021-07-22 19:30:53 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00