Commit Graph

4888 Commits (cff04dc5203ef51a54fe6872ac0f84d427d8f272)
 

Author SHA1 Message Date
zhangqiang 76c9760993 Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
2021-03-29 17:56:19 +08:00
zhangqiang db6f2d0b32 【称号坐骑时装】提交 2021-03-29 17:53:40 +08:00
gaoxin 3ecded4430 【假战斗优化】运营活动、充值活动相关的假战斗跳过改为直接解锁,而不需要等玩家到达30级 2021-03-29 17:11:25 +08:00
gaoxin 91e13dc314 【超值基金】月卡不开超值基金不显示 2021-03-29 16:52:23 +08:00
zhangqiang cbdfb75576 【称号坐骑时装】提交 2021-03-29 16:45:04 +08:00
gaoxin 918beb5c35 【法宝】界面特效资源位置全面屏显示错误 2021-03-29 15:37:25 +08:00
jiaoyangna c16e912777 成长礼包,每日礼包修改提交 2021-03-29 15:16:32 +08:00
gaoxin 2a0ce862ae 【红点添加】限时兑换添加红点提示-关闭红点log 2021-03-29 14:54:13 +08:00
gaoxin a599ef10f9 【红点添加】限时兑换添加红点提示 2021-03-29 14:37:15 +08:00
zhangqiang 51bb90edce 【称号坐骑时装】 协议 无尽副本修改 2021-03-29 12:07:28 +08:00
gaoxin d575ddd70d 【技能资源】修复金吒技能报错 2021-03-29 11:30:07 +08:00
gaoxin f3185f7fe4 【导表工具】修复切换表路径,会导致所有表删除,需要再次导入的问题 2021-03-29 10:53:46 +08:00
jiaoyangna e7dff66a4f 品阶错误修改 2021-03-29 10:15:25 +08:00
ZhangBiao e0d05e175e 【福星高照】提交 2021-03-29 09:52:53 +08:00
DESKTOP-98AVA47\Administrator afa1204341 【称号坐骑时装】三界降魔修改位置 2021-03-29 00:09:21 +07:00
ZhangBiao 739eb8771c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 20:09:19 +08:00
ZhangBiao 104aeb9078 【适配】三界除魔 2021-03-31 20:09:10 +08:00
zhangqiang 9637337c39 【称号坐骑时装】 修改提交 2021-03-27 20:01:39 +08:00
jiaoyangna c131b4e521 每日豪礼修改
(cherry picked from commit da3b21d024)
2021-03-27 19:26:59 +08:00
jiaoyangna da3b21d024 每日豪礼修改 2021-03-27 19:25:04 +08:00
gaoxin 5ae49a698d 【特效】嫦娥,金吒特效修改 2021-03-27 19:02:40 +08:00
JieLing 5883b66fca 【十绝阵】开服3天内通过公会御令获取途径可以进入 2021-03-27 17:44:05 +08:00
gaoxin 0688f20ad6 【心魔试炼】排行榜有空格 2021-03-27 15:32:59 +08:00
gaoxin e060430d61 【公会红包】修复滑动导致按钮位置错误 2021-03-27 15:20:26 +08:00
gaoxin fbfb02fc34 【聊天】公会消息缓存添加,暂时删除公会红包跑马灯 2021-03-27 14:58:57 +08:00
zhangqiang 095701c33f 【称号时装坐骑】初提 2021-03-26 20:06:08 +08:00
gaoxin d48458f417 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-26 14:33:21 +08:00
gaoxin a1778caa65 【公会红包】修复充值后报错扽问题 2021-03-26 14:33:12 +08:00
ZhangBiao ad3b3c3e45 【牛气冲不动了】 2021-03-26 14:05:25 +08:00
ZhangBiao dc187723c8 【牛气冲天】upview修改2
(cherry picked from commit 5d33070a00ca7b5c337522e0eb1b94cac304391e)
2021-03-26 14:00:30 +08:00
ZhangBiao b7cff350f9 【牛气冲天】修改 2021-03-26 13:56:01 +08:00
ZhangBiao 3c31b5b5bd Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-26 13:49:56 +08:00
ZhangBiao dc50f89214 【牛气冲天】upview提交 2021-03-26 13:49:41 +08:00
gaoxin b18ad8487a 【战斗】casting层级调整,失败界面打开1秒后才能关闭 2021-03-26 12:15:48 +08:00
gaoxin cb15f601b3 【聊天】去除登录之前的消息不显示的限制 2021-03-26 11:31:14 +08:00
gaoxin 1801a3d820 【十绝阵】排名数据超过20,滑动时显示错误的问题 2021-03-26 11:17:46 +08:00
gaoxin fd5ef82b5f 【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题 2021-03-26 10:13:05 +08:00
ZhangBiao b7c51cbf48 【牛气冲天】红点bug提交
(cherry picked from commit af8f9e0f409980ed6c85b205cb2c0503b4c9e301)
2021-03-25 16:33:33 +08:00
jiaoyangna 8aa411244e 灵兽秘卷修改提交 2021-03-25 16:21:34 +08:00
jiaoyangna cfa67e8479 删除log 2021-03-25 15:34:57 +08:00
jiaoyangna 299a7ceff1 【天书秘卷】 修改 2021-03-25 15:34:05 +08:00
ZhangBiao 3b99759f6f 【牛气冲天】报空修复
(cherry picked from commit 756e920596af01046ab53a971423b77243a42678)
2021-03-25 15:20:19 +08:00
ZhangBiao 16853d09c3 【牛气冲天】物品特效、红点检测
(cherry picked from commit 11fb7cc1876c48ec26617da94405812861c4b4b1)
2021-03-25 15:02:13 +08:00
ZhangBiao 0a4d9a925b 【牛气冲天】主城报错提交 2021-03-25 11:35:25 +08:00
jiaoyangna dd075e3c4c itemview 灰色修改 2021-03-25 11:33:44 +08:00
ZhangBiao 24fa8c17e2 Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-03-25 11:13:37 +08:00
ZhangBiao 304a175fc8 【牛气冲天】完成 2021-03-25 11:00:58 +08:00
jiaoyangna 4f188f1ef1 未进版本功能隐藏 2021-03-25 10:57:54 +08:00
jiaoyangna 10f239582a 激活两次修改 2021-03-25 10:45:50 +08:00
gaoxin c8327cbb92 【森罗幻境】临时修改数据类型不统一导致战斗报错的问题 2021-03-25 10:43:53 +08:00