Commit Graph

7385 Commits (e552db54994f7bf6259071d21f873d42e05f514a)

Author SHA1 Message Date
ZhangBiao 443ecf9112 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-22 10:36:45 +08:00
ZhangBiao b7d7b3270a 【主题活动】分页处理 2021-07-22 10:36:35 +08:00
zhangqiang 5c5edd8a13 【资源冲突处理】 2021-07-22 10:28:50 +08:00
zhangqiang e28d538565 【资源冲突处理】 2021-07-22 10:23:09 +08:00
ZhangBiao 2bf92fdfdd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-21 18:37:25 +08:00
ZhangBiao 683e0eefc4 【心愿抽卡】界面调整 2021-07-21 18:37:15 +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
jiaoyangna 8477043738 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:38:27 +08:00
ZhangBiao b0e53312e7 【心愿抽卡】增加英雄加入卡池的天数条件 2021-07-21 17:35:38 +08:00
jiaoyangna 399d90809d 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:32:07 +08:00
jiaoyangna d1abaf403c 装备详情弹窗下方获取途径位置显示错误 2021-07-21 17:23:14 +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
JLIOSM1 9009c07630 【StreamingAsset】修改Res文件夹的内容 2021-07-21 17:08:01 +08:00
jiaoyangna 4442b9c38b 【ID1017598】
【灵兽白泽活动】点击查看红色装备TIPS后,切换至灵兽白泽互动点击金色装备,弹出的装备TIPS中会多出套装属性
2021-07-21 16:54:38 +08:00
JLIOSM1 d1a82b5132 【IOS】打开文本的方式兼容IOS 2021-07-21 16:49:54 +08:00
JLIOSM1 12a8fd2417 【IOS】添加IOS热更新配置,修改热更新文件名连接符为下划线 2021-07-21 16:48:45 +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
JLIOSM1 557d19910d 【屏幕适配】优化剧情界面在宽屏设备下的显示 2021-07-21 11:30:13 +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
DESKTOP-98AVA47\Administrator 06cf7f6cdd 资源导入自动上传提交 2021-07-19 17:48:31 +08:00
wangzhenxing 2490fbb496 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-19 17:34:37 +08:00
wangzhenxing 38d384e9a7 [bug]=========【ID1017466】
【首充按钮】武将预览修改成神将预览
2021-07-19 17:34:04 +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
zhangqiang ea0e707e7e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-19 11:02:45 +08:00
zhangqiang baf39fc1a3 【动游】场景 2021-07-19 11:02:25 +08:00
liujiaqi 57fade3e9d 罗浮争锋称号 2021-07-28 10:31:29 +08:00
DESKTOP-98AVA47\Administrator 13e6b5e522 乾坤宝盒报错修改提交 2021-07-19 10:59:13 +08:00
gaoxin 3205cdf5d0 【热更配置】添加游心渠道 2021-07-17 12:57:43 +08:00
jiaoyangna b966fec333 幸运探宝十连报错修改 2021-07-17 10:14:25 +08:00
luyao 9a65f93211 玲珑宝镜修改 2021-07-16 19:12:35 +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 f631bb3c15 玲珑宝镜修改提交 2021-07-16 18:11:50 +08:00
jiaoyangna 6ed3b05885 四元阵修改提交 2021-07-16 17:59:22 +08:00
jiaoyangna ea704d62c3 Revert "四元阵修改提交"
This reverts commit f33d64871a.
2021-07-16 17:58:13 +08:00
jiaoyangna f33d64871a 四元阵修改提交 2021-07-16 17:57:45 +08:00
jiaoyangna 05358f15f5 玲珑宝镜修改提交 2021-07-16 17:52:33 +08:00
jiaoyangna 4f0f69b17e 玲珑报警 2021-07-16 17:41:56 +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
luyao 8aeb433618 玲珑宝镜道具图标 ——镜纹秘钥 2021-07-16 16:44:02 +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 2504268b55 【stream资源】修改StreamingAsset中的资源配置,添加视频配置 2021-07-16 16:06:35 +08:00
gaoxin 2cc76fd123 Merge branch 'china/ios' into china/dev 2021-07-16 15:57:29 +08:00
gaoxin 09c438a341 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:55:07 +08:00
zhangqiang 80fe4f0ae3 【包配置】添加游心专服和内网包的打包配置 2021-07-16 15:54:53 +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
JLIOSM1 56e7492a91 【商店】修复妖精商店资源回收导致白片 2021-07-16 15:37:48 +08:00
luyao aa3c2f7694 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 15:16:02 +08:00
luyao 3baf85791e 主题活动,限时召唤中。【更换武将】图片资源替换为【更换神将】 2021-07-16 15:15:25 +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 6aeea9a736 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:46:31 +08:00
DESKTOP-98AVA47\Administrator aae52de39b 去掉已获得屏蔽 2021-07-16 14:46:21 +08:00
gaoxin 912945a782 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:42:22 +08:00
gaoxin 27bfa3979a 【登录】登录页加载Stream目录中的视频 2021-07-16 14:42:16 +08:00
DESKTOP-98AVA47\Administrator 102930f792 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 14:28:36 +08:00
DESKTOP-98AVA47\Administrator b253745ab0 超值基金特效修改 2021-07-16 14:28:26 +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 710b8b2f1b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-16 11:19:40 +08:00
DESKTOP-98AVA47\Administrator 60132143c7 新手引导修改提交 2021-07-16 11:19:36 +08:00
luyao 82e5b6fd5c 【点将台抽卡】召唤标题修改(猎妖师 变为 神将) 2021-07-16 11:05:42 +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 89925e511a 抽卡调整 2021-07-16 10:15:59 +08:00
DESKTOP-98AVA47\Administrator e7187d75c4 预设调整,左右红点切换界面调整 2021-07-16 10:12:41 +08:00
JLIOSM1 7285c52be1 【IOS】新增打开网页的接口 2021-07-15 23:09:58 +08:00
JLIOSM1 8f272916c5 【资源加载】IOS资源加载增加前缀:file:// 2021-07-15 23:09:33 +08:00
JLIOSM1 808efb6764 【延长登录界面的打开事件】 2021-07-15 23:08:41 +08:00
JLIOSM1 d2dd9401f4 【登录】提审服不再显示公告 2021-07-15 23:04:59 +08:00
JLIOSM1 3ca8ee5259 【引导】修复新手引导跳转界面导致界面无法销毁的问题 2021-07-15 23:04:07 +08:00
luyao b8afca215b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 21:10:50 +08:00
luyao 2fbecd6584 文字修改提交 2021-07-15 21:10:37 +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 9b413e06e2 神将抽加号修改 2021-07-15 20:08:06 +08:00
DESKTOP-98AVA47\Administrator dda2c78b05 预设修改提交 2021-07-15 19:59:54 +08:00
ZhangBiao d639f0ccd3 资源名重复 2021-07-15 19:57:30 +08:00
DESKTOP-98AVA47\Administrator fc1a2bca84 文字颜色修改提交 2021-07-15 19:53:08 +08:00
ZhangBiao 9cfca39bb1 Merge branch 'china/dev' into 0优化/副本界面 2021-07-15 19:48:59 +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
DESKTOP-98AVA47\Administrator 385dcb9c90 位置修改交 2021-07-15 19:47:04 +08:00
ZhangBiao 88bd6a9801 【新副本】完成? 2021-07-15 19:46:43 +08:00
DESKTOP-98AVA47\Administrator 9b97a35ce8 mata 文件修改提交 2021-07-15 19:44:55 +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 18cc7ec6a4 红点报错修改提交 2021-07-15 19:20:20 +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
DESKTOP-98AVA47\Administrator 798d4d9a4e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-15 18:23:27 +08:00
DESKTOP-98AVA47\Administrator 7eb776f699 【ID1009829】
升星界面的进阶要求改成进阶预览
2021-07-15 18:23:17 +08:00
wangzhenxing 4d428fd383 [战斗]==========被动292 ,319 修改 2021-07-15 18:20:38 +08:00
ZhangBiao edaacd0e69 重复名资源提交 2021-07-15 17:24:56 +08:00
wangzhenxing e2f4a55226 【乾坤宝盒】=============协议提交 2021-07-15 17:19:41 +08:00
wangzhenxing fe8714f7fa [乾坤宝盒]========优化提交 2021-07-15 16:43:35 +08:00
DESKTOP-98AVA47\Administrator 27b0f524f9 协议提交 2021-07-15 16:40:48 +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
ZhangBiao 37dd3100b9 【心愿抽卡】文字内容颜色调整 2021-07-15 13:44:46 +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
ZhangBiao 32654b045a 抽卡资源提交 2021-07-15 11:57:24 +08:00
wangzhenxing c3da0a2df8 [乾坤宝盒]=============优化提交 2021-07-15 11:14:32 +08:00
skuld 7845904c32 红点位置修改提交 2021-07-15 10:48:07 +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
luyao 3565338eb8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 18:25:34 +08:00
luyao d9c3b4cefe 超值基金图片修改提交 2021-07-14 18:25:26 +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
wangzhenxing ca95dcb71e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 18:05:56 +08:00
wangzhenxing 070fabb0a6 [乾坤宝盒]=========添加常量 2021-07-14 18:05:37 +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 c3d42bc536 超值基金图片修改
(cherry picked from commit 771c79feff)
2021-07-14 17:00:30 +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 6aea37d365 Revert "Revert "超值基金提交""
This reverts commit 23fa4e0ab1.
2021-07-14 16:56:27 +08:00
jiaoyangna 771c79feff 超值基金图片修改 2021-07-14 16:14:26 +08:00
jiaoyangna 7cca06a5d7 超值基金 2021-07-14 16:09:55 +08:00
zhangqiang e4469de1c3 【游心】场景提交 2021-07-14 16:01:05 +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