Commit Graph

5368 Commits (fabd517c04f56d7445fe112c2020189886e08e8e)

Author SHA1 Message Date
jiaoyangna 7b9a5e535c 红点检测修改提交 2021-07-24 18:16:05 +08:00
jiaoyangna 8d76903f10 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 18:13:45 +08:00
jiaoyangna 8226901eb8 任务修改提交 2021-07-24 18:13:40 +08:00
ZhangBiao 5bba13ccc0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 17:46:03 +08:00
ZhangBiao 9a7ef2f0a2 【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失 2021-07-24 17:45:48 +08:00
jiaoyangna 1e70bdb2ca 活动修改提交 2021-07-24 17:38:48 +08:00
jiaoyangna 9d78af51e0 强化和精炼界面修改 2021-07-24 16:22:16 +08:00
jiaoyangna 24363d5c03 【ID1009862】
15日登录送白泽活动加入预告功能
2021-07-24 15:46:00 +08:00
jiaoyangna 6c59983568 工会查看信息报错修改 2021-07-24 15:18:38 +08:00
ZhangBiao 7bc3a3d460 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:23:05 +08:00
ZhangBiao c3a5e5b7de 【主题活动】bannerSetNative 2021-07-23 19:22:56 +08:00
jiaoyangna fd7d51168d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:12:46 +08:00
jiaoyangna bcd0651029 宝物培养修改提交 2021-07-23 19:12:42 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
wangzhenxing ff6639ebfb 【称号】=====称号属性显示修改 2021-07-23 18:34:07 +08:00
zhangqiang 3d13fbca6d 【拍脸修改】回退 2021-07-23 17:51:22 +08:00
ZhangBiao 8a90b87942 【新副本界面】心魔次数文字错误修改,和弹窗修改 2021-07-23 17:43:30 +08:00
ZhangBiao 627954ae3f 【大闹天宫】层数错误提交 2021-07-23 17:26:24 +08:00
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 875325fabb 【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
2021-07-22 20:03:03 +08:00
DESKTOP-98AVA47\Administrator 25aed04450 报错修改 2021-07-22 19:55:19 +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
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 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
wangzhenxing 59b36cbf94 [战斗]==========被动292 修改 追加得技能一次行动只追加一次,且不触发任何特性 2021-07-16 18:36:52 +08:00
jiaoyangna 05358f15f5 玲珑宝镜修改提交 2021-07-16 17:52:33 +08:00
jiaoyangna c1a7cba724 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 17:41:41 +08:00
jiaoyangna a2fa26e67e 玲珑宝镜修改提交 2021-07-16 17:41:38 +08:00
ZhangBiao 309486e443 【点将台】报错修改提交 2021-07-16 16:54:17 +08:00
jiaoyangna ef35e0bca0 玲珑宝镜帮助修改提交 2021-07-16 16:24:56 +08:00
jiaoyangna 360a8d3cae 主题活动限时召唤,乾坤宝盒卡死提交 2021-07-16 16:23:35 +08:00
wangzhenxing a70f45e7a5 [乾坤宝盒]==========提示文字颜色修改 2021-07-16 16:19:59 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
jiaoyangna 2d6f5f3fb1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:51:12 +08:00
jiaoyangna bec2eca580 适配修改 2021-07-16 15:51:06 +08:00
wangzhenxing d6226e77bf [乾坤宝盒]=====魂印详情修改提交 2021-07-16 15:11:53 +08:00
DESKTOP-98AVA47\Administrator 324ba7bc57 文字内容修改提交 2021-07-16 15:04:09 +08:00
gaoxin 1361261bd6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:49:53 +08:00
gaoxin e34f6a79cb 【log】关闭鸿蒙阵推送log 2021-07-16 14:49:35 +08:00
DESKTOP-98AVA47\Administrator aae52de39b 去掉已获得屏蔽 2021-07-16 14:46:21 +08:00
wangzhenxing 3c5a51a10c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:21:07 +08:00
wangzhenxing 65a6edeba5 [乾坤宝盒]======改成只能选择3个 2021-07-16 14:20:25 +08:00
DESKTOP-98AVA47\Administrator 0aa779f177 添加左右切换按钮 2021-07-16 14:18:25 +08:00
DESKTOP-98AVA47\Administrator 4d11ade910 四元阵修改 2021-07-16 14:09:53 +08:00
DESKTOP-98AVA47\Administrator 328a382d4c 奖池预览页签修改提交 2021-07-16 11:55:43 +08:00
DESKTOP-98AVA47\Administrator 0a4ef7e68d 心愿抽卡修改提交 2021-07-16 11:40:08 +08:00
DESKTOP-98AVA47\Administrator 60132143c7 新手引导修改提交 2021-07-16 11:19:36 +08:00
DESKTOP-98AVA47\Administrator 04c9ab3b6b 抽卡修改提交 2021-07-16 10:30:56 +08:00
DESKTOP-98AVA47\Administrator 59de7adf87 去掉宝箱bilingbiling 2021-07-16 10:26:08 +08:00
DESKTOP-98AVA47\Administrator c688666e99 向左滑动修改提交 2021-07-16 10:18:57 +08:00
DESKTOP-98AVA47\Administrator e7187d75c4 预设调整,左右红点切换界面调整 2021-07-16 10:12:41 +08:00
JLIOSM1 d2dd9401f4 【登录】提审服不再显示公告 2021-07-15 23:04:59 +08:00
JLIOSM1 3ca8ee5259 【引导】修复新手引导跳转界面导致界面无法销毁的问题 2021-07-15 23:04:07 +08:00
DESKTOP-98AVA47\Administrator af7e58f531 位置修改 2021-07-15 21:02:42 +08:00
DESKTOP-98AVA47\Administrator 08b9873d25 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 20:48:51 +08:00
DESKTOP-98AVA47\Administrator 53dadfff49 抽卡修改提交 2021-07-15 20:48:46 +08:00
wangzhenxing 908f15bf49 [乾坤宝盒]===========预设特效修改提交 2021-07-15 20:17:51 +08:00
DESKTOP-98AVA47\Administrator fc1a2bca84 文字颜色修改提交 2021-07-15 19:53:08 +08:00
ZhangBiao 7e17f8c3a1 Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-07-15 19:48:50 +08:00
ZhangBiao 88bd6a9801 【新副本】完成? 2021-07-15 19:46:43 +08:00
DESKTOP-98AVA47\Administrator 3ee8153112 抽卡界面修改 2021-07-15 19:40:09 +08:00
DESKTOP-98AVA47\Administrator 6d4bf07c21 【ID1009654】
【优化】优化抽卡界面
2021-07-15 19:38:10 +08:00
DESKTOP-98AVA47\Administrator 01a2171a31 【ID1009654】
【优化】优化抽卡界面
2021-07-15 19:33:34 +08:00
DESKTOP-98AVA47\Administrator 695a61abaa Merge branch '0优化/主题活动' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-07-15 18:52:59 +08:00
DESKTOP-98AVA47\Administrator c5ceba8603 【ID1009654】
【优化】优化抽卡界面
2021-07-15 18:51:51 +08:00
wangzhenxing 4d428fd383 [战斗]==========被动292 ,319 修改 2021-07-15 18:20:38 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
DESKTOP-98AVA47\Administrator 55607708df 资源修改提交 2021-07-15 16:19:27 +08:00
ZhangBiao 109a109301 Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
#	Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/StreamingAssets/Android.meta
2021-07-15 16:19:05 +08:00
ZhangBiao 7d4c8b6c3f 【山河试炼】 2021-07-15 16:08:39 +08:00
ZhangBiao 7075049c45 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 15:58:58 +08:00
ZhangBiao 4c5a8b73ef 【山河试炼】奖励顺序错乱修改 2021-07-15 15:58:49 +08:00
DESKTOP-98AVA47\Administrator 25ffe0ff1f 玲珑宝镜特效提交 2021-07-15 15:58:01 +08:00
ZhangBiao dd8f907259 【副本界面】提交 2021-07-15 15:54:18 +08:00
ZhangBiao e3baabda96 【副本界面】特效提交 2021-07-15 15:25:25 +08:00
wangzhenxing 5985853669 [乾坤宝盒]========功能修改 2021-07-15 15:12:40 +08:00
wangzhenxing fcaa098564 [乾坤宝盒]===========功能修改 2021-07-15 14:57:34 +08:00
DESKTOP-98AVA47\Administrator 25939d4d25 玲珑宝镜特效上传 2021-07-15 14:44:19 +08:00
DESKTOP-98AVA47\Administrator 36f04065fc Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-15 12:59:20 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
zhangqiang d9ca231e57 【跨服天梯】国内提交+1 2021-07-14 22:17:16 +08:00
zhangqiang c3a456af52 【跨服天梯】国内提交+1 2021-07-14 22:12:40 +08:00
zhangqiang 6a3c48e0b8 【跨服天梯】国内提交+1 2021-07-14 21:43:03 +08:00
zhangqiang 3b9af50a15 【跨服天梯】国内提交+1 2021-07-14 20:52:54 +08:00
zhangqiang b034028ad1 【跨服天梯】国内提交+1 2021-07-14 20:47:49 +08:00
zhangqiang 98362ef902 【跨服天梯】国内提交+1 2021-07-14 20:27:04 +08:00
ZhangBiao 491a48fe95 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 20:00:54 +08:00
ZhangBiao 3d7baa815e 【山河试炼】红点报错修改 2021-07-14 20:00:44 +08:00
zhangqiang 1f8d19f3d8 【跨服天梯】国内提交+1 目标被其他玩家击败后,点击挑战仍有问题 2021-07-14 19:07:05 +08:00
wangzhenxing e0d680da50 [乾坤宝盒]=============功能提交 2021-07-14 18:20:04 +08:00
ZhangBiao bc55cf3a19 Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-14 18:08:46 +08:00
zhangqiang 18d24b638f 【跨服天梯】国内提交+1 2021-07-14 17:41:26 +08:00
jiaoyangna 5f3e305613 描述修改提交 2021-07-14 17:18:13 +08:00
jiaoyangna 18e4652994 【ID1009791】 幸运探宝够12张券时开启红点提示 2021-07-14 17:05:50 +08:00
jiaoyangna 7d5968f058 超值基金
(cherry picked from commit 7cca06a5d7)
2021-07-14 17:00:22 +08:00
jiaoyangna dc363d25c4 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit 9e1366ff27)
2021-07-14 17:00:14 +08:00
jiaoyangna 977faf9b04 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit ff14ff62ee)
2021-07-14 17:00:07 +08:00
jiaoyangna a8fd256812 ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit 53e0f1adcc)
2021-07-14 16:59:59 +08:00
jiaoyangna 047c5c26f7 globaldefine冲突修改 2021-07-14 16:59:03 +08:00
jiaoyangna f1a7e93595 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit ff8d774c2f)
2021-07-14 16:57:15 +08:00
jiaoyangna 7cca06a5d7 超值基金 2021-07-14 16:09:55 +08:00
zhangqiang 008df5b422 【跨服天梯】国内提交+1 2021-07-14 15:48:34 +08:00
zhangqiang eec50395f0 【跨服天梯】国内提交+1 2021-07-14 15:08:54 +08:00
jiaoyangna 9e1366ff27 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-14 15:05:04 +08:00
ZhangBiao 0497fc30f5 【山河试炼】按钮状态颜色修改 2021-07-14 14:10:06 +08:00
jiaoyangna ff14ff62ee 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-14 14:07:44 +08:00
ZhangBiao 3a3bcf21b8 【山河试炼】提交 2021-07-14 13:48:29 +08:00
jiaoyangna 53e0f1adcc ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-14 12:04:37 +08:00
ZhangBiao 6d56325c26 【山河试炼】按钮判断方式提交 2021-07-14 11:41:14 +08:00
ZhangBiao 55f71e2c89 Revert "Revert "【山河试炼】增加主城红点检测""
This reverts commit 67e44741f6.
2021-07-14 11:36:55 +08:00
ZhangBiao c8b8a84d47 【山河试炼】差红点检测 2021-07-14 11:36:33 +08:00