Commit Graph

2907 Commits (a0fb7f5714950f4c10c54115f85a425e3edca219)

Author SHA1 Message Date
ZhangBiao a0fb7f5714 【天宫寻宝】按钮增加特效 2021-03-30 13:43:46 +08:00
ZhangBiao d156471087 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 11:25:21 +08:00
ZhangBiao 32146997e4 【寻宝优化】优化天宫寻宝界面 2021-03-30 11:25:07 +08:00
zhangqiang 33b4da13b3 【英雄升级特效显示修改】 2021-03-30 10:38:59 +08:00
zhangqiang fb57fc97d8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 10:28:12 +08:00
zhangqiang 25e351dba3 【称号坐骑时装】修改 2021-03-30 10:28:03 +08:00
jiaoyangna eba43f84e2 删除log 2021-03-29 20:27:45 +08:00
jiaoyangna 02ee675843 每日豪礼修改提交 2021-03-29 20:20:02 +08:00
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 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
jiaoyangna e7dff66a4f 品阶错误修改 2021-03-29 10:15:25 +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
JieLing 5883b66fca 【十绝阵】开服3天内通过公会御令获取途径可以进入 2021-03-27 17:44:05 +08:00
gaoxin 0688f20ad6 【心魔试炼】排行榜有空格 2021-03-27 15:32:59 +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
ZhangBiao b7c51cbf48 【牛气冲天】红点bug提交
(cherry picked from commit af8f9e0f409980ed6c85b205cb2c0503b4c9e301)
2021-03-25 16:33:33 +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
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
ZhangBiao 5768d133f0 【牛气冲天】提交 2021-03-25 10:34:11 +08:00
ZhangBiao 3a5b35a399 【牛气冲天】提交 2021-03-25 09:58:36 +08:00
gaoxin 17f0a9ed1e 【bug】零元礼包不再算做充值,修复第一天领取零元礼包,第二天充值会解锁第二天的首充礼包,但不能领取的问题。同时修复领取0元礼包也会导致自动弹出首充的问题。 2021-03-24 21:06:02 +08:00
zhangqiang d00236d6d0 【称号 时装 坐骑】 协议数据提交 2021-03-24 21:05:31 +08:00
ZhangBiao e8219c11b0 【牛气冲天】提交 2021-03-24 20:19:40 +08:00
jiaoyangna f972b1646a 主题活动提交 2021-03-24 18:16:30 +08:00
jiaoyangna b0887238d0 主题活动修改提交 2021-03-24 18:01:33 +08:00
ZhangBiao 481540080b 【牛气冲天】提交 2021-03-24 17:06:20 +08:00
zhangqiang 6f0593707f 【十绝阵个人排行】不显示玩家名字 2021-03-24 16:32:31 +08:00
zhangqiang 4939c4da92 【称号坐骑时装】部分资源提交 2021-03-24 16:31:14 +08:00
ZhangBiao b63845938a 【牛气冲天】提交 2021-03-24 13:43:56 +08:00