Commit Graph

6190 Commits (0f18eaf86ce91eced923ea5b3e180f789e399249)
 

Author SHA1 Message Date
gaoxin 0f18eaf86c Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab
#	Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua
2021-05-24 14:15:30 +08:00
gaoxin acc2609df6 【本地化】公告 2021-05-24 14:09:11 +08:00
ZhangBiao fa051b65dc 【修行】QA增加 2021-05-24 13:58:30 +08:00
ZhangBiao 04140ca1f2 【修行】神印按钮条件 2021-05-24 13:48:07 +08:00
ZhangBiao d9b465c7cf 【修行】英雄选择界面修改 2021-05-24 12:02:20 +08:00
ZhangBiao dade783281 【修行】英雄选择界面修改 2021-05-24 11:53:44 +08:00
wangzhenxing d8bfab9427 称号 超凡入圣 图片特效贴图修改 2021-05-24 11:38:01 +08:00
DESKTOP-98AVA47\Administrator 2c870933d5 【充值】删除充值界面的文字显示 2021-06-03 00:31:34 +08:00
ZhangBiao 040f83f370 【修行】红点调整 2021-05-24 11:34:50 +08:00
ZhangBiao 82a0370730 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-24 11:22:07 +08:00
ZhangBiao 70729ca2d0 【修行】增加红点 2021-05-24 11:21:56 +08:00
wangzhenxing 368f6b7b64 超凡入圣称号特效贴图修改提交 2021-05-24 11:17:44 +08:00
jiaoyangna 4ced80cf6a 福星高照,牛气冲天 提交 2021-05-24 11:08:16 +08:00
ZhangBiao daf5a675f8 【修行】预览界面资源添加 2021-05-22 18:52:49 +08:00
ZhangBiao b64e85bc2c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-22 18:20:14 +08:00
ZhangBiao 165ad7a2de 【修行】提交 2021-05-22 18:20:07 +08:00
zhangqiang 29622ac19a 【英雄小头像替换】 2021-05-22 17:58:47 +08:00
jiaoyangna 3bd06ba84b 【主题活动】活动商店背景图不正确,需要统一,类似社稷大典或乾坤宝盒商店这些商店等。 2021-05-22 17:17:43 +08:00
jiaoyangna f3e48f1d38 牛气冲天按钮提交 2021-05-22 17:10:16 +08:00
zhangqiang e404e26ffa 【山河社稷图】 2021-05-22 15:55:14 +08:00
zhangqiang a30616a9fc 【山河社稷图】修改 2021-05-22 15:26:30 +08:00
jiaoyangna 8719603f64 牛气冲天,福星高照修改 2021-05-22 15:20:51 +08:00
wangzhenxing 1478142476 称号资源替换提交 2021-05-22 15:02:09 +08:00
zhangqiang cb86e3efd4 【山河社稷图】 2021-05-21 19:07:46 +08:00
wangzhenxing d95768226b 红包红点显示修改 2021-05-21 18:18:53 +08:00
wangzhenxing 9b336aeda9 主城报错修改提交 2021-05-21 18:13:21 +08:00
wangzhenxing cade21c700 主城报错修改提交 2021-05-21 18:00:25 +08:00
wangzhenxing ead8668479 福利红包修改提交 2021-05-21 17:32:52 +08:00
zhangqiang 016667ef7e 【战斗背景音乐】 山河社稷图入口文字 2021-05-21 16:38:20 +08:00
zhangqiang d2a53631d6 【山河社稷图】提交 2021-05-21 16:21:07 +08:00
gaoxin 24e02b07c6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-21 15:31:48 +08:00
gaoxin f6067f4402 【战斗】跳过优化 2021-05-21 15:31:40 +08:00
zhangqiang 4aaa6b29de 【山河社稷图】入口 + 特权修改 2021-05-21 15:29:14 +08:00
wangzhenxing db3b58ea8e 合并冲突提交 2021-05-21 15:05:09 +08:00
wangzhenxing 6ab70e6e8d 【功能】==========公会红包 2021-05-21 14:47:04 +08:00
zhangqiang 1ed6cbaad0 【山河社稷图】替换新资源 2021-05-21 14:37:09 +08:00
gaoxin f15fbf6576 【探宝】物品置灰后不再显示光效 2021-05-21 14:14:09 +08:00
gaoxin 5f77a01928 【meta】 2021-05-21 13:56:58 +08:00
gaoxin 3f59300826 【挂机】修复vip任务刷新不及时的问题 2021-05-21 13:55:40 +08:00
gaoxin 006eae4bd9 【死灵试炼】资源及相关代码导入,但代码未使用 2021-05-21 13:45:10 +08:00
gaoxin a8c8d08775 【挂机】优化挂机界面vip任务显示 2021-05-21 11:57:59 +08:00
gaoxin d89511a3d9 【跳转】资源条添加碎繁星辰跳转 2021-05-21 11:02:24 +08:00
gaoxin e72d1ee9c0 【挂机】优化跳转 2021-05-21 11:01:37 +08:00
gaoxin aecc6eb692 【特权优化】特权任务在关卡界面增加快捷入口 2021-05-20 21:00:29 +08:00
zhangqiang da17fb96ed 【主城修改】2 2021-05-20 20:32:04 +08:00
zhangqiang 2d4ecc8c04 Merge branch 'china/dev-c' into china/mainSceneChange 2021-05-20 20:29:41 +08:00
ZhangBiao abcc89c68f 【修行】选择神将从generalpopup到bigpopup 2021-05-20 20:23:22 +08:00
ZhangBiao 7f19809419 【修行】提交 2021-05-20 20:12:01 +08:00
ZhangBiao e51378ab3b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-20 18:00:53 +08:00
ZhangBiao 46cc1d9591 【修行】限制特权入口,增加仙尘加号 2021-05-20 18:00:45 +08:00