wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								607104b4ca
								
							
								
							
						 | 
						
							
							
								
								[战斗]白骨精技能,被动,魂印效果提交
							
							
							
							
							
						 | 
						
							2020-12-22 11:59:26 +09:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f97901cbe0
								
							
								
							
						 | 
						
							
							
								
								【增加跳转】增加跳转id
							
							
							
							
							
						 | 
						
							2020-12-22 10:14:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								88ba4edad9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-12-21 19:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d910facacf
								
							
								
							
						 | 
						
							
							
								
								【装备】装备出售界面文字显示修改
							
							
							
							
							
						 | 
						
							2020-12-21 19:30:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f4ea0eddfc
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】修改
							
							
							
							
							
						 | 
						
							2020-12-21 19:26:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cd3548164a
								
							
								
							
						 | 
						
							
							
								
								【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
							
							
							
							
							
						 | 
						
							2020-12-21 18:45:43 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								c9d8df2c74
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】拍脸修改 有表 张强提交
							
							
							
							
							
						 | 
						
							2020-12-24 21:02:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								93f1fe8655
								
							
								
							
						 | 
						
							
							
								
								【优化】橙色改为金色
							
							
							
							
							
						 | 
						
							2020-12-21 16:31:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								642ae52cfa
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】 提交
							
							
							
							
							
						 | 
						
							2020-12-18 20:42:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								48c9384fde
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复修改
							
							
							
							
							
						 | 
						
							2020-12-18 17:58:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c699c2f216
								
							
								
							
						 | 
						
							
							
								
								【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据
							
							
							
							
							
						 | 
						
							2020-12-18 16:27:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a1dcc091fd
								
							
								
							
						 | 
						
							
							
								
								【主题活动】删除多余的预设
							
							
							
							
							
						 | 
						
							2020-12-18 14:03:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c50ba93285
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】重置事件点不触发修复
							
							
							
							
							
						 | 
						
							2020-12-18 12:00:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								004c56ce90
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】修改
							
							
							
							
							
						 | 
						
							2020-12-18 10:57:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9b83785b6d
								
							
								
							
						 | 
						
							
							
								
								【系统消息】添加法宝等级的显示
							
							
							
							
							
						 | 
						
							2020-12-18 09:56:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6c57e730dd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-12-17 19:24:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c4fb8f85a8
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】修改
							
							
							
							
							
						 | 
						
							2020-12-17 19:24:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f784532f31
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-12-17 18:36:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								abc76576b6
								
							
								
							
						 | 
						
							
							
								
								【战报系统】代码添加
							
							
							
							
							
						 | 
						
							2020-12-17 18:36:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								96ab4566ba
								
							
								
							
						 | 
						
							
							
								
								【战斗】 188被动修改 间接伤害不会被义结金兰分摊
							
							
							
							
							
						 | 
						
							2020-12-17 18:24:44 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3e6c6a8fe5
								
							
								
							
						 | 
						
							
							
								
								【战斗】 142被动效果修改 间接伤害不会触发回血
							
							
							
							
							
						 | 
						
							2020-12-17 18:00:15 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4184907033
								
							
								
							
						 | 
						
							
							
								
								[战斗]284效果修改,非技能伤害不会回血
							
							
							
							
							
						 | 
						
							2020-12-17 17:41:12 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ce527ef108
								
							
								
							
						 | 
						
							
							
								
								[战斗]  链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害  ,舍身济世伤害不触发284被动
							
							
							
							
							
						 | 
						
							2020-12-17 16:51:22 +09:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cfc4f0f0f6
								
							
								
							
						 | 
						
							
							
								
								[天相几人]图片提交
							
							
							
							
							
						 | 
						
							2020-12-17 15:46:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bcef9f04f5
								
							
								
							
						 | 
						
							
							
								
								[主题活动]
							
							
							
							
							
						 | 
						
							2020-12-17 15:34:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6ca1f1980b
								
							
								
							
						 | 
						
							
							
								
								提交协议
							
							
							
							
							
						 | 
						
							2020-12-16 20:37:36 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								74aef8e711
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/跨服十绝阵' into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua 
							
						 | 
						
							2020-12-16 20:27:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								944cff4976
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】主界面修改提交
							
							
							
							
							
						 | 
						
							2020-12-16 20:25:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								476edb6428
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】 修改提交
							
							
							
							
							
						 | 
						
							2020-12-16 20:18:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								76db4f2db9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-12-16 17:25:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e7f6bf85de
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】代码修改提交
							
							
							
							
							
						 | 
						
							2020-12-16 17:24:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d847323693
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-12-16 17:24:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								56eb6c613a
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】移动过程中打开其他界面问题修复
							
							
							
							
							
						 | 
						
							2020-12-16 17:23:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ec7b10d08e
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/跨服天梯' into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua 
							
						 | 
						
							2020-12-16 17:21:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								37336acb66
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】提交
							
							
							
							
							
						 | 
						
							2020-12-16 17:04:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								548d0af299
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 zbj音效替换
							
							
							
							
							
						 | 
						
							2020-12-16 16:32:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a03b4e9c5a
								
							
								
							
						 | 
						
							
							
								
								【青龙秘宝】青龙秘宝等级购买报错修复
							
							
							
							
							
						 | 
						
							2020-12-16 14:23:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8ffc2047e5
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 zbj技能音效提交
							
							
							
							
							
						 | 
						
							2020-12-16 11:35:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fd28024dc2
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】提交
							
							
							
							
							
						 | 
						
							2020-12-16 11:28:57 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								9546fe1477
								
							
								
							
						 | 
						
							
							
								
								【资源】猪八戒小头像大卡牌
							
							
							
							
							
						 | 
						
							2020-12-15 16:44:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f5fface274
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】修改提交
							
							
							
							
							
						 | 
						
							2020-12-15 13:59:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bdb9eeba2d
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 猪八戒新皮肤 live2d
							
							
							
							
							
						 | 
						
							2020-12-15 10:21:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cd4735e17f
								
							
								
							
						 | 
						
							
							
								
								【资源导入】猪八戒新皮肤特效
							
							
							
							
							
						 | 
						
							2020-12-15 10:11:02 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9630a4a016
								
							
								
							
						 | 
						
							
							
								
								【套装属性】 bug修改
							
							
							
							
							
						 | 
						
							2020-12-14 17:52:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								66c74f5a76
								
							
								
							
						 | 
						
							
							
								
								【装备套装】
							
							
							
							
							
						 | 
						
							2020-12-12 17:08:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								09cea38bbd
								
							
								
							
						 | 
						
							
							
								
								【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复
							
							
							
							
							
						 | 
						
							2020-12-12 13:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8b98b9e7e3
								
							
								
							
						 | 
						
							
							
								
								【战斗】检测不灭的方式修改
							
							
							
							
							
						 | 
						
							2020-12-11 18:10:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cedbc1222f
								
							
								
							
						 | 
						
							
							
								
								【装备套装】 套装属性向下兼容
							
							
							
							
							
						 | 
						
							2020-12-11 17:33:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								82eeaa5084
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】诸多bug修复
							
							
							
							
							
						 | 
						
							2020-12-11 17:21:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6ef26cdc8f
								
							
								
							
						 | 
						
							
							
								
								博闻强识图片修改
							
							
							
							
							
						 | 
						
							2020-12-11 15:33:50 +08:00 |