Commit Graph

146 Commits (448c5d3b17e596b6ae266f9a54ee921c46967bc5)

Author SHA1 Message Date
ZhangBiao c9cb029494 无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
2020-08-18 10:49:21 +08:00
zhangqiang cdf78a9dcf 剑影仙踪资源提交 2020-08-17 15:59:33 +08:00
jiaoyangna 17524007d7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-17 15:18:03 +08:00
jiaoyangna 0210dc3109 conflict commit 2020-08-17 15:17:58 +08:00
ZhangBiao 77b3386efb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-17 11:57:01 +08:00
ZhangBiao c2fdcb06bd 极速达人 2020-08-17 11:56:38 +08:00
zhangqiang 6df142b067 修改bug 分解吞宝器 宝器穿的不显示属性 婚姻副本跳转 宝器合成背景隐藏 2020-08-17 11:39:41 +08:00
ZhangBiao 2063690199 2020-08-14 23:34:23 +08:00
ZhangBiao 416d6eb16c 每日签到 2020-08-13 22:30:09 +08:00
ZhangBiao e655562a71 2020-08-13 17:07:05 +08:00
jiaoyangna fbf7c3b41d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-13 14:44:53 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
ZhangBiao dd3c814c2a 四元阵中 添加 置换入口 2020-08-13 14:43:10 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
zhangqiang 783583404e 神将合成修改提交 2020-08-12 20:59:20 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
jiaoyangna 95dff6f0e9 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2020-08-12 14:20:45 +08:00
ZhangBiao 06bc9c1f1d Merge branch '0功能/法宝归元和神将置换' into master_develop2
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2020-08-12 14:15:27 +08:00
ZhangBiao ed319be87e 神将置换 2020-08-12 14:13:16 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +08:00
jiaoyangna f7fe1d9513 Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	data_execl/base_data/GlobalActivity.xlsx
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
2020-08-11 14:07:10 +08:00
jiaoyangna 3d2f288934 轩辕宝镜提交 2020-08-11 09:48:21 +08:00
zhangqiang 93e1d880c8 英雄合成界面拼接 2020-08-06 18:34:04 +08:00
jiaoyangna 16d4b6477d no message 2020-08-06 17:37:07 +08:00
jiaoyangna 22b02b5cca encoding convert 2020-08-06 17:35:07 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna 5c13a25bb5 encoding convert 2020-08-06 17:37:42 +08:00
ZhangBiao ed373d1851 Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换 2020-08-06 10:43:28 +08:00
ZhangBiao 44497f73bd 神将置换页面制作1 2020-08-06 10:43:11 +08:00
zhangqiang 3bb0906865 法宝归元中文表 2020-08-06 10:38:55 +08:00
zhangqiang 4533695a3d 法宝归元界面提交 2020-08-07 12:22:10 +08:00
ZhangBiao ee19d26bd3 神将置换界面创建 2020-08-05 15:36:22 +08:00
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
2020-08-07 06:54:04 +08:00
ZhangBiao 989703a0e4 乾坤宝盒单抽bug修复、四元阵赠送“元神玉” 2020-08-04 20:30:26 +08:00
zhangqiang 7b73f4ae77 升星成功界面加天赋解锁显示 2020-08-04 17:24:15 +08:00
zhangqiang 0a8bdc5765 援助 十绝阵 合成 提示性bug 2020-08-04 14:02:28 +08:00
ZhangBiao 0cd5ffca9d 魂印特效关闭 2020-08-03 16:11:04 +08:00
skuld 3f5fdf3ec1 修改大闹天宫BOSS名字 2020-07-31 16:42:35 +08:00
ZhangBiao ab8889ae8c 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
jiaoyangna 242896fede add soulprint effect commit 2020-08-02 09:16:45 +08:00
ZhangBiao dd06fc4652 充值入口恢复,加 充值switch 2020-07-31 13:35:15 +08:00
jiaoyangna b9084626eb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 17:51:40 +08:00
jiaoyangna b2af34a2b3 副本红点提交 2020-07-29 17:50:15 +08:00
zhangqiang b2a54634d2 适配调整 巅峰赛入口 2020-08-15 00:08:25 +08:00
gaoxin f058668af6 修复红点id重复,导致聊天红点显示错误的问题 2020-07-29 11:39:52 +08:00
ZhangBiao 2731d973fb 删除跳过按钮的首充提示 2020-07-29 02:32:07 +08:00
ZhangBiao 4f14ee8599 商店金币位数调整 2020-07-28 23:25:43 +08:00
jiaoyangna bf77931b88 边框修改提交 2020-07-28 18:38:19 +08:00
jiaoyangna 25d535fa4c 关闭特效 2020-07-28 16:57:12 +08:00
ZhangBiao e2a8af9028 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 16:45:38 +08:00