Commit Graph

5606 Commits (460152864de1087612defe2eac52269a36147e78)

Author SHA1 Message Date
ZhangBiao 2dc965137b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 17:15:15 +08:00
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 bd5b473246 【大闹天宫】增加层数显示 2021-07-23 15:55:49 +08:00
ZhangBiao 31e8aa5d00 【山河社稷图】关闭关卡界面入口 2021-07-23 15:22:51 +08:00
ZhangBiao 3eee03aca7 【新副本界面】等级提示错误修复 2021-07-23 14:55:33 +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
DESKTOP-98AVA47\Administrator 01f9ec621d 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 20:25:32 +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 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
ZhangBiao 1e822443f9 Merge branch '0优化/副本界面' into china/dev 2021-07-22 18:19:42 +08:00
ZhangBiao b0d10a29d2 【公会】公会按钮位置调整 2021-07-22 17:41:01 +08:00
luyao 5555f33715 玲珑宝镜音效修改提交 2021-07-22 17:25:17 +08:00
DESKTOP-98AVA47\Administrator 916230ead6 音效添加 2021-07-22 17:04:03 +08:00
ZhangBiao 056d3dc094 Merge branch 'china/dev' into 0优化/副本界面 2021-07-22 17:01:32 +08:00
DESKTOP-98AVA47\Administrator 1c75527f36 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 16:41:13 +08:00
DESKTOP-98AVA47\Administrator 2424a8090b 添加玲珑宝镜音效 2021-07-22 16:40:53 +08:00
jiaoyangna 7959f803c4 取消注释 2021-07-22 16:15:47 +08:00
jiaoyangna b0f868485e 无尽秘宝推送 2021-07-22 16:05:58 +08:00
ZhangBiao db258d27cb 【副本界面】调整 2021-07-22 15:13:24 +08:00
jiaoyangna 457ee33353 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 14:17:44 +08:00
jiaoyangna ce8751bbee 乾坤宝盒 提示修改 2021-07-22 14:17:40 +08:00
ZhangBiao 190f3722a8 Merge branch 'china/dev' into 0优化/副本界面 2021-07-22 14:04:11 +08:00
ZhangBiao 63c2a33c84 【报错修改】 2021-07-22 11:40:13 +08:00
ZhangBiao 5fa9f25c09 【点将台】白片修改 2021-07-22 10:53:27 +08:00
ZhangBiao b7d7b3270a 【主题活动】分页处理 2021-07-22 10:36:35 +08:00
jiaoyangna 5150fd2edf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-21 18:27:17 +08:00
jiaoyangna c131d41d58 装备界面改动 2021-07-21 18:27:03 +08:00
ZhangBiao 30edf664da Merge branch 'china/dev' into 0优化/新增心愿神将提示 2021-07-21 18:26:34 +08:00
ZhangBiao 2b08ff111e 【心愿抽卡】去除log 2021-07-21 18:26:12 +08:00
ZhangBiao 183cd238d3 【心愿抽卡】完成 2021-07-21 18:22:24 +08:00
jiaoyangna 1d2ed2a4f7 装备详情弹窗下方获取途径位置显示错误 2021-07-21 18:03:23 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
JLIOSM1 d680e5a507 Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
#	Assets/StreamingAssets/Res/PackConfig.txt
#	Assets/StreamingAssets/Res/_ReadMe.md
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
#	Assets/StreamingAssets/Res/loading1.png
#	Assets/StreamingAssets/Res/loading1.png.meta
#	Assets/StreamingAssets/Res/loading2.png
#	Assets/StreamingAssets/Res/loading2.png.meta
#	Assets/StreamingAssets/Res/loading3.png
#	Assets/StreamingAssets/Res/loading3.png.meta
#	Assets/StreamingAssets/Res/loading4.png
#	Assets/StreamingAssets/Res/loading4.png.meta
#	Assets/StreamingAssets/Res/loading5.png
#	Assets/StreamingAssets/Res/loading5.png.meta
#	Assets/StreamingAssets/Res/loading6.png
#	Assets/StreamingAssets/Res/loading6.png.meta
#	Assets/StreamingAssets/Res/loading_caohua.png.meta
#	Assets/StreamingAssets/Res/loading_xipu.png.meta
#	Assets/StreamingAssets/Res/login_caohua.png.meta
#	Assets/StreamingAssets/Res/login_video.mp4.meta
#	Assets/StreamingAssets/Res/login_xipu.png.meta
2021-07-21 17:15:36 +08:00
jiaoyangna 4442b9c38b 【ID1017598】
【灵兽白泽活动】点击查看红色装备TIPS后,切换至灵兽白泽互动点击金色装备,弹出的装备TIPS中会多出套装属性
2021-07-21 16:54:38 +08:00
JLIOSM1 e694302cac 【MapPlayerView】随机方法修改 2021-07-21 16:41:33 +08:00
jiaoyangna cc0e0c20cb 【ID1017607】
【仙缘汇聚箱】箱子可领取点击后关闭,动效消失,切换界面箱子再次跳动
2021-07-21 16:19:36 +08:00
JLIOSM1 3027e991c9 【IOS提审】提审服关闭公会红包,无尽秘宝按钮显示 2021-07-21 14:55:47 +08:00
jiaoyangna e2f381b11a 【ID1017469】
【五星成长礼拍脸】背包界面合成五星神将,切到关卡或主城才给拍脸
2021-07-21 11:53:26 +08:00
jiaoyangna 896bf742c1 【ID1017463】
【超值基金】在界面刷新后页签和主城入口没红点,重登正常
2021-07-21 11:37:04 +08:00
JLIOSM1 c2dfe0ee92 【IOS提审】链接提审服时,部分按钮跳转到妖晶充值 2021-07-21 11:33:09 +08:00
jiaoyangna 740592309d 【ID1017508】
【点将台】道具足够10连抽时,10连按钮没有红点
2021-07-21 11:22:56 +08:00
zhangqiang a359ff284f 【跨服主城按钮修改】 2021-07-20 18:32:02 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
jiaoyangna f3ada0f401 时间间隔修改 2021-07-20 17:18:20 +08:00
jiaoyangna 5cac652fa3 滑动修改提交 2021-07-20 17:08:36 +08:00
jiaoyangna 1e80b80c82 四元阵修改提交 2021-07-20 15:42:11 +08:00
jiaoyangna 058cd565d3 抽卡动画修改提交 2021-07-20 14:52:55 +08:00
jiaoyangna f0337c6ce8 抽卡修改提交 2021-07-20 14:31:31 +08:00
jiaoyangna ee26dc5196 跳转修改提交 2021-07-20 14:18:28 +08:00
jiaoyangna a88bebb284 滑动修改提交 2021-07-20 14:02:16 +08:00
jiaoyangna acbdf46600 跳转 修改提交 2021-07-20 13:46:13 +08:00
jiaoyangna 7cf1150c52 四元阵预设修改提交 2021-07-20 12:37:14 +08:00
zhangqiang fbc490737b 【公会】在公会界面散会,黑屏 2021-07-20 11:09:43 +08:00
DESKTOP-98AVA47\Administrator 625afbec42 四元阵修改提交 2021-07-20 10:27:43 +08:00
DESKTOP-98AVA47\Administrator f6ecf740b7 抽卡选中按钮修改 2021-07-20 10:24:33 +08:00
DESKTOP-98AVA47\Administrator 8168d284f0 跳转提交 2021-07-20 10:20:41 +08:00
DESKTOP-98AVA47\Administrator 3673a84edf 点将台乱点错误修改 2021-07-20 10:08:06 +08:00
DESKTOP-98AVA47\Administrator 2f9a357023 跳转修改提交 2021-07-19 21:58:45 +08:00
DESKTOP-98AVA47\Administrator ee84f39794 四元阵 报错修改 2021-07-19 21:35:11 +08:00
ZhangBiao effe3bdfa1 【十绝阵】跨天状态刷新 2021-07-19 17:30:17 +08:00
ZhangBiao d19d2f7dd3 【优化】心愿抽卡将孙悟空从心愿池去除 2021-07-19 15:50:35 +08:00
zhangqiang 99cad10435 【跨服天梯】国内提交+1 2021-07-19 15:49:48 +08:00
ZhangBiao 8df0d462f8 【惊喜礼盒】顺序错乱修改 2021-07-19 13:51:57 +08:00
jiaoyangna a8523745fb 抽卡界面 选中位置修改提交 2021-07-19 11:58:43 +08:00
jiaoyangna 61a2da78cd 超值基金跳转 2021-07-19 11:48:41 +08:00
DESKTOP-98AVA47\Administrator 9331a9916d 概率修改提交 2021-07-19 11:31:13 +08:00
DESKTOP-98AVA47\Administrator 13e6b5e522 乾坤宝盒报错修改提交 2021-07-19 10:59:13 +08:00
jiaoyangna b966fec333 幸运探宝十连报错修改 2021-07-17 10:14:25 +08:00
jiaoyangna 17d01c95ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 19:03:45 +08:00
jiaoyangna 05d12558b7 玲珑宝镜 2021-07-16 19:03:41 +08:00