Commit Graph

8593 Commits (81a3db04465518501b25428a7061e3a380fa1e94)

Author SHA1 Message Date
ZhangBiao 00bd84f77c 【升星有礼】增加新将例会 2021-09-02 09:57:17 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00
jiaoyangna 615aaa0d88 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 19:59:37 +08:00
jiaoyangna 5b8001ce28 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物

(cherry picked from commit 41831fad79)
2021-09-01 19:36:19 +08:00
jiaoyangna 41831fad79 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物
2021-09-01 19:35:28 +08:00
jiaoyangna 9ab223d577 【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
2021-09-01 19:20:34 +08:00
wangzhenxing 3e36a537b3 [战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改 2021-09-01 18:40:32 +08:00
jiaoyangna 75fc33c18b 回放资源修改提交 2021-09-01 18:17:14 +08:00
jiaoyangna f49deb2471 回放修改提交 2021-09-01 18:13:58 +08:00
jiaoyangna ae71f6941d 四灵修改提交 2021-09-01 18:10:51 +08:00
jiaoyangna 3b8fc3700f 排行榜修改提交 2021-09-01 17:21:33 +08:00
jiaoyangna f516731201 一键上阵修改提交 2021-09-01 17:12:25 +08:00
jiaoyangna bfe127012e 排行榜修改提交 2021-09-01 16:39:09 +08:00
jiaoyangna 19be216616 升级修改提交 2021-09-01 16:25:58 +08:00
wangzhenxing 8476199128 玉虚论道段位特效提交 2021-09-01 16:20:52 +08:00
jiaoyangna 3373e3daf4 升级修改提交 2021-09-01 16:07:33 +08:00
jiaoyangna 0f3e76e00f 层级修改 2021-09-01 14:52:13 +08:00
jiaoyangna 3372e2a965 已激活属性之间的空隙过大 2021-09-01 14:49:58 +08:00
jiaoyangna 4f266a20b9 红点问题修改提交 2021-09-01 14:17:21 +08:00
jiaoyangna 13e7935d1d 下方显示替换红点,点击一键装备无法替换 2021-09-01 12:47:30 +08:00
jiaoyangna 1744845cba 建木神树转移到修行 2021-09-01 11:57:15 +08:00
jiaoyangna 0654020f6a 建木神树快速升级 2021-09-01 11:49:22 +08:00
jiaoyangna 1245d7635d 四灵修改 2021-09-01 11:02:07 +08:00
jiaoyangna 49a4b32138 四灵第二次修改 2021-09-01 10:43:57 +08:00
jiaoyangna a12c9330c7 四灵第二次修改提交 2021-09-01 10:08:25 +08:00
jiaoyangna 56af6f1a11 第一次bug修改提交 2021-08-31 20:22:59 +08:00
jiaoyangna ad9e76bda5 四灵试炼修改提交 2021-08-31 19:03:29 +08:00
gaoxin dec3a4d338 【资源】织女新立绘添加 2021-08-31 18:34:16 +08:00
jiaoyangna d9bef4f49a 战力修改提交 2021-08-31 18:08:57 +08:00
jiaoyangna 207a4eb512 战力修改提交 2021-08-31 18:07:34 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna 82b992c4ca 我的助战报错修改提交 2021-08-31 17:12:30 +08:00
jiaoyangna d660fe362e 装备宝物界面修改提交 2021-08-31 17:06:01 +08:00
jiaoyangna ac22bd000b 装备宝物界面修改提交 2021-08-31 17:02:22 +08:00
gaoxin 7af7478699 【icon】添加新的出包ICon 2021-08-31 15:44:48 +08:00
gaoxin 6d2253347a 【icon】添加新的出包ICon 2021-08-31 15:42:25 +08:00
gaoxin cb8589eba6 【包配置】修改专服包的母包功能 2021-08-31 15:27:01 +08:00
gaoxin 6e79e38b75 【包配置】修改专服包的母包功能 2021-08-31 15:26:22 +08:00
gaoxin 1c7d7427e4 【战斗】被动添加时Log 2021-08-31 15:22:02 +08:00
wangzhenxing 2211be3b61 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 15:21:55 +08:00
gaoxin 9eb136df40 【战斗】添加一些战斗日志 2021-08-31 15:21:27 +08:00
gaoxin 7ef231e7a8 【战斗】修复战斗报错 2021-08-31 15:21:22 +08:00
wangzhenxing dcacc94fad 玉虚论道脚本预设提交 2021-08-31 15:10:27 +08:00
jiaoyangna dd93f737ff 排行榜上好友宝器修改 2021-08-31 15:05:17 +08:00
gaoxin 8a0b1c80a2 【战斗】被动添加时Log 2021-08-31 14:48:44 +08:00
jiaoyangna d7d8a6071b 特希奥层级修改提交 2021-08-31 14:41:35 +08:00
gaoxin 4e8e552ca8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:29:46 +08:00
wangzhenxing 7eeebb014e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:26:02 +08:00
wangzhenxing 8c6c57d916 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 14:25:43 +08:00
gaoxin 93413b3b07 【战斗】添加一些战斗日志 2021-08-31 14:25:29 +08:00
jiaoyangna 72931e8ad6 失败返回报错修改 2021-08-31 13:59:03 +08:00
gaoxin c67c9fb93b 【战斗】修复战斗报错 2021-08-31 13:44:13 +08:00
jiaoyangna 13f74e0185 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-31 11:39:16 +08:00
jiaoyangna 7713a65826 排行榜宝器修改 2021-08-31 11:08:12 +08:00
jiaoyangna ba96d80208 四元阵特效修改提交
(cherry picked from commit 03b00d7762)
2021-08-31 10:54:39 +08:00
jiaoyangna 209bd7ed0c 四元阵特效修改提交
(cherry picked from commit f355940615)
2021-08-31 10:54:32 +08:00
jiaoyangna 03b00d7762 四元阵特效修改提交 2021-08-31 10:52:58 +08:00
jiaoyangna f355940615 四元阵特效修改提交 2021-08-31 10:52:02 +08:00
jiaoyangna 0027722366 四灵修改提交 2021-08-30 20:07:20 +08:00
ZhangBiao e68d6a2b23 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 18:45:31 +08:00
ZhangBiao 4e9ce855f2 【玩家神将信息界面】魂印本身战力不增加修改 2021-08-30 18:45:21 +08:00
gaoxin 9744f908a5 【数数】修复Android平台下IOS组件找不到的问题 2021-08-30 18:16:29 +08:00
gaoxin a3f6147779 【Logo】删除SDKConfig 2021-08-30 18:16:23 +08:00
gaoxin f0115a8e07 【数数】修复Android平台下IOS组件找不到的问题 2021-08-30 18:15:54 +08:00
ZhangBiao 6dca507aaf 【推荐工会】 2021-08-30 18:14:13 +08:00
ZhangBiao 911c1849b2 【工会推荐】搜索修改 2021-08-30 18:14:07 +08:00
ZhangBiao ec638f7c7a 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 18:14:03 +08:00
jiaoyangna 4801852d88 神应修改提交 2021-08-30 18:09:06 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
ZhangBiao 1f2a21a587 【推荐工会】 2021-08-30 16:24:30 +08:00
wangzhenxing 01ad6f3229 【玉虚轮道】=====功能入口提交 2021-08-30 15:41:14 +08:00
ZhangBiao 78f4dccc1e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 15:37:22 +08:00
ZhangBiao f484e60f87 【工会推荐】搜索修改 2021-08-30 15:37:10 +08:00
gaoxin 2da3f4b8e5 【Logo】删除SDKConfig 2021-08-30 15:35:14 +08:00
ZhangBiao ca59c47cce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 15:29:35 +08:00
ZhangBiao 671f3cfb28 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 15:29:22 +08:00
gaoxin 790af4ec62 【修复数数SDK升级导致本地报错】 2021-08-30 14:59:58 +08:00
jiaoyangna 7756dd8292 数据资源提交 2021-08-30 14:22:15 +08:00
jiaoyangna a76f27ecf0 四灵提交 2021-08-30 14:21:41 +08:00
wangzhenxing 172f800d2e 【战斗】=============杨戬新技能特效提交 2021-08-30 14:14:48 +08:00
gaoxin 3a8fac4f87 【修复数数SDK升级导致本地报错】 2021-08-30 12:29:13 +08:00
gaoxin 61bfa0d326 【尝试升级数数】 2021-08-28 20:32:19 +08:00
gaoxin 985a0b2b92 【尝试升级数数】 2021-08-28 20:21:42 +08:00
zhangshanxue 09fba90ce1 Merge commit 'dd9392871e43553845788df3666c8e264ada663d' into china/test 2021-08-28 19:10:42 +08:00
skuld 1cb0353b43 添加log 2021-08-28 17:21:36 +08:00
jiaoyangna f11e33efc1 添加log 2021-08-28 17:12:10 +08:00
jiaoyangna dd9392871e 十绝阵公会名字显示错误 2021-08-28 17:03:22 +08:00
zhangshanxue 2e786a967e Merge branch 'china/dev' into china/test 2021-08-28 15:42:36 +08:00
gaoxin c19cfb3d49 【提审】关闭太初密卷显示 2021-08-28 15:26:35 +08:00
zhangshanxue fe15c46f87 Merge remote-tracking branch 'origin/china/dev' into china/test 2021-08-28 15:21:19 +08:00
gaoxin ee4a465c41 【角色升星】修复角色达到最大星级依然可以跳转觉醒、进阶页签的问题 2021-08-28 15:20:44 +08:00
gaoxin eed381315d 【提审】添加石矶提审服资源 2021-08-28 15:04:13 +08:00
gaoxin 908ca14632 【shader】添加对所有平台的支持 2021-08-28 13:40:15 +08:00
jiaoyangna 2fbe372c76 四灵修改提交 2021-08-27 18:39:45 +08:00
zhangshanxue 51d59cd8ef Merge branch 'china/dev' into china/test 2021-08-27 18:24:42 +08:00
wangzhenxing 6ef1d6c643 【战斗】===========被动115 DOT类Buff 清除逻辑修改 2021-08-27 18:02:50 +08:00
zhangshanxue 0946e743ba 【覆盖安装包时清除缓存】 2021-08-27 16:46:26 +08:00
zhangshanxue 00a25c6bc1 【覆盖安装包时清除缓存】 2021-08-27 16:44:29 +08:00
zhangshanxue ab15ece104 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/Atlas/LoginAtlas/agetip.png.meta
#	Assets/ManagedResources/Spine/c_0038_02.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.png.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0038_02/c_0038_02_Material.mat
#	Assets/ManagedResources/Spine/c_0043_02.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.atlas.txt.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02.skel.bytes.meta
#	Assets/ManagedResources/Spine/c_0043_02/c_0043_02_Material.mat
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-27 16:42:18 +08:00
ZhangBiao 7ca7e78761 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-27 15:59:38 +08:00
ZhangBiao 12c2fd7316 【推荐公会】增加分页请求 2021-08-27 15:59:22 +08:00
wangzhenxing 58f34e049b 【战斗】=============被动91,160 修改提交 2021-08-27 15:27:53 +08:00
gaoxin a3f9967651 【提审服】精卫穿秋裤,慈航穿棉袄 2021-08-27 15:23:03 +08:00
zhangqiang 4abca9f0a2 漏提 2021-08-27 15:15:42 +08:00
zhangqiang 50268807c3 【十绝阵】左上角数据刷新不及时,得重进界面才变化 2021-08-27 15:12:22 +08:00
gaoxin 792a72676a 【适龄提示】 2021-08-27 14:20:36 +08:00
ZhangBiao 74f0e3f8a2 【玉虚论道】编队界面提交 2021-08-27 13:45:09 +08:00
zhangqiang 037c4a5ac8 【十绝阵】左上角数据刷新不及时,得重进界面才变化 2021-08-27 11:14:12 +08:00
gaoxin 2c7ef85e6b 【判空方法】修复组件无法判断空值的问题 2021-08-26 22:30:45 +08:00
zhangshanxue c542bf612d 【资源】循环依赖处理 2021-08-26 22:29:58 +08:00
gaoxin 672ca7db26 【判空方法】修复组件无法判断空值的问题 2021-08-26 22:29:19 +08:00
zhangshanxue 78c3cd8adf 【资源】循环依赖处理 2021-08-26 20:25:22 +08:00
ZhangBiao 868939fa06 【觉醒】神将界面觉醒显示 2021-08-26 18:55:42 +08:00
ZhangBiao 3a102c93fa 【觉醒】神将界面觉醒显示 2021-08-26 18:54:14 +08:00
ZhangBiao f13f1937c7 【玉虚论道】其他人信息界面 2021-08-26 18:14:46 +08:00
jiaoyangna ab1a4ea627 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-26 17:42:25 +08:00
ZhangBiao dc943be130 【玉虚论道】其他人信息界面提价 2021-08-26 17:36:03 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
ZhangBiao c0ea5e1b7f 【玉虚论道】其他人编队信息界面 2021-08-26 17:14:13 +08:00
gaoxin be3afeb82a 【资源】重名资源修改 2021-08-26 17:02:42 +08:00
gaoxin f25148fb68 【资源】重名资源修改 2021-08-26 17:02:29 +08:00
gaoxin ea4599e860 Revert 回滚错误的合并 4f19f12612 2021-08-26 16:46:41 +08:00
gaoxin 68ac132040 【太初密卷】修改为拉伸的方式 2021-08-26 16:46:36 +08:00
zhangqiang 8cf472017b 【失败界面按钮位置调整】 2021-08-26 16:46:26 +08:00
gaoxin c325bf563f Revert 回滚错误的合并 4f19f12612 2021-08-26 16:43:27 +08:00
gaoxin 2f9357608a 【太初密卷】修改为拉伸的方式 2021-08-26 16:30:52 +08:00
zhangshanxue 8d05854eb0 Merge commit '20554f8fd82082607fa75e9c89606a576faa6669' into china/test 2021-08-26 16:19:34 +08:00
zhangqiang 0202985814 【失败界面按钮位置调整】 2021-08-26 14:12:54 +08:00
zhangqiang 5b9542d391 【跨服十绝阵】请求跨服排行 2021-08-26 14:12:28 +08:00
ZhangBiao 6345a18ebe 【玉虚论道】我的编队界面 2021-08-26 13:42:17 +08:00
zhangqiang 20554f8fd8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-26 11:49:11 +08:00
zhangqiang 17e4c209c7 【神将列表】排序修改-张彪 2021-08-26 11:48:36 +08:00
ZhangBiao 391c538ceb 【玉虚论道】提交 2021-08-26 09:59:59 +08:00
gaoxin 8e01aafe51 【出包场景】所有线上包关闭日志打印 2021-08-25 21:04:49 +08:00
gaoxin dd45768117 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 21:02:11 +08:00
gaoxin 0193d9a22e 【数数】修改部分数据到进入游戏时上报 2021-08-25 21:01:50 +08:00
gaoxin eebd99883b 【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题 2021-08-25 20:59:26 +08:00
ZhangBiao 994763b560 Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道 2021-08-25 20:31:38 +08:00
ZhangBiao 94b4d550e5 【玉虚论道】我的编队界面提交 2021-08-25 20:31:21 +08:00
gaoxin a6e93212d0 【数数】修改部分数据到进入游戏时上报 2021-08-25 19:38:49 +08:00
zhangqiang b44c1a3e8f 【装备界面】装备界面替换魂灵宝,会生成一个假的宝物 2021-08-25 18:07:05 +08:00
wangzhenxing bc654382c2 玉虚轮道预设提交 2021-08-25 16:56:18 +08:00
jiaoyangna 0c7e38a715 Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2021-08-25 15:25:54 +08:00
jiaoyangna 404a30a57d 四灵修改提交 2021-08-25 15:15:50 +08:00
wangzhenxing 690db47d68 【战斗】=========复活,新灼烧特效预设提交 2021-08-25 14:37:10 +08:00
gaoxin 7fc6ee71f0 【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题 2021-08-25 14:34:47 +08:00
zhangqiang 8c46f74e45 【跨服十绝阵】 回退特殊处理 2021-08-25 14:34:42 +08:00
gaoxin f778b03879 【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题 2021-08-25 14:27:08 +08:00
zhangqiang c8a06d9c5d 【重复名】特效重复名提交 2021-08-25 13:55:37 +08:00
zhangqiang dd37961be0 【跨服十绝阵】 回退特殊处理 2021-08-25 13:53:40 +08:00
wangzhenxing 989323916b 主界面脚本提交 2021-08-25 11:44:48 +08:00
gaoxin 158d663639 【太初密卷】喜扑和动游渠道关闭 2021-08-25 07:32:07 +08:00
gaoxin 7efb32c51c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-25 07:25:44 +08:00
gaoxin 642ea1f7cd 【太初密卷】喜扑和动游渠道关闭 2021-08-25 07:25:38 +08:00
zhangqiang 256a3e7571 【十绝阵】跨服服务器名字显示 2021-08-24 18:23:32 +08:00
wangzhenxing 7d64f9d66a 文件夹提交 2021-08-24 17:36:20 +08:00
gaoxin fe43c56647 【出包场景】所有线上包关闭日志打印 2021-08-24 17:29:19 +08:00
ZhangBiao b9caed93bd Merge branch '0功能/七界试炼' into 0功能/玉虚论道 2021-08-24 16:58:42 +08:00
ZhangBiao f8c29542ef 【七界试炼】提交 2021-08-24 16:48:41 +08:00
wangzhenxing 3c77b085ab 玉虚论道图片资源提交 2021-08-24 16:45:41 +08:00
JLIOSM1 a3a43ba2b6 【热更工具】优化IOS更新卡死的问题 2021-08-24 16:04:51 +08:00
JLIOSM1 4756f15a93 【热更工具】优化IOS更新卡死的问题 2021-08-24 16:04:06 +08:00
gaoxin 8500ce94ff 【游戏帧率】默认修改为30帧 2021-08-24 15:35:29 +08:00
gaoxin 6f108e2f5c 【游戏帧率】默认修改为30帧 2021-08-24 15:34:50 +08:00
jiaoyangna ae15e4899a 协议提交 2021-08-24 14:34:24 +08:00
ZhangBiao e466ee664b Merge branch 'china/dev' into 0功能/七界试炼 2021-08-24 10:49:48 +08:00
ZhangBiao 6790df5983 【送神祠】 2021-08-23 21:30:12 +08:00
ZhangBiao f128822dbb 【送神祠】灵兽分解 2021-08-23 21:23:20 +08:00
ZhangBiao 8af3d5aa39 【送神祠】 2021-08-23 20:59:30 +08:00
ZhangBiao 6fc59dbe11 【太初密卷】协议提交 2021-08-23 20:46:50 +08:00
ZhangBiao f0a0be43e6 【送神祠】灵兽分解 2021-08-23 19:45:53 +08:00
ZhangBiao bdbd63cc95 【七界试炼】提交 2021-08-23 19:44:18 +08:00
gaoxin cb41480d39 【登录界面】修复隐私协议可以在全屏登录按钮上面的问题 2021-08-23 19:39:30 +08:00
gaoxin 575d97d2ae 【出包工具】配置修改 2021-08-23 19:38:25 +08:00
gaoxin 4f19f12612 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 19:37:10 +08:00
gaoxin 7b84324118 【出包工具】配置修改 2021-08-23 19:36:49 +08:00
ZhangBiao bd7383f063 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 16:47:26 +08:00
gaoxin 482d5371ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 15:48:06 +08:00
gaoxin 5c0696c7ac 【登录界面】修复隐私协议可以在全屏登录按钮上面的问题 2021-08-23 15:47:46 +08:00
ZhangBiao 87234641fa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-23 15:45:24 +08:00
ZhangBiao 1614afb3bf 【排序优化】修改神将界面中的排序规则 2021-08-23 15:45:10 +08:00
jiaoyangna 93f96a52f5 太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
(cherry picked from commit 6ea8e96e59)
2021-08-23 14:39:33 +08:00
jiaoyangna 6323fed117 太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
(cherry picked from commit 6a36e5ffd3)
2021-08-23 14:39:26 +08:00
jiaoyangna e79988c7e0 太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
(cherry picked from commit 16ca4f84d6)
2021-08-23 14:39:19 +08:00
jiaoyangna c0a2a04db9 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:38:34 +08:00
jiaoyangna 6ea8e96e59 太初秘卷红点修改提交
(cherry picked from commit c69a23be4ab0f01ab2dafe00ed1d9db3574e7314)
2021-08-23 14:34:08 +08:00
jiaoyangna 6a36e5ffd3 太初秘卷红点提交
(cherry picked from commit 8d99139640ed01e9ed692d0f74f2923dac24f839)
2021-08-23 14:27:49 +08:00
jiaoyangna 16ca4f84d6 太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
2021-08-23 14:27:41 +08:00
jiaoyangna ca656636ac 太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
2021-08-23 14:09:43 +08:00
Zhang Biao a7350e7f53 【修行】测试提交 2021-08-21 16:17:29 +08:00
zhangshanxue 2dccecd185 Merge branch 'china/dev' into china/test
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
2021-08-21 14:45:17 +08:00
gaoxin 259b43f2c6 【称号】修复踏碎凌霄称号IOS黑片问题 2021-08-20 22:40:10 +08:00
ZhangBiao 7d93e96d9b 【易经宝库】商店特效 2021-08-20 16:28:38 +08:00
wangzhenxing 9a02e18582 【战斗】==============被动 141 310 283 330 336 修改提交 2021-08-20 16:05:33 +08:00
ZhangBiao 6c2e75b384 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-20 14:40:19 +08:00
ZhangBiao 8ee8ec9dea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-20 12:01:23 +08:00
ZhangBiao 20451e4282 【灵兽山升级】战力上升和属性提升对不上,斜着显示 2021-08-20 12:01:17 +08:00
zhangqiang 864fd20aac 【神将召唤引导】当正好赶上两个神将加入卡池的时候,会有弹窗,但是弹窗蒙版会挡住引导按钮 2021-08-20 11:44:49 +08:00
zhangqiang 6ad43f93ed 【飘邈之旅】玩法入口文字错误 2021-08-20 10:56:14 +08:00
gaoxin f8cc4f5c73 【音效】治疗音效恢复 2021-08-19 21:02:34 +08:00
gaoxin 8f9f43adcb 【音效】缺失音效恢复 2021-08-19 20:29:43 +08:00
jiaoyangna 0a2b584ab0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-19 16:44:25 +08:00
jiaoyangna bb8ca3c5ca 四元阵跳转修改 2021-08-19 16:44:13 +08:00
gaoxin c1977b976c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-19 14:43:48 +08:00
gaoxin 6bcc7cf775 【战斗】修复部分普攻音效缺失 2021-08-19 14:43:43 +08:00
wangzhenxing 0e16c34677 [优化]==========聊天界面称号特效显示修改 2021-08-19 14:27:56 +08:00
ZhangBiao 11b5425f8b 【灵兽分解】分解完碎片后,显示错误 2021-08-18 17:53:52 +08:00
ZhangBiao 52bf5c79f2 【寻宝迷踪】增加音效 2021-08-18 15:31:52 +08:00
ZhangBiao 06b3814099 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-18 13:44:39 +08:00
ZhangBiao 30afec1613 【寻宝迷踪】预设冲突重新提交 2021-08-18 13:43:44 +08:00
jiaoyangna e2caaafbc5 删除log 2021-08-18 09:54:42 +08:00
ZhangBiao 2612c2e01e Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-08-17 19:53:05 +08:00
jiaoyangna c08ce1ea0b 【ID1018087】
【适配】十绝阵1080*2550,显示不全
2021-08-17 17:55:43 +08:00
jiaoyangna bc4af2601b 红点修改提交 2021-08-17 17:41:00 +08:00
jiaoyangna 662a760eaf 【ID1018142】
【宝物】宝物分解界面,没有精炼加号,统一 一下
2021-08-17 17:31:53 +08:00
jiaoyangna a23cd88b5b 【ID1018146】
【玲珑宝镜】外圈奖励显示10000与奖励预览不一致
2021-08-17 17:27:57 +08:00
jiaoyangna faf7591cf5 玲珑宝镜修改 2021-08-17 17:14:03 +08:00
ZhangBiao fab5388536 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-08-17 13:47:27 +08:00
ZhangBiao a3ba14fe2c 【寻宝迷踪】增加动态例会 2021-08-17 13:35:03 +08:00
gaoxin 0efe76995b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-16 16:50:52 +08:00
gaoxin 090bd32b66 【Version】只显示配置文件 2021-08-16 16:50:48 +08:00
ZhangBiao 9971d286ea 【寻宝迷踪】人物箭头提交 2021-08-16 15:37:01 +08:00
jiaoyangna 7a6935eb42 太初秘卷修改提交 2021-08-16 14:45:13 +08:00
jiaoyangna ab89dcfd17 去掉字符串前后空格 2021-08-16 14:22:58 +08:00
jiaoyangna a9d05bf258 修改报错日志 2021-08-16 14:05:29 +08:00
jiaoyangna 847dd9a83b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-16 13:57:23 +08:00
jiaoyangna 74f1bc4d4f 太初秘卷适配修改提交 2021-08-16 13:57:13 +08:00
ZhangBiao c5639ee2c7 【寻宝迷踪】提交 2021-08-16 11:55:50 +08:00
gaoxin 4d91c779c9 【神将升级】删除原用于防止升级超过突破等级的限制条件 2021-08-16 11:33:45 +08:00
jiaoyangna 51d1ea2524 太初秘卷图片修改 2021-08-16 11:25:45 +08:00
jiaoyangna 32aeee8180 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-16 10:46:45 +08:00
jiaoyangna fc09ac3c00 玲珑宝镜修改提交 2021-08-16 10:46:35 +08:00
liujiaqi b82765322f [战斗]=====新灼烧预设修改 2021-08-15 17:51:21 +08:00
wangzhenxing 3456f2b924 [战斗]====材质球提交 2021-08-25 17:11:39 +08:00
ZhangBiao d94d02849d 【寻宝迷踪】寻宝按钮特效增加 2021-08-13 17:46:58 +08:00
zhangqiang 617d4d39c3 【十绝阵】排行榜修改 2021-08-13 16:35:33 +08:00
ZhangBiao 57cdcc0809 【寻宝迷踪】增加到达特效 2021-08-13 15:34:06 +08:00
ZhangBiao 17afa71bd2 【修行】预览调整 【魂灵宝】属性调整 2021-08-13 14:06:35 +08:00
zhangqiang f3e3cf9156 【修行预览 2021-08-13 13:37:24 +08:00
zhangqiang 33bbaf3cf9 【修行】预览增加星数,魂灵宝 2021-08-13 13:32:59 +08:00
zhangqiang edcd105a68 【灵兽信息】未获得的灵兽查看信息增加技能详细查看和等级信息 2021-08-13 10:31:53 +08:00
ZhangBiao 29c9ed6074 【魂灵宝】装备界面调整 2021-08-13 09:52:20 +08:00
ZhangBiao e678864743 【魂灵宝】装备界面增加等级上限 2021-08-12 20:01:56 +08:00
jiaoyangna 9c5850a2a5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 18:35:56 +08:00
jiaoyangna 39f355c0d1 适配修改提交 2021-08-12 18:35:23 +08:00
ZhangBiao e7ebe6527b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 17:38:39 +08:00
ZhangBiao e672b2644a 【魂灵宝】装备界面魂灵宝信息界面修改 2021-08-12 17:38:24 +08:00
jiaoyangna 5c4696ad6c 太初秘卷修改提交 2021-08-12 17:32:34 +08:00
jiaoyangna 76dbc01270 Merge branch 'china/dev' into 0功能/silingshilian 2021-08-12 15:54:58 +08:00
wangzhenxing 11a39abcd4 [战斗]==========伤害修改提交 2021-08-12 15:42:31 +08:00
wangzhenxing 08d02a0b6d [战斗]==========后续紫府神印提交 2021-08-12 15:11:38 +08:00
ZhangBiao e3e0ef6ead 【寻宝迷踪】res提交 2021-08-12 14:56:58 +08:00
ZhangBiao a0ef88e58d Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-08-12 14:56:26 +08:00
jiaoyangna 027f2a3d86 十绝阵修改提交 2021-08-12 14:40:12 +08:00
jiaoyangna a5af78f2c9 主城界面修改 2021-08-12 12:00:36 +08:00
ZhangBiao bbe2bb6d6d 【寻宝迷踪】提交 2021-08-12 12:00:18 +08:00
jiaoyangna eaf6c12cf9 主城预设修改 2021-08-12 11:45:31 +08:00
jiaoyangna 4fe156364d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 11:41:37 +08:00
jiaoyangna 025583762d 十绝阵修改 2021-08-12 11:36:48 +08:00
jiaoyangna ce4a166777 Revert "跨服十绝阵修改提交"
This reverts commit 657690cf3f.
2021-08-12 11:22:05 +08:00
jiaoyangna 657690cf3f 跨服十绝阵修改提交 2021-08-12 11:18:43 +08:00
jiaoyangna 792b533fa0 太初秘卷修改提交 2021-08-12 11:02:21 +08:00
jiaoyangna f45b61adba Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-12 10:55:15 +08:00
jiaoyangna 16fc435113 跨服十绝阵修改提交 2021-08-12 10:55:05 +08:00
zhangqiang c0c3013e2f 【大闹天宫】角色爬塔,界面不会跟随显示 2021-08-11 21:21:11 +08:00
ZhangBiao 13777a78cb 【寻宝迷踪】增加主角箭头 2021-08-11 19:33:01 +08:00
gaoxin 2d065b675c 【资源优化工具】ui贴图优化,修改为图片优化像素为2的N次方 2021-08-11 18:14:50 +08:00
ZhangBiao 4632665c49 【寻宝迷踪】拼图合成特效+小人落地特效 2021-08-11 17:53:59 +08:00
jiaoyangna b83ee5e000 太初秘卷修改 2021-08-11 17:14:20 +08:00
ZhangBiao 12f9a10ec8 【灵兽山升级】战力上升和属性提升对不上,斜着显示 2021-08-11 16:30:04 +08:00
ZhangBiao e19dda12e7 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-11 15:46:13 +08:00
jiaoyangna c3d45f1316 【ID1010059】
【新功能】太初密卷
2021-08-11 15:15:41 +08:00
gaoxin a6899e297e 【log】这个log会导致IOS切换账号卡死...什么鬼 2021-08-11 10:53:44 +08:00
ZhangBiao 939d577624 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-10 20:21:06 +08:00
ZhangBiao 88c2e3984e 【寻宝迷踪】增加进入地图黑边效果 2021-08-10 20:20:55 +08:00
ZhangBiao 6e9136aa14 【寻宝密宗】增加QA 2021-08-10 16:17:28 +08:00
ZhangBiao d017873b79 【寻宝迷踪】提交 2021-08-10 15:27:32 +08:00
zhangqiang 195006e5aa 【适配】1080*2550鸿蒙阵卸下神将遮罩没铺满 2021-08-10 15:24:01 +08:00
zhangqiang 36ec633294 【公会红包】有动画时点赞按钮显示位置不对 解决方法 缩放去掉动画 2021-08-10 15:18:13 +08:00
ZhangBiao edc728227c 【寻宝密宗】提交 2021-08-10 14:57:45 +08:00
zhangqiang 5e891ff84b 【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级 2021-08-10 14:56:34 +08:00
zhangqiang 0e0d5ffdb0 【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级 2021-08-10 14:52:07 +08:00
jiaoyangna d0d4d68b77 冲突预设修改提交 2021-08-10 14:48:20 +08:00
ZhangBiao d7aa6d66f9 【无尽副本】特效穿透提交 2021-08-09 17:35:22 +08:00
ZhangBiao d10879ae57 【寻宝迷踪】res提交 2021-08-09 17:12:12 +08:00
ZhangBiao ed0f5296d1 【寻宝迷踪】提交 2021-08-09 17:11:30 +08:00
jiaoyangna 8fdd7eb8a9 牛气冲天跳转返回之后页签跳到第一个修改 2021-08-09 16:58:06 +08:00
gaoxin a1d1cff969 【登录】维护状态提示文字修改 2021-08-09 16:53:27 +08:00
gaoxin 54c0a74afa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:52:33 +08:00
gaoxin b0d5798448 【登录】维护状态提示文字修改 2021-08-09 16:52:21 +08:00
jiaoyangna 615cc24f09 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:50:04 +08:00
jiaoyangna 278530583d 牛气冲天跳转返回之后页签跳到第一个修改 2021-08-09 16:49:41 +08:00
gaoxin ee3338ee75 【服务器】服务器选择界面每次打开时都重新获取一遍服务器列表数据 2021-08-09 16:34:25 +08:00
jiaoyangna fe7fa52879 牛气冲天跳转神将抽卡 2021-08-09 16:34:20 +08:00
jiaoyangna 7e3bd8623a 牛气冲天跳转点将台修改提交 2021-08-09 16:34:16 +08:00
gaoxin 95431c2f9b 【服务器】选择服务器时维护状态提示文字修改 2021-08-09 16:34:11 +08:00
gaoxin 8e43418825 【服务器】服务器选择界面每次打开时都重新获取一遍服务器列表数据 2021-08-09 16:32:14 +08:00
gaoxin c4c57893ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:31:24 +08:00
jiaoyangna dfb6132bc5 牛气冲天跳转神将抽卡 2021-08-09 16:21:46 +08:00
jiaoyangna cef09d39d8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-09 16:14:35 +08:00
jiaoyangna 206fd6793b 牛气冲天跳转点将台修改提交 2021-08-09 16:13:24 +08:00
gaoxin 639dbcac80 【服务器】选择服务器时维护状态提示文字修改 2021-08-09 16:13:20 +08:00
gaoxin 984b863b8d 【登录】修改服务器维护状态下,登录时的提示文字 2021-08-09 15:09:45 +08:00
zhangqiang c957a96983 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-09 14:48:14 +08:00
ZhangBiao aae540d144 【寻宝迷踪】提交 2021-08-09 14:18:31 +08:00
gaoxin ac8927f4e6 【登录】修改服务器维护状态下,登录时的提示文字 2021-08-09 14:10:54 +08:00
ZhangBiao 0520c4c685 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-09 10:01:11 +08:00
ZhangBiao 56d41630ce 【降妖夺宝】次数修改提交 2021-08-06 18:34:31 +08:00
jiaoyangna cf9ddfaf96 图鉴提交 2021-08-06 17:46:24 +08:00
ZhangBiao a87f58a31c 【天宫秘宝】礼包购买逻辑修复 2021-08-06 17:46:09 +08:00
jiaoyangna 97de80b9cd 图鉴提交 2021-08-06 17:19:44 +08:00
jiaoyangna 1adf97eddc 四元阵适配修改 2021-08-06 16:56:26 +08:00
jiaoyangna e26a8a698c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-06 15:47:37 +08:00
jiaoyangna 34357fddff 滑动条修改提交 2021-08-06 15:47:31 +08:00
zhangqiang 43609ae65d 山河设计图觉醒图标修正 2021-08-06 14:42:34 +08:00
ZhangBiao f40d297086 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-06 14:21:48 +08:00
ZhangBiao 87b7f4d7c8 【天宫秘宝】礼包购买逻辑修复 2021-08-06 14:21:27 +08:00
ZhangBiao ab0dece261 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-06 11:32:10 +08:00
ZhangBiao 4dc9136405 【寻宝迷踪】提交 2021-08-06 11:31:41 +08:00
jiaoyangna 5cf3388a59 滑动 回弹修改提交 2021-08-06 11:29:06 +08:00
jiaoyangna 6b8c2f2f3c Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
#	Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
2021-08-06 11:15:13 +08:00
ZhangBiao 4edc9a855b 【寻宝迷踪】提交 2021-08-05 17:23:25 +08:00
gaoxin 7024cc1f35 【公告】报错修改 2021-08-05 16:34:39 +08:00
gaoxin 360cbbf54f 【公告】报错修改 2021-08-05 16:34:05 +08:00
liujiaqi 1952492eba 【资源】玉珏碎片icon 2021-08-05 15:40:36 +08:00
jiaoyangna 5336505935 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-05 15:10:04 +08:00
jiaoyangna ed3494e263 【ID1009947】
【优化】四元阵界面 新增界面特效
2021-08-05 15:09:58 +08:00
gaoxin ac47f0c3a3 【打包工具】修改出包的包名,以及日志提交的内容 2021-08-05 14:45:44 +08:00
gaoxin ee68d334af 【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置 2021-08-05 14:45:39 +08:00
gaoxin 67328caac1 【公告】公告显隐改为config文件配置 2021-08-05 14:45:34 +08:00
gaoxin 5f9bc0caae 【打包工具】修改出包的包名,以及日志提交的内容 2021-08-05 14:42:34 +08:00
gaoxin 597a747848 【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置 2021-08-05 14:41:19 +08:00
gaoxin 59afbd6773 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-05 14:39:44 +08:00
gaoxin 0f5e66cfea 【公告】公告显隐改为config文件配置 2021-08-05 14:39:39 +08:00
ZhangBiao d86921d5a3 【降妖夺宝】次数修改提交 2021-08-05 14:33:07 +08:00
ZhangBiao 1c0880abbf 【寻宝迷踪】 2021-08-05 14:31:31 +08:00
gaoxin e76b07646d 【打包工具】添加更新蓝鲸sdk的功能 2021-08-05 11:02:19 +08:00
gaoxin e4416573b8 【打包工具】添加更新蓝鲸sdk的功能 2021-08-05 10:59:48 +08:00
zhangshanxue 804aa9963f Merge branch 'china/test' of http://60.1.1.230/gaoxin/JL_Client into china/test 2021-08-04 22:17:36 +08:00
gaoxin 0a1a534403 【热更配置】跨服热更从test分支出 2021-08-04 22:16:40 +08:00
gaoxin 5dc039ab3a 【热更配置】跨服热更从test分支出 2021-08-04 22:14:59 +08:00
JieLing 4722ab29d6 Merge branch 'china/local' into china/test 2021-08-04 20:11:49 +08:00
ZhangBiao b0ae4e3d2c 【万象商会】upview调整 2021-08-04 20:08:19 +08:00
gaoxin a735668f30 【登录视频】修复登录视频黑屏 2021-08-04 20:08:04 +08:00
ZhangBiao 0a9315381e 【灵兽山】增加灵兽界面跳转 2021-08-04 19:47:35 +08:00
gaoxin 57ba11f9bb 【资源】我要变强背景资源回滚 2021-08-04 19:44:48 +08:00
ZhangBiao 9bd336158d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 18:47:09 +08:00
ZhangBiao cad9409314 【万象商会】upview调整 2021-08-04 18:46:59 +08:00
ZhangBiao 87cf2102fe 【寻宝迷踪】添加资源 2021-08-04 18:16:36 +08:00
gaoxin e46fa3636d 【登录视频】修复登录视频黑屏 2021-08-04 18:06:51 +08:00
zhangqiang 1e4b55d9fd 【修改协议请求】修改进入游戏会向后的发送更换 称号 皮肤 坐骑 请求 2021-08-04 17:53:30 +08:00
zhangqiang 3cf8a5d2ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 17:43:11 +08:00
zhangqiang abb9873f80 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-04 17:42:47 +08:00
ZhangBiao c85cc55432 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-04 17:24:03 +08:00
ZhangBiao 50cbd0ea50 【灵兽山】增加灵兽界面跳转 2021-08-04 16:58:19 +08:00
ZhangBiao 78155b6a3f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 16:39:11 +08:00
ZhangBiao ddb9197a3e 【适配】灵兽信息界面 2021-08-04 16:38:54 +08:00
jiaoyangna 488b7469f6 【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
2021-08-04 15:52:30 +08:00
gaoxin 8eb63b7692 【资源】我要变强背景资源回滚 2021-08-04 15:46:41 +08:00
jiaoyangna 70ad440eb3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 15:36:47 +08:00
jiaoyangna 3f9b6be120 【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
2021-08-04 15:36:39 +08:00
ZhangBiao f254d3f34d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-04 14:55:33 +08:00
ZhangBiao 2ba5a58a3f 【紫府神印】增加预览功能 2021-08-04 14:55:24 +08:00
jiaoyangna 8cac60fad7 【ID1017911】
英雄图鉴情报界面,点击法宝,遮罩上下没有铺满
2021-08-04 13:51:24 +08:00
jiaoyangna 78a0c17a59 百宝商会特效修改提交 2021-08-04 11:47:37 +08:00
JieLing cbaabfe589 Merge branch 'china/local' into china/test 2021-08-04 10:14:19 +08:00
gaoxin d36ab6421a 【资源】挂机地图误删资源恢复 2021-08-04 09:51:44 +08:00
JieLing 3121d36fe5 Merge branch 'china/local' into china/test 2021-08-03 18:28:43 +08:00
ZhangBiao c927af441a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 18:06:33 +08:00
ZhangBiao 3b86f741ee 【适配】增加限时兑换按钮特效 2021-08-03 18:06:02 +08:00
jiaoyangna 1f07968b5c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 16:50:07 +08:00
jiaoyangna 1827fa7217 图鉴界面神将皮肤错乱修改 2021-08-03 16:50:01 +08:00
gaoxin b82f910df8 【热更新】热更新界面退出游戏弹窗优化 2021-08-03 15:47:02 +08:00
ZhangBiao e0e015d06a 【适配】 2021-08-03 15:36:45 +08:00
ZhangBiao 3c83961895 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 15:29:37 +08:00
ZhangBiao 3199385550 【适配】 2021-08-03 15:29:26 +08:00
gaoxin f3ec579228 【妖晶礼包】删除前往邮箱领取提示 2021-08-03 15:26:47 +08:00
gaoxin 51e4e3206c 【成就提示】修复心魔快速战斗结算界面,通过成就跳转领取成就奖励后卡死的问题 2021-08-03 15:24:49 +08:00
ZhangBiao 0c6825597c 【升星有礼】适配 2021-08-03 15:21:12 +08:00
ZhangBiao fdaea1c133 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 13:58:19 +08:00
ZhangBiao 8f2c16d397 【适配】新将来袭、升星有礼 2021-08-03 13:58:09 +08:00
jiaoyangna 780db96526 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 13:33:01 +08:00
ZhangBiao 7eeb323b6e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 13:32:43 +08:00
ZhangBiao d07b4cfbc9 【适配】图鉴适配 2021-08-03 13:32:31 +08:00
jiaoyangna fabd517c04 【ID1017608】
【点将台】点击箭头,当切换页面大于2个时,会出现明显未对准后校准状态
2021-08-03 12:03:07 +08:00
wangzhenxing c3ca8f5286 Merge branch 'china/dev' into china/dev-c-battle 2021-08-03 11:49:12 +08:00
zhangqiang 0de6e3f63a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 11:00:06 +08:00
zhangqiang 8ef10cb100 【主城小人层级】 2021-08-03 10:59:41 +08:00
ZhangBiao fef7ea4d0b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-03 10:39:57 +08:00
ZhangBiao 53dc964596 【十绝阵】主界面倒计时超框修改 2021-08-03 10:39:40 +08:00
zhangqiang 3c899d20d5 【主城】主城小人层级错误 2021-08-03 10:36:55 +08:00
ZhangBiao 06569c49c2 Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪 2021-08-03 10:28:09 +08:00
ZhangBiao 28b794eea2 【寻宝迷踪】开坑 2021-08-03 10:27:36 +08:00
zhangqiang 0ab8247704 【跨服排行榜】修改 2021-08-03 10:12:54 +08:00
JieLing 41897661dd Merge branch 'china/local' into china/test 2021-08-02 19:25:52 +08:00
gaoxin 35b9a89503 Merge branch 'gx/充值前校验' into china/dev 2021-08-02 19:24:53 +08:00
gaoxin 2df20e2f91 【充值】充值前先请求订单号,并通过透传参数传递给后端 2021-08-02 19:24:44 +08:00
JieLing 53f1db7f64 Merge branch 'china/local' into china/test 2021-08-02 19:23:31 +08:00
gaoxin ac62390992 Revert "Revert "[战斗]========服务器发送随机种子修改""
This reverts commit 0b827be035.
2021-08-02 19:22:05 +08:00
gaoxin 0b827be035 Revert "[战斗]========服务器发送随机种子修改"
This reverts commit 331621bfd0.
2021-08-02 18:26:33 +08:00
gaoxin 0b6373493a 【BtView】点击区域优化 2021-08-02 18:25:39 +08:00
gaoxin bd85be16d2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 17:48:34 +08:00
gaoxin cd5ee0a6e0 【挂机奖励】修复满级后领取挂机奖励会弹出升级提示的问提 2021-08-02 17:47:43 +08:00
zhangqiang 14d50731a8 【十绝阵】显示修改 罗浮争锋 适配 2021-08-02 17:35:27 +08:00
wangzhenxing 331621bfd0 [战斗]========服务器发送随机种子修改 2021-08-02 16:46:54 +08:00
gaoxin 4897fc33b2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 16:25:13 +08:00
gaoxin 64077a2e28 【跨服聊天】重新分配跨服分组时,清空跨服聊天 2021-08-02 16:25:08 +08:00
wangzhenxing 55693a7b25 【bug】=====聊天界面背景图提交 2021-08-02 16:13:57 +08:00
gaoxin a8e7641ca7 【网络通信】当后端发送未监听的推送消息也要回复 2021-08-02 15:56:28 +08:00
gaoxin 54448208df 【切磋】战斗界面重复打开容错添加 2021-08-02 15:33:50 +08:00
wangzhenxing 4358ef97e3 [bug]====聊天界面称号特效穿透问题修改 2021-08-02 14:27:13 +08:00
gaoxin 233df8ca23 【AB包】添加解密工具 2021-08-02 11:22:24 +08:00
jiaoyangna 7f46481dbf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 11:04:24 +08:00
jiaoyangna 3c67abbd6d 四元阵闪现人物立绘修改 2021-08-02 11:04:19 +08:00
ZhangBiao d7727ac9e3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 10:34:27 +08:00
ZhangBiao 851059fe4d 【点将台】适配修改 2021-08-02 10:34:21 +08:00
JieLing 3fb8ba2334 Merge branch 'china/local' into china/test 2021-08-02 10:24:18 +08:00
gaoxin e1d2ca80db Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 10:22:14 +08:00
gaoxin 7d1c748a75 【热更工具】文件大小显示错误 2021-08-02 10:22:00 +08:00
ZhangBiao 247ca489d4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 10:11:47 +08:00
gaoxin b845c0bece Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 10:11:24 +08:00
ZhangBiao 73499d1b2f 【btview】修改判定区域 2021-08-02 10:11:19 +08:00
gaoxin 09ab5dea99 【热更工具】文件大小保留两位xiaoshu 2021-08-02 10:11:14 +08:00
JieLing 4453bea703 Merge branch 'china/local' into china/test 2021-08-02 10:07:35 +08:00
ZhangBiao 2ac511bf06 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-02 10:07:22 +08:00
ZhangBiao 807cca92ce 【天枢密卷】适配调整 2021-08-02 10:07:14 +08:00
gaoxin e3730ac549 【热更工具】更新列表显示每个文件的大小 2021-08-02 10:06:33 +08:00
JieLing 0468852116 Merge branch 'china/local' into china/test 2021-07-31 17:44:34 +08:00
zhangqiang acf647d9c5 【罗浮争锋】 2021-07-31 17:20:07 +08:00
gaoxin a96b609a49 【森罗幻境】修复未开启时红点方法报错 2021-07-31 16:49:28 +08:00
gaoxin de1d879717 【聊天】修改公会和跨服频道的未解锁提示内容 2021-07-31 16:25:43 +08:00
gaoxin 0cd58e9f6d 【巅峰赛】未开放状态不可进入 2021-07-31 16:10:57 +08:00
gaoxin 066f603cb1 Merge branch 'gx/packID打点' into china/dev 2021-07-31 16:03:07 +08:00
gaoxin 96adf23ab2 【http请求】请求报错日志打印优化 2021-07-31 16:02:49 +08:00
gaoxin 7757dc2f1e 【热更配置】添加跨服测试热更配置 2021-07-31 15:59:48 +08:00
gaoxin 1006de499c 【巅峰赛】添加未解锁状态显示 2021-07-31 15:59:14 +08:00
JieLing cc0da96f82 Merge branch 'china/dev' into china/test 2021-07-31 13:46:51 +08:00
zhangqiang 18dd4832a6 【资源冲突】 2021-07-31 13:45:59 +08:00
JieLing e952d49dc3 Merge branch 'china/dev' into china/test 2021-07-31 13:26:18 +08:00
zhangqiang fa203e1dc8 【跨服排行】 2021-07-30 19:20:53 +08:00
zhangqiang c1e192943c 【排行榜】踏碎凌霄称号大小修改 2021-07-30 18:29:44 +08:00
jiaoyangna 36e28866ed Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 17:58:59 +08:00
jiaoyangna 2ecffb1b10 宝物培养位置修改 2021-07-30 17:58:47 +08:00
zhangqiang d731f30dec 【巅峰赛】背景 2021-07-30 17:57:43 +08:00
zhangqiang 98649b66c1 【跨服排行】 2021-07-30 17:52:49 +08:00
ZhangBiao 92f3ee123c 【升星有礼】界面调整 2021-07-30 17:51:25 +08:00
JieLing 1468825d8d Merge branch 'china/local' into china/test
# Conflicts:
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_anim_02.anim
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_anim_02.anim.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_ctr_02.controller
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation/waixuan_UI_ctr_02.controller.meta
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua
2021-07-30 17:40:42 +08:00
ZhangBiao e829b33d14 【万象商会】白篇处理 2021-07-30 16:34:50 +08:00
ZhangBiao 5f994f6abc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 16:23:26 +08:00
ZhangBiao a40ccb1510 【新将来袭、降妖夺宝】增加按钮特效 2021-07-30 16:22:59 +08:00
wangzhenxing fdfa2dd76b [战斗]============追加额外技能是否触发特性修改,哪吒大招后摇时间延长 2021-07-30 16:03:22 +08:00
zhangqiang 80392134af 【跨服排行】红点显示修改 2021-07-30 15:57:11 +08:00
gaoxin ba35814301 【跨服聊天】未在跨服阶段不可进入跨服频道 2021-07-30 15:38:57 +08:00
jiaoyangna aec7bb6843 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 15:29:44 +08:00
jiaoyangna 06829b685e 【ID1017646】
【适配】1080*2550 屏幕显示不全
2021-07-30 15:29:40 +08:00
zhangqiang c0243afe6c 【跨服分组】推送 2021-07-30 15:14:52 +08:00
jiaoyangna c6c11c9374 宝物消耗震动修改 2021-07-30 15:11:56 +08:00
jiaoyangna 83f2a96c34 做个容错 2021-07-30 14:39:10 +08:00
jiaoyangna 9266d81377 【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
2021-07-30 14:30:10 +08:00
jiaoyangna 0ed878daac Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 14:17:55 +08:00
jiaoyangna aa82fc9f6b 震动效果修改 2021-07-30 14:17:44 +08:00
gaoxin 4d8ab5dd7e 【跨服聊天】关闭服务器名称显示 2021-07-30 14:11:50 +08:00
gaoxin 28d00ec69a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 14:07:36 +08:00
gaoxin 5aadeb406b 【聊天】聊天框根据内容跳转到不同的频道 2021-07-30 14:07:08 +08:00
jiaoyangna 3c012bb3f4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 14:05:09 +08:00
jiaoyangna 9ce0dcbf75 返回界面装备显示错误修改 2021-07-30 14:05:06 +08:00
gaoxin aece2194b5 【跨服聊天】添加服务器名显示 2021-07-30 13:47:03 +08:00
zhangqiang 78ec831ca1 【跨服详情】修改提交 2021-07-30 11:59:39 +08:00
jiaoyangna c81dbd604d 删除宝器的点击事件 2021-07-30 11:35:06 +08:00
wangzhenxing d6f8875ee7 [称号]======罗浮之主称号特效闪烁问题修改 2021-07-30 10:46:32 +08:00
zhangqiang 695183cec8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 10:33:49 +08:00
zhangqiang 580b43eff8 跨服排行榜里,查看玩家信息,战力显示超框问题 2021-07-30 10:33:29 +08:00
jiaoyangna a7b8bb88fc 四元阵适配修改 2021-07-30 10:29:55 +08:00
jiaoyangna 19628fdcbd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 10:25:32 +08:00
jiaoyangna 89cf45bf35 四元阵适配修改 2021-07-30 10:25:29 +08:00
zhangqiang 23d4f9548f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-30 10:21:45 +08:00
zhangqiang edbfbc9afc 【主城优化】跨服战入口变更位置 2021-07-30 10:20:35 +08:00
jiaoyangna 8c0060a835 四元阵动画播两遍修改 2021-07-30 10:00:26 +08:00
gaoxin f5584b0fbe 【巅峰赛】添加未开放状态兼容处理 2021-07-29 20:00:02 +08:00
jiaoyangna f73a554f35 宝物震动修改 2021-07-29 18:57:30 +08:00
jiaoyangna 7af6aa20da 宝物引导提交 2021-07-29 18:53:00 +08:00
jiaoyangna 97c5e11f5c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 18:36:45 +08:00
jiaoyangna 0480506f53 【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
2021-07-29 18:36:30 +08:00
gaoxin 5594474379 【累充】白片恢复 2021-07-29 18:05:44 +08:00
wangzhenxing 31c19def0a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 17:34:55 +08:00
wangzhenxing d8801cae6c [称号]=============添加罗浮争锋称号 获得 及 到时 后消息推送 2021-07-29 17:34:40 +08:00
ZhangBiao 3cdce73c69 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 17:12:31 +08:00
ZhangBiao bc46019646 【战令优化】无尽副本任务数量冗余修改 2021-07-29 17:12:21 +08:00
zhangqiang 8b56e352ba 【跨服排行榜】 2021-07-29 17:11:10 +08:00
zhangqiang 529f8e3bd2 【协议提交】 2021-07-29 16:45:06 +08:00
zhangqiang c11d9849fd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-07-29 16:38:35 +08:00
zhangqiang 9c28f232f6 【跨服排行榜】 2021-07-29 16:35:58 +08:00
jiaoyangna becf23c1af Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 16:35:25 +08:00
jiaoyangna 283f9d209a 魂印圈圈错误修改 2021-07-29 16:35:20 +08:00
wangzhenxing 8c1130e89f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 16:20:02 +08:00
wangzhenxing 126eba3f26 [称号]==========罗浮争锋三个称号特效预设修改 2021-07-29 16:19:48 +08:00
jiaoyangna 6f24638e3e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 16:10:43 +08:00
jiaoyangna 52e9f406aa 十绝阵当我的排名为0 时报错 2021-07-29 16:10:39 +08:00
wangzhenxing 2cafeecb80 [战斗]==============死亡技能不受眩晕,沉默影响 2021-07-29 15:44:23 +08:00
jiaoyangna 706ee26390 魂印分解界面特效被切修改 2021-07-29 15:31:09 +08:00
jiaoyangna 44119d5a28 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 15:21:48 +08:00
jiaoyangna 01632378f6 魂印分解界面修改 2021-07-29 15:21:44 +08:00
ZhangBiao c6598ecff4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 15:03:54 +08:00
ZhangBiao 49d4336f38 【限时召唤优化】调整适配,使部分屏幕内隐藏的召唤次数上限显示出来 2021-07-29 15:03:39 +08:00
jiaoyangna 856f03b494 【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
2021-07-29 15:01:58 +08:00
jiaoyangna 1cff130e45 【ID1017827】
【心魔试炼】dev分支心魔试炼界面底部白边
2021-07-29 14:38:13 +08:00
jiaoyangna 548e43b486 共鸣中去掉一键装备红点 2021-07-29 14:33:52 +08:00
jiaoyangna 2f47e10caf 重置提交 2021-07-29 14:20:51 +08:00
jiaoyangna 9a87435469 【ID1017808】
【天书秘卷】适配错误,文字超出显示区域
2021-07-29 14:16:07 +08:00
jiaoyangna 8ad1911755 文字大小调整 2021-07-29 13:55:50 +08:00
jiaoyangna 44965dd1c2 跨服十绝阵提交 2021-07-29 12:09:03 +08:00
jiaoyangna 50963966fa Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:53:16 +08:00
jiaoyangna beacff1d20 共鸣中的宝物去掉红点 2021-07-29 11:53:11 +08:00
gaoxin a61602eae4 【角色信息】删除服务器名称只在JUMPSERVER类型下显示的限制 2021-07-29 11:50:59 +08:00
gaoxin 1b3e5c196b 【跨服聊天】完善跨服聊天角色信息显示 2021-07-29 11:46:59 +08:00
gaoxin 381d537a4e 【登录】除流畅,拥挤和爆满外的其他状态全部不可进入游戏 2021-07-29 11:44:35 +08:00
jiaoyangna f935fb163b 层级修改提交 2021-07-29 11:34:53 +08:00
jiaoyangna 522754669f 删除log 2021-07-29 11:31:30 +08:00
jiaoyangna f50caf3ff5 清理空文件夹 2021-07-29 11:28:30 +08:00
jiaoyangna 43c4c159ed Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:27:42 +08:00
jiaoyangna dd076dfb6a 立绘删除 2021-07-29 11:25:36 +08:00
ZhangBiao 59c823e080 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:19:03 +08:00
ZhangBiao 68466c0fff 【副本界面】按钮调整 2021-07-29 11:18:53 +08:00
jiaoyangna cfdc6b0abc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:13:44 +08:00
jiaoyangna 63780c4c7a 宝物共鸣修改 2021-07-29 11:13:34 +08:00
zhangqiang 2a31ef09ce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 11:11:43 +08:00
zhangqiang 1969dd31ab Revert "【跨服切磋】"
This reverts commit cc8974c016.
2021-07-29 11:11:16 +08:00
jiaoyangna 040cd78dc4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-29 10:24:21 +08:00
jiaoyangna 12c8efa516 装备红点提交 2021-07-29 10:23:52 +08:00
ZhangBiao e1ae3e3bf3 【副本界面】按下区域大小调整 2021-07-29 10:09:02 +08:00
jiaoyangna 78c982e740 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 18:39:16 +08:00
jiaoyangna bac3e3dfa9 动画提交 2021-07-28 18:39:05 +08:00
zhangqiang cc8974c016 【跨服切磋】 2021-07-28 18:38:06 +08:00
jiaoyangna f4cc4d7df6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:46:11 +08:00
jiaoyangna 7ee1ef9910 Merge branch 'china/dev-c' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity5.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
#	Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
2021-07-28 17:45:59 +08:00
gaoxin e552db5499 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-28 17:43:04 +08:00
gaoxin ef78e0ae21 【跨服聊天】添加跨服聊天频道 2021-07-28 17:42:58 +08:00
jiaoyangna 957513db52 添加一些log 2021-07-28 17:41:48 +08:00
jiaoyangna 0d16b1511a 资源删除工具修改提交 2021-07-28 17:26:13 +08:00
jiaoyangna b98fd71d35 删除资源工具提交 2021-07-28 17:00:14 +08:00
jiaoyangna 55c839dcd0 Revert "Revert "红点修改提交""
This reverts commit d53776b558.
2021-07-28 16:59:07 +08:00
jiaoyangna 8c01285354 Revert "Revert "强化和精炼界面修改""
This reverts commit 4c9871767f.
2021-07-28 16:59:00 +08:00
jiaoyangna 7ac8f03cd3 Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
2021-07-28 16:58:52 +08:00
jiaoyangna ab7c586a90 Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63.
2021-07-28 16:58:44 +08:00
jiaoyangna 93a9473184 红点修改提交 2021-07-28 16:52:41 +08:00
ZhangBiao 33edb62796 【锻器阁】增加魂印合成引导 2021-07-28 16:45:29 +08:00
wangzhenxing 68e3a32140 [bug]====称号层级修改 2021-07-28 16:41:37 +08:00
wangzhenxing ef714577e8 [bug]========称号显示修改 2021-07-28 16:10:58 +08:00
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
jiaoyangna ad850da05f 宝物共鸣修改 2021-07-28 15:40:50 +08:00