Commit Graph

251 Commits (62a064b33e54ed9e7622e567f1dc23287967c7f2)

Author SHA1 Message Date
ZhangBiao d61c55d24d Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 18:55:35 +08:00
gaoxin 8161aca202 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:42:38 +08:00
gaoxin 3cc0b51edd 【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题 2021-03-30 18:42:30 +08:00
jiaoyangna d860db875d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:19:12 +08:00
jiaoyangna 7d9a5a62ba 天书秘卷 提交 2021-03-30 18:18:16 +08:00
gaoxin 202658d6d9 【特权优化】将界面顶部的特权等级移回 2021-03-30 18:10:39 +08:00
ZhangBiao ee778776a1 【福星高照】提交 2021-03-30 16:24:28 +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
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
ZhangBiao 8796bf4957 【福星高照】提交 2021-03-30 10:27:18 +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
gaoxin 91e13dc314 【超值基金】月卡不开超值基金不显示 2021-03-29 16:52:23 +08:00
zhangqiang cbdfb75576 【称号坐骑时装】提交 2021-03-29 16:45:04 +08:00
zhangqiang 51bb90edce 【称号坐骑时装】 协议 无尽副本修改 2021-03-29 12:07:28 +08:00
ZhangBiao e0d05e175e 【福星高照】提交 2021-03-29 09:52:53 +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
zhangqiang 095701c33f 【称号时装坐骑】初提 2021-03-26 20:06:08 +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
jiaoyangna 646f3ae5de 新字不消失修改 2021-03-25 10:42:42 +08:00
jiaoyangna 54586ae204 天书秘卷提交 2021-03-24 10:55:33 +08:00
ZhangBiao 2c5159fc11 【五级图标显示】 2021-03-24 09:48:35 +08:00
ZhangBiao c9670aae58 【五级前不显示任何活动】 2021-03-23 20:28:31 +08:00
gaoxin 8644d27aaa 【界面优化】部分界面显示优化修改 2021-03-23 17:26:16 +08:00
jiaoyangna 298946dd2d Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-03-23 16:54:46 +08:00
jiaoyangna 44806a302d 红点提交 2021-03-23 16:52:19 +08:00
jiaoyangna 001d6e16bc 主城入口提交 2021-03-23 16:02:22 +08:00
jiaoyangna 3334257425 添加天书秘卷入口 2021-03-23 15:37:39 +08:00
ZhangBiao 83040f2c87 【主城】预设结构调整 2021-03-23 09:54:11 +08:00
jiaoyangna a79e67097e 天书秘卷提交 2021-03-22 17:05:00 +08:00
jiaoyangna 08f41d473c 天书秘卷提交 2021-03-22 16:22:55 +08:00
zhangqiang dc5d0a2d12 【修复主城人物层级bug】 2021-03-22 13:47:59 +08:00
ZhangBiao 3d665074a2 【牛气冲天】提交 2021-03-22 11:09:49 +08:00
jiaoyangna 66287434ea 天书秘卷 提交 2021-03-19 16:53:00 +08:00
ZhangBiao dfb4de8811 【限时神装】时间格式修改 2021-03-19 16:30:34 +08:00
jiaoyangna f51a4305ab 每日豪礼修改提交 2021-03-19 11:08:58 +08:00
jiaoyangna b9c5d93f0f 【每日豪礼】领完不消失 2021-03-18 18:36:21 +08:00
gaoxin 5e423f2ebe 【灵兽】灵兽入口随功能状态显隐 2021-03-18 13:36:01 +08:00
jiaoyangna 9f1f204588 主界面提交 2021-03-17 20:43:47 +08:00
jiaoyangna d6b008742b gm 提交 2021-03-17 17:34:14 +08:00
jiaoyangna ee30858c07 添加一个红点 2021-03-17 14:20:51 +08:00
jiaoyangna 31b808209e 主界面修改提交 2021-03-17 11:55:02 +08:00
jiaoyangna a7c5bcce1a 主界面修改提交 2021-03-17 11:07:47 +08:00
jiaoyangna 36f4efedc8 主城优化修改 2021-03-17 10:38:07 +08:00
ZhangBiao 37e948c9b9 【限时神装】 2021-03-13 15:09:34 +08:00
ZhangBiao 8aad1eee56 【限时神装】 2021-03-12 14:31:53 +08:00