Commit Graph

1214 Commits (784ace13b50e85e54e35ba93273da36c7eb4023a)

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
ZhangBiao 685ace078a 【福星高照】增加协议 2021-03-30 18:50:15 +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 c2fac79eca 活动 提交 2021-03-30 18:26:10 +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
zhangqiang aabe3e082f 【归元修改】资源提交 2021-03-30 17:31:44 +08:00
zhangqiang 9faf244e40 【归元修改】 神将 法宝 归元修改 2021-03-30 16:36:00 +08:00
ZhangBiao ee778776a1 【福星高照】提交 2021-03-30 16:24:28 +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 289af5b209 【活动优化】青龙秘宝界面优化 2021-03-30 14:34:25 +08:00
jiaoyangna e6ad1d141d mainpanel 提交 2021-03-30 13:56:50 +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 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 25e351dba3 【称号坐骑时装】修改 2021-03-30 10:28:03 +08:00
ZhangBiao 8796bf4957 【福星高照】提交 2021-03-30 10:27:18 +08:00
zhangqiang 3115c6f586 【称号坐骑时装】界面修改 2021-03-29 18:42:47 +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 918beb5c35 【法宝】界面特效资源位置全面屏显示错误 2021-03-29 15:37:25 +08:00
jiaoyangna c16e912777 成长礼包,每日礼包修改提交 2021-03-29 15:16:32 +08:00
gaoxin a599ef10f9 【红点添加】限时兑换添加红点提示 2021-03-29 14:37:15 +08:00
ZhangBiao e0d05e175e 【福星高照】提交 2021-03-29 09:52:53 +08:00
zhangqiang 9637337c39 【称号坐骑时装】 修改提交 2021-03-27 20:01:39 +08:00
gaoxin e060430d61 【公会红包】修复滑动导致按钮位置错误 2021-03-27 15:20:26 +08:00
zhangqiang 095701c33f 【称号时装坐骑】初提 2021-03-26 20:06:08 +08:00
gaoxin fd5ef82b5f 【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题 2021-03-26 10:13:05 +08:00
jiaoyangna 8aa411244e 灵兽秘卷修改提交 2021-03-25 16:21:34 +08:00
jiaoyangna 299a7ceff1 【天书秘卷】 修改 2021-03-25 15:34:05 +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
gaoxin 8644d27aaa 【界面优化】部分界面显示优化修改 2021-03-23 17:26:16 +08:00
jiaoyangna fbed4d34ff 解锁条件修改 2021-03-23 17:10:04 +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
zhangqiang 3618464a15 【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格 2021-03-23 16:22:57 +08:00
jiaoyangna 3334257425 添加天书秘卷入口 2021-03-23 15:37:39 +08:00
jiaoyangna cfa63c1830 筛选提交 2021-03-23 15:23:37 +08:00
jiaoyangna 2e31e176cc 红点提交 2021-03-23 15:16:38 +08:00
gaoxin 1b9173f931 【bug】修复充值界面在全面屏下文字显示不全的问题-expertpanel 2021-03-23 14:25:11 +08:00
gaoxin 671edf8366 【bug】修复充值界面在全面屏下文字显示不全的问题 2021-03-23 14:22:25 +08:00
ZhangBiao dfa2efdc76 【大闹天宫】查看圣物文字过小调整 2021-03-23 10:11:36 +08:00
ZhangBiao 83040f2c87 【主城】预设结构调整 2021-03-23 09:54:11 +08:00
gaoxin 52cace8d64 【公会】援助界面文字和进度条分离显示 2021-03-22 20:17:06 +08:00
ZhangBiao 207d85e2a2 【牛气冲天】提交 2021-03-22 20:08:18 +08:00
wangzhenxing 1e2db6040e 皮肤称号坐骑预设修改 2021-03-22 17:31:55 +08:00
zhangqiang d9dcba2574 【称号坐骑皮肤-----------】开始 2021-03-22 16:16:25 +08:00
jiaoyangna a4facd8d13 天书秘卷 2021-03-22 15:16:29 +08:00
zhangqiang 2c3d846d04 【化虚坛加名字】 2021-03-19 18:26:54 +08:00
zhangqiang 853db67d9a 【化虚坛去掉屏蔽神将】 2021-03-19 18:00:46 +08:00
ZhangBiao 65f994b37b 【牛气冲天】提交 2021-03-19 15:16:49 +08:00
jiaoyangna ec8ff74e61 Merge branch 'china/dev' into 0功能/天书秘卷 2021-03-19 15:11:37 +08:00
jiaoyangna beb93b5ed9 天书秘卷 2021-03-19 14:37:24 +08:00
gaoxin 1b3e9460fe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 14:19:13 +08:00
gaoxin e9968d8517 【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置 2021-03-19 14:19:05 +08:00
jiaoyangna 7986167a58 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 11:46:12 +08:00
jiaoyangna 9b25228d56 【日常副本】页签左滑不复位 2021-03-19 11:46:00 +08:00
gaoxin 1320371eac 【优化】删除登录区服显示-选择区服界面文字位置修改 2021-03-19 11:43:20 +08:00
gaoxin 367f319b81 【优化】删除登录区服显示 2021-03-19 11:37:22 +08:00
gaoxin 3a43473a0c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 10:28:50 +08:00
gaoxin c334f2df54 【bug】版号信息显示错误 2021-03-19 10:28:33 +08:00
ZhangBiao cde26e679b 2021-03-18 20:34:49 +08:00
zhangqiang e8acbe1c86 【自选箱提交】 2021-03-18 15:15:54 +08:00
ZhangBiao 487cd87339 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 14:42:34 +08:00
ZhangBiao b479a8fa8b 首领来袭 2021-03-18 14:40:47 +08:00
zhangqiang 8200e72dd2 【神将碎片箱子】需要向下移,到框里 2021-03-18 14:25:05 +08:00
ZhangBiao db3340d779 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 14:10:29 +08:00
ZhangBiao 97ae8966d7 【充值界面】 2021-03-18 14:10:23 +08:00
gaoxin 0f8f51eded 【bug】武将—>神将 2021-03-18 14:02:16 +08:00
gaoxin a01f1024ec 【优化】挂机奖励提升内容位置调整 2021-03-18 13:47:03 +08:00
ZhangBiao 30c05503c1 【累充】 2021-03-18 11:23:15 +08:00
ZhangBiao 0d1c61ec89 【累计充值】 2021-03-18 10:47:20 +08:00
ZhangBiao 95ee2d301d 【主题活动】 2021-03-18 10:30:21 +08:00
ZhangBiao 2ba7583da3 【中文元修改】 2021-03-18 10:27:36 +08:00
jiaoyangna 98e2ad0e3b 【美元显示】解锁青龙秘宝 2021-03-18 09:56:02 +08:00
ZhangBiao 84788732a2 首充金额修改 2021-03-17 19:06:15 +08:00
gaoxin 7b28309e1c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:30:18 +08:00
gaoxin 40bfa7c586 【配置】国内相关修改 2021-03-17 17:30:13 +08:00
zhangqiang f2b3df9721 【修改提交】 2021-03-17 17:27:53 +08:00
zhangqiang d5f34e516c 【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉 2021-03-17 16:56:02 +08:00
jiaoyangna adb3a1e750 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:20:22 +08:00
ZhangBiao 2e685100ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:17:50 +08:00
ZhangBiao c8661ab384 【首领来袭】任务过小修改, 2021-03-17 16:17:41 +08:00
zhangqiang 38a6548a52 【充值】开服成长礼包道具太多,会重叠。 2021-03-17 16:15:55 +08:00
jiaoyangna 5963eb170b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:04:31 +08:00
zhangqiang 125a393167 【修bug】 2021-03-17 15:54:45 +08:00
jiaoyangna 95351b5bd1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 15:03:54 +08:00
ZhangBiao 4efb36a195 【八日登陆】资源修改 2021-03-17 14:37:56 +08:00
jiaoyangna 909ed03c04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 13:33:22 +08:00
ZhangBiao bf3d732b69 【中文本地化】 2021-03-17 12:05:44 +08:00
jiaoyangna 31b808209e 主界面修改提交 2021-03-17 11:55:02 +08:00
jiaoyangna dfd3c4acc6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 11:54:40 +08:00
ZhangBiao 15dec90220 【本地化】修改 2021-03-17 11:29:43 +08:00
jiaoyangna 36f4efedc8 主城优化修改 2021-03-17 10:38:07 +08:00