Commit Graph

2952 Commits (1465efa8b25e544ec386e083b6c300d066611583)

Author SHA1 Message Date
jiaoyangna 1465efa8b2 活动 提交 2021-03-30 20:32:05 +08:00
jiaoyangna 23b46ba218 活动 修改提交 2021-03-30 20:17:26 +08:00
jiaoyangna c2fac79eca 活动 提交 2021-03-30 18:26:10 +08:00
jiaoyangna a0552233ae Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-03-30 16:15:49 +08:00
ZhangBiao fd9fc05994 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 14:34:40 +08:00
ZhangBiao 289af5b209 【活动优化】青龙秘宝界面优化 2021-03-30 14:34:25 +08:00
jiaoyangna b67066cc66 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 14:22:46 +08:00
jiaoyangna 1ecb48c233 修改限时召唤图片 2021-03-30 14:22:37 +08:00
zhangqiang 4d3bbe4cfd 【称号坐骑时装】大闹天宫修改 2021-03-30 14:13:16 +08:00
jiaoyangna 87e724d19d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/functions.lua
2021-03-30 13:48:08 +08:00
jiaoyangna ed1d9a2b1f Merge branch '0功能/天书秘卷' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 13:46:49 +08:00
ZhangBiao 73981e7200 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 13:43:59 +08:00
ZhangBiao a0fb7f5714 【天宫寻宝】按钮增加特效 2021-03-30 13:43:46 +08:00
zhangqiang 2122997c3d 【称号坐骑时装】修改 2021-03-30 11:38:20 +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
jiaoyangna 4e83f9a540 Merge branch 'china/dev' into 0活动开发聚集地/活动拆分归类
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-03-30 10:50:57 +08:00
jiaoyangna ae51b547d5 活动提交 2021-03-30 10:48:34 +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
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
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
jiaoyangna da3b21d024 每日豪礼修改 2021-03-27 19:25:04 +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