jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								171e9a4690
								
							
								
							
						 | 
						
							
							
								
								【优化】巅峰赛,十绝阵预告图标双行文字优化
							
							
							
							
							
						 | 
						
							2020-12-24 10:45:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0054f5e646
								
							
								
							
						 | 
						
							
							
								
								【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
							
							
							
							
							
						 | 
						
							2020-12-24 10:37:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d0982716b3
								
							
								
							
						 | 
						
							
							
								
								[所向披靡] 提交
							
							
							
							
							
						 | 
						
							2020-12-24 10:24:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5a0bece22e
								
							
								
							
						 | 
						
							
							
								
								所向披靡修改
							
							
							
							
							
						 | 
						
							2020-12-24 10:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								58de2dc2b5
								
							
								
							
						 | 
						
							
							
								
								【逍遥游优化】逍遥游玩法优化内容   红点修改
							
							
							
							
							
						 | 
						
							2020-12-24 09:55:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a6e07bf1c
								
							
								
							
						 | 
						
							
							
								
								【逍遥游优化】逍遥游玩法优化内容
							
							
							
							
							
						 | 
						
							2020-12-23 20:18:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bb8321b4e3
								
							
								
							
						 | 
						
							
							
								
								【新将活动】连续抽卡妖精次数不足修复
							
							
							
							
							
						 | 
						
							2020-12-23 17:45:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8801a84c2b
								
							
								
							
						 | 
						
							
							
								
								【新将活动】商店跳转修复
							
							
							
							
							
						 | 
						
							2020-12-23 17:28:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1ba79f4627
								
							
								
							
						 | 
						
							
							
								
								【装备页面】神将一键装备功能提示   已为最强装备
							
							
							
							
							
						 | 
						
							2020-12-23 16:46:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8477ecf347
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】抽卡妖晶限购计数错误修复
							
							
							
							
							
						 | 
						
							2020-12-23 16:33:41 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9d6574d3b3
								
							
								
							
						 | 
						
							
							
								
								【优化】公会援助赠送的按钮时间间隔过长,优化按钮连续点击的效果。只加了按钮点击动画
							
							
							
							
							
						 | 
						
							2020-12-23 16:00:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4a6d8d0561
								
							
								
							
						 | 
						
							
							
								
								【优化】移除点将台界面的进入动画
							
							
							
							
							
						 | 
						
							2020-12-23 15:06:56 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								47cc019082
								
							
								
							
						 | 
						
							
							
								
								【拍脸优化】
							
							
							
							
							
						 | 
						
							2020-12-23 14:54:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4520616bd0
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容
							
							
							
							
							
						 | 
						
							2020-12-23 14:52:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								41977a85f5
								
							
								
							
						 | 
						
							
							
								
								【优化】删除十绝阵敌方阵容上的血条和怒气条
							
							
							
							
							
						 | 
						
							2020-12-23 14:52:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d0b94a1c3b
								
							
								
							
						 | 
						
							
							
								
								【新将活动】新将来袭、新疆招募、升星有礼 提交
							
							
							
							
							
						 | 
						
							2020-12-23 14:36:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								47397d8b06
								
							
								
							
						 | 
						
							
							
								
								【优化】优化编队界面,现在拖动下阵/换位的操作不流畅,经常失败
							
							
							
							
							
						 | 
						
							2020-12-23 14:32:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								02fe110563
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】公会检查跳转失败修复
							
							
							
							
							
							
							
							(cherry picked from commit 6d5a9f9f42) 
							
						 | 
						
							2020-12-23 11:38:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6fc63af086
								
							
								
							
						 | 
						
							
							
								
								【增加跳转】增加跳转id
							
							
							
							
							
						 | 
						
							2020-12-23 11:31:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								38a1eeee9a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua 
							
						 | 
						
							2020-12-23 11:29:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								239dc826df
								
							
								
							
						 | 
						
							
							
								
								【升星有礼】合并分支资源名修改
							
							
							
							
							
						 | 
						
							2020-12-23 11:22:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e40364082c
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua 
							
						 | 
						
							2020-12-23 11:21:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9e7f7454e8
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】合并分支资源名修改
							
							
							
							
							
						 | 
						
							2020-12-23 11:15:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								30f8049ef5
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2020-12-23 11:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f7f0d4099f
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】结束
							
							
							
							
							
						 | 
						
							2020-12-23 10:34:47 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								fcb2e4604a
								
							
								
							
						 | 
						
							
							
								
								【优化】提交
							
							
							
							
							
						 | 
						
							2020-12-23 10:10:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a0f059ca9b
								
							
								
							
						 | 
						
							
							
								
								【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
							
							
							
							
							
						 | 
						
							2020-12-21 18:45:58 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								b11cf4dfe3
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】拍脸修改 有表 张强提交
							
							
							
							
							
						 | 
						
							2020-12-24 21:04:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f26796653d
								
							
								
							
						 | 
						
							
							
								
								【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
							
							
							
							
							
						 | 
						
							2020-12-21 18:45:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8d245aab44
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】开坑
							
							
							
							
							
						 | 
						
							2020-12-21 17:13:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								03e3d77bb6
								
							
								
							
						 | 
						
							
							
								
								【优化】橙色改为金色
							
							
							
							
							
						 | 
						
							2020-12-21 16:15:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								12760d7cb1
								
							
								
							
						 | 
						
							
							
								
								【升星有礼】完成
							
							
							
							
							
						 | 
						
							2020-12-21 15:41:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3262a6203c
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】连续捐献-1修复
							
							
							
							
							
							
							
							(cherry picked from commit 1d5551eee7) 
							
						 | 
						
							2020-12-21 14:19:41 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								fa24af770b
								
							
								
							
						 | 
						
							
							
								
								【协议】战斗协议添加id字段
							
							
							
							
							
						 | 
						
							2020-12-18 19:38:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								79f6090afb
								
							
								
							
						 | 
						
							
							
								
								【协议】回滚系统消息item字段类型
							
							
							
							
							
						 | 
						
							2020-12-18 18:22:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eeb7ecba91
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复修改
							
							
							
							
							
						 | 
						
							2020-12-18 18:01:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ec47ec2b1c
								
							
								
							
						 | 
						
							
							
								
								【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据
							
							
							
							
							
						 | 
						
							2020-12-18 16:51:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ef1ced3ef7
								
							
								
							
						 | 
						
							
							
								
								【战报系统】基础功能添加
							
							
							
							
							
						 | 
						
							2020-12-18 16:51:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								72f2dd0e90
								
							
								
							
						 | 
						
							
							
								
								【主题活动】删除多余的预设
							
							
							
							
							
						 | 
						
							2020-12-18 14:05:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0692fbf799
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】重置事件点不触发修复
							
							
							
							
							
							
							
							(cherry picked from commit c50ba93285) 
							
						 | 
						
							2020-12-18 12:02:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1431423c4f
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】移动过程中打开其他界面问题修复
							
							
							
							
							
						 | 
						
							2020-12-18 11:39:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								223b816a98
								
							
								
							
						 | 
						
							
							
								
								【青龙秘宝】青龙秘宝等级购买报错修复
							
							
							
							
							
						 | 
						
							2020-12-18 11:38:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								57ef5e73cf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-12-18 11:32:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								22785d4675
								
							
								
							
						 | 
						
							
							
								
								[天相几人]图片提交
							
							
							
							
							
						 | 
						
							2020-12-18 11:23:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9f01de23ea
								
							
								
							
						 | 
						
							
							
								
								[主题活动]
							
							
							
							
							
						 | 
						
							2020-12-18 11:22:54 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cf83adb214
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 zbj音效替换
							
							
							
							
							
						 | 
						
							2020-12-18 11:22:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								85c47c5ce5
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 zbj技能音效提交
							
							
							
							
							
						 | 
						
							2020-12-18 11:22:17 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								1ecb31cb89
								
							
								
							
						 | 
						
							
							
								
								【资源】猪八戒小头像大卡牌
							
							
							
							
							
						 | 
						
							2020-12-18 11:22:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								282e557425
								
							
								
							
						 | 
						
							
							
								
								【资源导入】 猪八戒新皮肤 live2d
							
							
							
							
							
						 | 
						
							2020-12-18 11:21:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								5ac11ac291
								
							
								
							
						 | 
						
							
							
								
								【资源导入】猪八戒新皮肤特效
							
							
							
							
							
						 | 
						
							2020-12-18 11:21:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3a1bbf7cac
								
							
								
							
						 | 
						
							
							
								
								【战斗】 188被动修改 间接伤害不会被义结金兰分摊
							
							
							
							
							
						 | 
						
							2020-12-18 11:23:41 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c4320e59e2
								
							
								
							
						 | 
						
							
							
								
								【战斗】 142被动效果修改 间接伤害不会触发回血
							
							
							
							
							
						 | 
						
							2020-12-18 11:22:58 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2dd63c7986
								
							
								
							
						 | 
						
							
							
								
								[战斗]284效果修改,非技能伤害不会回血
							
							
							
							
							
						 | 
						
							2020-12-18 11:22:24 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								297b36eb2b
								
							
								
							
						 | 
						
							
							
								
								[战斗]  链接符伤害,溢出伤害,舍身济世分摊伤害改为最终伤害  ,舍身济世伤害不触发284被动
							
							
							
							
							
						 | 
						
							2020-12-18 11:21:10 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f4096cb18b
								
							
								
							
						 | 
						
							
							
								
								【战斗】v1.0.11
							
							
							
							
							
							
							
							1、修复圣物效果数据错误
 2、不灭buff实现方式修改
 3、灵兽buff回合计算方式修改 
							
						 | 
						
							2020-12-16 11:36:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								652217ab37
								
							
								
							
						 | 
						
							
							
								
								【宝物合成】显示有问题
							
							
							
							
							
						 | 
						
							2020-12-15 11:51:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								74df46d7a8
								
							
								
							
						 | 
						
							
							
								
								【套装属性】 bug修改
							
							
							
							
							
						 | 
						
							2020-12-14 17:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								06f487a176
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-12-12 18:00:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4c73219b39
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】诸多bug 修复
							
							
							
							
							
						 | 
						
							2020-12-12 18:00:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4da5b2ac46
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】
							
							
							
							
							
						 | 
						
							2020-12-12 17:53:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								242a85a27e
								
							
								
							
						 | 
						
							
							
								
								【道具自选箱】宝箱开启数量不能为0
							
							
							
							
							
						 | 
						
							2020-12-12 17:53:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								720d4f5d8c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-12-12 17:22:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								475badacc1
								
							
								
							
						 | 
						
							
							
								
								博闻强识图片修改
							
							
							
							
							
						 | 
						
							2020-12-12 17:21:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0a1e1666f7
								
							
								
							
						 | 
						
							
							
								
								【博文多识】
							
							
							
							
							
						 | 
						
							2020-12-12 17:21:13 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1e91b33cdd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/1209更新内容
							
							
							
							
							
						 | 
						
							2020-12-12 17:08:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								328af3f66b
								
							
								
							
						 | 
						
							
							
								
								【装备套装】
							
							
							
							
							
						 | 
						
							2020-12-12 17:07:22 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9f4d3cd182
								
							
								
							
						 | 
						
							
							
								
								[战斗] 大闹天宫圣物相关被动,同步成和校验服一样
							
							
							
							
							
						 | 
						
							2020-12-12 17:58:37 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ec3636c842
								
							
								
							
						 | 
						
							
							
								
								【战斗】检测不灭的方式修改
							
							
							
							
							
						 | 
						
							2020-12-12 16:59:15 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								10132cc75f
								
							
								
							
						 | 
						
							
							
								
								【每日登陆领奖】背景显示不全,多次点击后各奖励详情不再弹窗 bug 修复
							
							
							
							
							
						 | 
						
							2020-12-12 13:57:18 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								03e0e73665
								
							
								
							
						 | 
						
							
							
								
								【装备套装】 套装属性向下兼容
							
							
							
							
							
						 | 
						
							2020-12-11 17:31:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								72e1cd322b
								
							
								
							
						 | 
						
							
							
								
								【灵兽召唤】 1209bug   抽灵兽的动画,有一瞬间的黑屏
							
							
							
							
							
						 | 
						
							2020-12-10 14:18:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								90df5e453f
								
							
								
							
						 | 
						
							
							
								
								【竞技场】 1209bug  竞技场跳过战斗按钮,解锁条件同关卡
							
							
							
							
							
						 | 
						
							2020-12-10 13:37:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								63c20aaab9
								
							
								
							
						 | 
						
							
							
								
								【道具自选箱】选择的数量为0直接关闭调整
							
							
							
							
							
						 | 
						
							2020-12-09 18:12:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2803b978c1
								
							
								
							
						 | 
						
							
							
								
								【道具自选箱】bug修复
							
							
							
							
							
							
							
							(cherry picked from commit 6df7f2ef10) 
							
						 | 
						
							2020-12-09 18:12:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9b58c897bf
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】最中间的未开启 拿到大奖报错修改
							
							
							
							
							
						 | 
						
							2020-12-09 18:11:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4493972a2f
								
							
								
							
						 | 
						
							
							
								
								【首冲】 首冲测试战斗修改提交
							
							
							
							
							
						 | 
						
							2020-12-08 17:14:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2a6e0fdf34
								
							
								
							
						 | 
						
							
							
								
								【大闹天宫 bug】 失败后保存血量前端报错修改
							
							
							
							
							
						 | 
						
							2020-12-08 17:14:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b9a3f19509
								
							
								
							
						 | 
						
							
							
								
								【GM】钱降一位、一键宝物、一键装备(顶级)
							
							
							
							
							
							
							
							(cherry picked from commit 4ef08d456e) 
							
						 | 
						
							2020-12-08 15:05:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2b3ad467dd
								
							
								
							
						 | 
						
							
							
								
								【百宝商会】时间字体颜色提交
							
							
							
							
							
						 | 
						
							2020-12-07 19:48:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1c7ac7e8cc
								
							
								
							
						 | 
						
							
							
								
								【青龙秘宝】修复延时
							
							
							
							
							
							
							
							(cherry picked from commit 758c59dcae) 
							
						 | 
						
							2020-12-07 19:18:04 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b9a112736b
								
							
								
							
						 | 
						
							
							
								
								[战斗]   修改灵兽给英雄附加的buff的刷新机制,改为大回合刷新,如果灵兽是在回合后释放,配置的持续回合数+1
							
							
							
							
							
						 | 
						
							2020-12-07 18:03:23 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								62fcc1fa19
								
							
								
							
						 | 
						
							
							
								
								【战斗 】   给英雄附加战斗单位类型
							
							
							
							
							
						 | 
						
							2020-12-07 18:02:49 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								7da566dc76
								
							
								
							
						 | 
						
							
							
								
								[战斗]  神女庇佑最佳技能表现修改,吞鲸魂印修改
							
							
							
							
							
						 | 
						
							2020-12-07 18:01:57 +09:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								f3dc2797fa
								
							
								
							
						 | 
						
							
							
								
								新增3个灵兽小头像
							
							
							
							
							
						 | 
						
							2020-12-07 17:50:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a446b83908
								
							
								
							
						 | 
						
							
							
								
								冲突修改提交
							
							
							
							
							
						 | 
						
							2020-12-07 16:29:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								523932cc25
								
							
								
							
						 | 
						
							
							
								
								【新将来袭】宝箱显示修改
							
							
							
							
							
						 | 
						
							2020-12-07 10:22:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1fcb892050
								
							
								
							
						 | 
						
							
							
								
								【新将来袭】宝箱位置调整
							
							
							
							
							
						 | 
						
							2020-12-04 19:42:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2c2e208bc1
								
							
								
							
						 | 
						
							
							
								
								【新将来袭】预设微调
							
							
							
							
							
						 | 
						
							2020-12-04 16:10:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b3e374e336
								
							
								
							
						 | 
						
							
							
								
								【神将来袭】基本完事儿
							
							
							
							
							
						 | 
						
							2020-12-03 18:36:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b2e53f8ae5
								
							
								
							
						 | 
						
							
							
								
								【新将来袭】战斗血条
							
							
							
							
							
						 | 
						
							2020-12-03 15:11:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								86d190572a
								
							
								
							
						 | 
						
							
							
								
								【神将来袭】加战斗了
							
							
							
							
							
						 | 
						
							2020-12-02 17:14:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ecb948a613
								
							
								
							
						 | 
						
							
							
								
								【神将来袭】真·差战斗 和为小游戏转盘增加log
							
							
							
							
							
						 | 
						
							2020-12-02 15:42:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2f07beaa08
								
							
								
							
						 | 
						
							
							
								
								【新将来袭】差战斗了
							
							
							
							
							
						 | 
						
							2020-12-02 09:51:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d860871ba6
								
							
								
							
						 | 
						
							
							
								
								path上传
							
							
							
							
							
						 | 
						
							2020-12-01 15:57:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2d51e11e10
								
							
								
							
						 | 
						
							
							
								
								【神将来袭】代码完善
							
							
							
							
							
						 | 
						
							2020-12-01 15:52:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								758c59dcae
								
							
								
							
						 | 
						
							
							
								
								【青龙秘宝】修复延时
							
							
							
							
							
						 | 
						
							2020-12-01 13:51:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1222f1df0c
								
							
								
							
						 | 
						
							
							
								
								【新将来袭】开坑
							
							
							
							
							
						 | 
						
							2020-12-01 13:51:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								119be29c7d
								
							
								
							
						 | 
						
							
							
								
								【角色】修复角色被动技能数量计算错误,兼容多合一被动
							
							
							
							
							
						 | 
						
							2020-11-30 21:17:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4dbbbc7929
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复lenthoftable方法在后端战斗中无法调用导致报错
							
							
							
							
							
						 | 
						
							2020-11-30 20:35:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b0f9e59672
								
							
								
							
						 | 
						
							
							
								
								【车迟】抢夺空队伍  提示错误
							
							
							
							
							
						 | 
						
							2020-11-30 11:09:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f696619328
								
							
								
							
						 | 
						
							
							
								
								【编队战力】 修改战力显示 2 未合  local
							
							
							
							
							
						 | 
						
							2020-11-30 10:17:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6c4afae844
								
							
								
							
						 | 
						
							
							
								
								【编队战力】 编队界面的那个英雄战力计算修改
							
							
							
							
							
						 | 
						
							2020-11-30 10:17:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a711c30c64
								
							
								
							
						 | 
						
							
							
								
								[战斗]  99被动修改  屏蔽金翅大鹏不灭
							
							
							
							
							
						 | 
						
							2020-11-28 17:59:38 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								30f953f6de
								
							
								
							
						 | 
						
							
							
								
								【战斗】 角色查找逻辑添加 排除拥有不灭的单位 和  没有不灭的无序列表    103效果改成治疗随机多个单位    276被动 改为给随机英雄加
							
							
							
							
							
						 | 
						
							2020-11-28 17:58:36 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ce8c206717
								
							
								
							
						 | 
						
							
							
								
								【战斗】效果:103修改添加1个参数    被动 147 206修改    被动添加271-284
							
							
							
							
							
						 | 
						
							2020-11-28 17:56:58 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8c86335070
								
							
								
							
						 | 
						
							
							
								
								【资源】三四星技能音效添加,孟姜女立绘修改
							
							
							
							
							
						 | 
						
							2020-11-27 18:04:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2627341766
								
							
								
							
						 | 
						
							
							
								
								【特效】三四星部分特效裁切处理
							
							
							
							
							
						 | 
						
							2020-11-27 17:35:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								15c862fd23
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-27 17:28:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6a7c9b920d
								
							
								
							
						 | 
						
							
							
								
								【车迟斗法】 修改抢夺 挑战时会报错修复
							
							
							
							
							
						 | 
						
							2020-11-27 17:20:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								17882656fe
								
							
								
							
						 | 
						
							
							
								
								【竞技场】  修复积分规则修改别的pvp 战斗结束后报错 bug
							
							
							
							
							
						 | 
						
							2020-11-27 17:20:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f8dd59fdfc
								
							
								
							
						 | 
						
							
							
								
								【车迟斗法】 我编队为空  或者  对方编队我空 逻辑处理
							
							
							
							
							
						 | 
						
							2020-11-27 17:19:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4b165e3551
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/背包最大值限制提示添加' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-27 17:18:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b173c4384a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/系统消息结构处理' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-27 17:17:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8eb823937e
								
							
								
							
						 | 
						
							
							
								
								【系统消息】暂时屏蔽法宝详情的显示
							
							
							
							
							
						 | 
						
							2020-11-27 15:06:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7ee6f446b3
								
							
								
							
						 | 
						
							
							
								
								【背包】背包已满提示方式改为tips
							
							
							
							
							
						 | 
						
							2020-11-27 14:00:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d0cb62fab6
								
							
								
							
						 | 
						
							
							
								
								【背包】物品最大数量限制提示添加
							
							
							
							
							
						 | 
						
							2020-11-27 13:31:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								80c949c54d
								
							
								
							
						 | 
						
							
							
								
								【灵兽】 灵兽数据分页
							
							
							
							
							
						 | 
						
							2020-11-27 10:57:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ad9c72717a
								
							
								
							
						 | 
						
							
							
								
								【系统消息】修改系统消息点击法宝相关消息显示为一级的法宝信息
							
							
							
							
							
						 | 
						
							2020-11-27 10:49:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ce78226529
								
							
								
							
						 | 
						
							
							
								
								【资源】新增34星英特效资源
							
							
							
							
							
						 | 
						
							2020-11-26 21:04:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2df4f34c76
								
							
								
							
						 | 
						
							
							
								
								【编队优化】切磋增加一键
							
							
							
							
							
							
							
							(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4) 
							
						 | 
						
							2020-11-26 16:09:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								13e2fbb98d
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/竞技场胜负奖励' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-26 11:11:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3f2029a681
								
							
								
							
						 | 
						
							
							
								
								旗开得胜 提交
							
							
							
							
							
						 | 
						
							2020-11-25 21:02:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								80538ec42f
								
							
								
							
						 | 
						
							
							
								
								【竞技场】增加产出
							
							
							
							
							
						 | 
						
							2020-11-25 18:24:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								be9b79897e
								
							
								
							
						 | 
						
							
							
								
								【竞技场】增加产出
							
							
							
							
							
						 | 
						
							2020-11-25 18:23:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cf7068da1c
								
							
								
							
						 | 
						
							
							
								
								【灵兽特惠】 适配问题
							
							
							
							
							
						 | 
						
							2020-11-24 14:55:46 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4b6578e957
								
							
								
							
						 | 
						
							
							
								
								[战斗]  91  112 115  196  256 被动添加特性屏蔽修改
							
							
							
							
							
						 | 
						
							2020-11-24 11:31:02 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2cc096cd18
								
							
								
							
						 | 
						
							
							
								
								【战斗】147,206被动修改回原来的效果
							
							
							
							
							
						 | 
						
							2020-11-24 11:24:29 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e3e609c87e
								
							
								
							
						 | 
						
							
							
								
								[战斗]  245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题
							
							
							
							
							
						 | 
						
							2020-11-24 11:23:31 +09:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3bcc15d21d
								
							
								
							
						 | 
						
							
							
								
								【主题活动】降龙伏虎banner替换
							
							
							
							
							
						 | 
						
							2020-11-24 11:08:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								34ae0ed497
								
							
								
							
						 | 
						
							
							
								
								【战斗】无用log删除,技能数量限制初始化数据位置错误
							
							
							
							
							
						 | 
						
							2020-11-23 21:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5e4f1a5165
								
							
								
							
						 | 
						
							
							
								
								v1.0.7
							
							
							
							
							
							
							
							1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题 
							
						 | 
						
							2020-11-23 10:08:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d938acc273
								
							
								
							
						 | 
						
							
							
								
								【竞技场】增加输赢奖励掉落
							
							
							
							
							
						 | 
						
							2020-11-23 09:58:22 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ddb5f1b299
								
							
								
							
						 | 
						
							
							
								
								【日常任务】 11.25 bug 宝箱位置修改
							
							
							
							
							
						 | 
						
							2020-11-20 17:36:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								85a608d21a
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "【战斗】v1.0.5""
							
							
							
							
							
							
							
							This reverts commit 941cb86845. 
							
						 | 
						
							2020-11-20 15:15:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								941cb86845
								
							
								
							
						 | 
						
							
							
								
								Revert "【战斗】v1.0.5"
							
							
							
							
							
							
							
							This reverts commit 0548b16015. 
							
						 | 
						
							2020-11-20 15:07:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2331c8d013
								
							
								
							
						 | 
						
							
							
								
								【战斗】添加超时检测
							
							
							
							
							
						 | 
						
							2020-11-20 15:07:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0548b16015
								
							
								
							
						 | 
						
							
							
								
								【战斗】v1.0.5
							
							
							
							
							
							
							
							1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限 
							
						 | 
						
							2020-11-20 14:27:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								899903104f
								
							
								
							
						 | 
						
							
							
								
								【特权礼包】加等级显示前端
							
							
							
							
							
							
							
							【公会副本】 加前端五点刷新不能扫荡 
							
						 | 
						
							2020-11-19 19:30:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1303495f3d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 18:31:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ffdb9c20eb
								
							
								
							
						 | 
						
							
							
								
								图片提交
							
							
							
							
							
						 | 
						
							2020-11-19 18:31:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								532e766de5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 17:37:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d789b9e98e
								
							
								
							
						 | 
						
							
							
								
								【编队优化】轩辕宝镜一键特殊处理
							
							
							
							
							
						 | 
						
							2020-11-19 17:37:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c5c4efef63
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/增加一键上阵' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-12-03 05:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8198b24720
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 17:22:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1299b62feb
								
							
								
							
						 | 
						
							
							
								
								灵兽宝阁位置名称修改
							
							
							
							
							
						 | 
						
							2020-11-19 17:22:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								37631ebc67
								
							
								
							
						 | 
						
							
							
								
								【战斗】技能特效播放层级修改
							
							
							
							
							
						 | 
						
							2020-11-19 15:44:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8ceb1b4a51
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 15:28:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								68cf2e356a
								
							
								
							
						 | 
						
							
							
								
								【竞技场】在线刷新没红点修复
							
							
							
							
							
						 | 
						
							2020-12-03 05:10:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3b4826c235
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-12-03 04:56:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2fbe5aa120
								
							
								
							
						 | 
						
							
							
								
								【大闹天宫】重置前五分钟踢出玩家
							
							
							
							
							
						 | 
						
							2020-12-03 04:55:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								20564aee0f
								
							
								
							
						 | 
						
							
							
								
								【日常副本】解锁所有副本后,没有自动滚动到最后一个副本
							
							
							
							
							
						 | 
						
							2020-11-19 15:28:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0914dd6dc8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 15:09:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2c72089def
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】掷骰子播放时需要加限制,不能点击关闭,或者直接显示结果
							
							
							
							
							
						 | 
						
							2020-11-19 15:09:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								59937a1132
								
							
								
							
						 | 
						
							
							
								
								【战斗】修改自动下落特效的时间为表配置
							
							
							
							
							
						 | 
						
							2020-11-19 14:53:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d8f31bab35
								
							
								
							
						 | 
						
							
							
								
								主题活动修改提交
							
							
							
							
							
						 | 
						
							2020-11-19 14:26:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2a9b4cb5ab
								
							
								
							
						 | 
						
							
							
								
								动态立绘修改
							
							
							
							
							
						 | 
						
							2020-11-19 11:49:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e09872eb7f
								
							
								
							
						 | 
						
							
							
								
								限时招募修改提交
							
							
							
							
							
						 | 
						
							2020-11-19 10:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3e7c24c029
								
							
								
							
						 | 
						
							
							
								
								【主题活动】降龙伏虎
							
							
							
							
							
						 | 
						
							2020-11-18 18:15:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								08657b4ffd
								
							
								
							
						 | 
						
							
							
								
								【编队优化】车迟 十绝 增加一键
							
							
							
							
							
						 | 
						
							2020-11-18 10:48:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ca1a509cb8
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复资源回收顺序错误导致跳过战斗时黑屏的问题
							
							
							
							
							
						 | 
						
							2020-11-17 21:40:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								77934cd274
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 20:39:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4eb60838b4
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复被动112参数错误
							
							
							
							
							
						 | 
						
							2020-11-17 20:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a109678fb4
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】 天赋图标显示赋值
							
							
							
							
							
						 | 
						
							2020-11-17 20:12:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								646e3e8061
								
							
								
							
						 | 
						
							
							
								
								【编队优化】轩辕宝镜增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 20:01:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a68a068746
								
							
								
							
						 | 
						
							
							
								
								【编队优化】巅峰赛增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:59:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								462484db66
								
							
								
							
						 | 
						
							
							
								
								【编队优化】竞技场防守编队增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:57:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c8aa6b5971
								
							
								
							
						 | 
						
							
							
								
								【编队优化】公会副本增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:54:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								188dc707a9
								
							
								
							
						 | 
						
							
							
								
								【编队优化】大闹天宫增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:42:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								84a28f8a28
								
							
								
							
						 | 
						
							
							
								
								[战斗] 196 被动  添加类型判断
							
							
							
							
							
						 | 
						
							2020-11-17 18:44:31 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f174c68db7
								
							
								
							
						 | 
						
							
							
								
								【资源】东华帝君普通攻击特效添加
							
							
							
							
							
						 | 
						
							2020-11-17 18:32:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								be0195af18
								
							
								
							
						 | 
						
							
							
								
								【战斗】战斗表现添加射线类型特凶啊
							
							
							
							
							
						 | 
						
							2020-11-17 18:31:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								05076eb743
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 18:30:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d3a276cdca
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】皮肤加入本地数据保存
							
							
							
							
							
						 | 
						
							2020-11-17 18:30:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cf34f4d377
								
							
								
							
						 | 
						
							
							
								
								resourcePath上传
							
							
							
							
							
						 | 
						
							2020-11-17 17:41:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								75c04b2c43
								
							
								
							
						 | 
						
							
							
								
								【编队优化】心魔试炼增加一键上阵
							
							
							
							
							
						 | 
						
							2020-11-17 17:41:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								233ff1b361
								
							
								
							
						 | 
						
							
							
								
								【编队优化】无尽副本增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 17:12:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3308ce4479
								
							
								
							
						 | 
						
							
							
								
								[战斗] 被动处理   舍身济世200 ,及伏虎罗汉特性被动添加额外技能屏蔽
							
							
							
							
							
						 | 
						
							2020-11-17 17:35:25 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8980c6be4a
								
							
								
							
						 | 
						
							
							
								
								【英雄战力】 乘减算修改
							
							
							
							
							
						 | 
						
							2020-11-17 15:33:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bdf45413bc
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】敌将详情 敌将位置调整
							
							
							
							
							
							
							
							(cherry picked from commit 2dd30f9ca3) 
							
						 | 
						
							2020-11-17 14:56:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6a515c2374
								
							
								
							
						 | 
						
							
							
								
								【战斗】优化战斗资源回收机制,修复跳过战斗时灵兽报错
							
							
							
							
							
						 | 
						
							2020-11-17 14:05:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8f3325ad5f
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复灵兽释放技能时跳过战斗,下次战斗会显示上次战斗的casting的问题
							
							
							
							
							
						 | 
						
							2020-11-17 14:04:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								13496de590
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 11:54:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								04f8571692
								
							
								
							
						 | 
						
							
							
								
								【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复
							
							
							
							
							
						 | 
						
							2020-11-17 11:53:49 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cd332c80d0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 10:58:09 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cae41baf71
								
							
								
							
						 | 
						
							
							
								
								【图鉴】 升星点亮图鉴 调整献祭坛预设
							
							
							
							
							
						 | 
						
							2020-11-17 10:57:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								69d818118c
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复
							
							
							
							
							
						 | 
						
							2020-11-17 10:56:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d433d2a690
								
							
								
							
						 | 
						
							
							
								
								【公告】打开公告前获取公告信息
							
							
							
							
							
						 | 
						
							2020-11-17 10:44:55 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								383f20aa32
								
							
								
							
						 | 
						
							
							
								
								【战斗】 被动266去除无用log
							
							
							
							
							
						 | 
						
							2020-11-17 10:02:29 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2955a067fa
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 图鉴未开觉醒功能点进去报错修复提交
							
							
							
							
							
						 | 
						
							2020-11-16 21:00:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								26e7460699
								
							
								
							
						 | 
						
							
							
								
								【孙悟空】皮肤攻击音效
							
							
							
							
							
						 | 
						
							2020-11-16 19:55:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								58c538e41b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-16 18:34:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								46750846f8
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复灵兽技能释放后会检测轮数,导致战斗卡死的问题。
							
							
							
							
							
						 | 
						
							2020-11-16 18:34:12 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c73c2404f1
								
							
								
							
						 | 
						
							
							
								
								【东华帝君】 音效替换  技能预设 修改
							
							
							
							
							
						 | 
						
							2020-11-16 18:07:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f384e25ad6
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】今日召唤上限次数不对修改
							
							
							
							
							
							
							
							(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
(cherry picked from commit bef1181f19) 
							
						 | 
						
							2020-11-16 17:51:25 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8531323faa
								
							
								
							
						 | 
						
							
							
								
								推送礼包剔除过期的礼包
							
							
							
							
							
						 | 
						
							2020-11-16 17:30:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f517b5e955
								
							
								
							
						 | 
						
							
							
								
								【资源】东华帝君技能特效资源显示错误修改
							
							
							
							
							
						 | 
						
							2020-11-16 16:45:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f1b687e9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-16 16:20:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9601af33e7
								
							
								
							
						 | 
						
							
							
								
								【神将详情】排行榜查看他人装备显示出售按钮修复
							
							
							
							
							
						 | 
						
							2020-11-16 16:20:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e8f15add7f
								
							
								
							
						 | 
						
							
							
								
								【东华帝君】 音效提交
							
							
							
							
							
						 | 
						
							2020-11-16 15:47:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8df6de20e5
								
							
								
							
						 | 
						
							
							
								
								【副本】isInMap字段删除bug修复
							
							
							
							
							
						 | 
						
							2020-11-16 15:24:09 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2000240f64
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 提示文字
							
							
							
							
							
						 | 
						
							2020-11-16 14:57:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5301a91738
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复被动270普通攻击也能触发的问题
							
							
							
							
							
						 | 
						
							2020-11-16 14:04:58 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								cec062c993
								
							
								
							
						 | 
						
							
							
								
								灵兽山 觉醒图标
							
							
							
							
							
						 | 
						
							2020-11-16 13:55:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8edf7dd781
								
							
								
							
						 | 
						
							
							
								
								【战斗】被动添加
							
							
							
							
							
							
							
							270:技能直接伤害[a]%转化为生命治疗自己 
							
						 | 
						
							2020-11-16 11:50:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3348d60c65
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 图鉴属性取整
							
							
							
							
							
						 | 
						
							2020-11-16 10:27:41 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1287453f10
								
							
								
							
						 | 
						
							
							
								
								【战斗】 额外技能添加5技能
							
							
							
							
							
						 | 
						
							2020-11-14 20:20:06 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								406cf2e1f7
								
							
								
							
						 | 
						
							
							
								
								【战斗】 被动265效果修改
							
							
							
							
							
						 | 
						
							2020-11-14 19:52:47 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b1549b470b
								
							
								
							
						 | 
						
							
							
								
								[战斗]  被动268修改
							
							
							
							
							
						 | 
						
							2020-11-14 19:20:55 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								af915fb480
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-14 17:37:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ede48e5063
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】添加总伤害数值打印
							
							
							
							
							
						 | 
						
							2020-11-14 17:37:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e6ac0a8845
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-14 17:20:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b7269ccf89
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】修复测试战斗按钮层级过高遮挡伤害数字的问题
							
							
							
							
							
						 | 
						
							2020-11-14 17:20:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d64ed5e92d
								
							
								
							
						 | 
						
							
							
								
								[战斗] 268 被动效果修改
							
							
							
							
							
						 | 
						
							2020-11-14 17:32:09 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5e0384b847
								
							
								
							
						 | 
						
							
							
								
								[战斗]免疫盾修改提交
							
							
							
							
							
						 | 
						
							2020-11-14 17:13:37 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								6821324fb1
								
							
								
							
						 | 
						
							
							
								
								[战斗]减伤盾效果修改提交
							
							
							
							
							
						 | 
						
							2020-11-14 15:43:40 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								deb8603b98
								
							
								
							
						 | 
						
							
							
								
								[战斗]减伤盾效果修改
							
							
							
							
							
						 | 
						
							2020-11-14 15:11:32 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4fd822a333
								
							
								
							
						 | 
						
							
							
								
								【战斗】删除战斗艺术字配置,改为即时判断
							
							
							
							
							
						 | 
						
							2020-11-13 19:44:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								142d8dee0f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 19:38:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								56afe786be
								
							
								
							
						 | 
						
							
							
								
								【战斗】战斗关闭时不再回收灵兽立绘资源,直接销毁,避免在UI上立绘不停播放攻击动作的问题
							
							
							
							
							
						 | 
						
							2020-11-13 19:38:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1face65dbb
								
							
								
							
						 | 
						
							
							
								
								【战斗】免疫效果自定义类型添加,免疫效果文字显示恢复
							
							
							
							
							
						 | 
						
							2020-11-13 19:34:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9424037d9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 18:58:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4a0a702fec
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】凤凰无限飞bug缓解
							
							
							
							
							
						 | 
						
							2020-11-13 18:58:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6c8a011528
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 18:01:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								46eeceb79d
								
							
								
							
						 | 
						
							
							
								
								【主题活动】bug修复
							
							
							
							
							
						 | 
						
							2020-11-13 18:00:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								70e019f837
								
							
								
							
						 | 
						
							
							
								
								gm 测试战斗添加设置皮肤
							
							
							
							
							
						 | 
						
							2020-11-13 17:48:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bd083a67a3
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】同步界面修改
							
							
							
							
							
						 | 
						
							2020-11-13 17:47:54 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								fee4501004
								
							
								
							
						 | 
						
							
							
								
								[战斗] 266被动修改
							
							
							
							
							
						 | 
						
							2020-11-13 18:42:27 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d6d5f5cdfa
								
							
								
							
						 | 
						
							
							
								
								257 561 267 技能修改
							
							
							
							
							
						 | 
						
							2020-11-13 17:38:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1568e2f288
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】修复添加属性被动时报错
							
							
							
							
							
						 | 
						
							2020-11-13 17:27:15 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								8a87f0a8a2
								
							
								
							
						 | 
						
							
							
								
								【战斗】91 被动修改
							
							
							
							
							
						 | 
						
							2020-11-13 18:23:56 +09:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f091914b4f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 17:07:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ee04d93830
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】增加结束时间
							
							
							
							
							
						 | 
						
							2020-11-13 17:07:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								97cdd13df9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 16:35:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								384750e0e9
								
							
								
							
						 | 
						
							
							
								
								[限时折扣] 修改
							
							
							
							
							
						 | 
						
							2020-11-13 16:35:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								933f2d4768
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】增加假战斗
							
							
							
							
							
						 | 
						
							2020-11-13 16:25:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e4f48eb668
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 16:10:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d739896793
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】倒计时显示刷新问题修复
							
							
							
							
							
						 | 
						
							2020-11-13 16:10:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f1dfa111f1
								
							
								
							
						 | 
						
							
							
								
								灵兽特惠 价格修改
							
							
							
							
							
						 | 
						
							2020-11-13 15:56:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d4f79a0abb
								
							
								
							
						 | 
						
							
							
								
								限时招募提交
							
							
							
							
							
						 | 
						
							2020-11-13 15:50:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								29312b211f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 15:47:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								44a1d94860
								
							
								
							
						 | 
						
							
							
								
								神医天降修改
							
							
							
							
							
						 | 
						
							2020-11-13 15:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								2cb5ee9176
								
							
								
							
						 | 
						
							
							
								
								【放生】 删除之前背景
							
							
							
							
							
						 | 
						
							2020-11-13 15:23:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8a5d51e2a3
								
							
								
							
						 | 
						
							
							
								
								【灵兽抽卡】增加可选灵兽
							
							
							
							
							
							
							
							(cherry picked from commit 8185be7c27) 
							
						 | 
						
							2020-11-13 12:12:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								21988be4e2
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 觉醒成功替换资源
							
							
							
							
							
						 | 
						
							2020-11-13 11:18:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2f5b2c2d4f
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 觉醒成功界面显示bug
							
							
							
							
							
						 | 
						
							2020-11-13 10:11:41 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e9d984b329
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2020-11-12 19:34:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								debaf0210c
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】加号位置调整
							
							
							
							
							
						 | 
						
							2020-11-12 18:32:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c5117b9fc1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-12 18:18:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2563c6bdd6
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】货币显示修复
							
							
							
							
							
						 | 
						
							2020-11-12 18:17:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8b15fe28eb
								
							
								
							
						 | 
						
							
							
								
								【献祭坛】11.5 资源提换
							
							
							
							
							
						 | 
						
							2020-11-12 18:12:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5f596eef04
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】bug修复,增加等级限制
							
							
							
							
							
						 | 
						
							2020-11-12 17:53:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								32afdddb4f
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】合并到local 预设提交
							
							
							
							
							
						 | 
						
							2020-11-12 17:24:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2c143deea9
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/灵兽抽卡' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua 
							
						 | 
						
							2020-11-12 17:21:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a5c36cf58a
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】未开启更换灵兽版本
							
							
							
							
							
						 | 
						
							2020-11-12 17:11:18 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b1eba4887a
								
							
								
							
						 | 
						
							
							
								
								【灵兽】灵兽上阵主界面名字颜色变化
							
							
							
							
							
						 | 
						
							2020-11-12 17:05:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b1128dd88e
								
							
								
							
						 | 
						
							
							
								
								【献祭坛】适配调试
							
							
							
							
							
						 | 
						
							2020-11-12 17:05:34 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8a73056eac
								
							
								
							
						 | 
						
							
							
								
								【献祭坛】预设微调
							
							
							
							
							
						 | 
						
							2020-11-12 17:04:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7fc14ec822
								
							
								
							
						 | 
						
							
							
								
								[主题活动] 修改提交
							
							
							
							
							
						 | 
						
							2020-11-12 16:07:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								da372f48df
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-12 15:13:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9919674980
								
							
								
							
						 | 
						
							
							
								
								【战斗】假战斗加入对MonsterGroup配置的灵兽数据的处理
							
							
							
							
							
						 | 
						
							2020-11-12 15:12:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								358ecb8166
								
							
								
							
						 | 
						
							
							
								
								[玄机妙算] 提交
							
							
							
							
							
						 | 
						
							2020-11-12 15:10:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								492d969a4f
								
							
								
							
						 | 
						
							
							
								
								【觉醒】bug 修改  公会成员灵兽显示错误
							
							
							
							
							
						 | 
						
							2020-11-12 14:38:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cbf9f5cade
								
							
								
							
						 | 
						
							
							
								
								【觉醒】问题修改
							
							
							
							
							
						 | 
						
							2020-11-12 13:55:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								45c088e6b7
								
							
								
							
						 | 
						
							
							
								
								[灵兽特惠] 提交
							
							
							
							
							
						 | 
						
							2020-11-12 11:37:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7aa7244d06
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-12 11:31:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a6483b3181
								
							
								
							
						 | 
						
							
							
								
								[灵兽特惠] 提交
							
							
							
							
							
						 | 
						
							2020-11-12 11:31:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0ca5e4ea13
								
							
								
							
						 | 
						
							
							
								
								【觉醒】bug
							
							
							
							
							
						 | 
						
							2020-11-11 20:21:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								adf9c87ac2
								
							
								
							
						 | 
						
							
							
								
								【灵兽提交】bug修改
							
							
							
							
							
						 | 
						
							2020-11-11 20:21:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0887de50d5
								
							
								
							
						 | 
						
							
							
								
								【特效】孙悟空普通攻击受击特效材质丢失修复
							
							
							
							
							
						 | 
						
							2020-11-11 20:13:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								740cfa0e20
								
							
								
							
						 | 
						
							
							
								
								【特效】孙悟空技能特效材质丢失修复
							
							
							
							
							
						 | 
						
							2020-11-11 20:00:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								74b6294c2a
								
							
								
							
						 | 
						
							
							
								
								【特效】孙悟空皮肤技能特效修改
							
							
							
							
							
						 | 
						
							2020-11-11 19:39:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								36f8d28974
								
							
								
							
						 | 
						
							
							
								
								【孙悟空技能】普工特效添加
							
							
							
							
							
						 | 
						
							2020-11-11 18:33:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4f635cf42d
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复特效层级显示错误
							
							
							
							
							
						 | 
						
							2020-11-11 18:10:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1ba753044f
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】抽卡逻辑完善了
							
							
							
							
							
						 | 
						
							2020-11-11 16:53:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a65c528256
								
							
								
							
						 | 
						
							
							
								
								【GM】战斗种子数据类型错误
							
							
							
							
							
						 | 
						
							2020-11-11 16:10:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a3d6f49e15
								
							
								
							
						 | 
						
							
							
								
								【gm】修复战斗数据gm报错的问题
							
							
							
							
							
						 | 
						
							2020-11-11 16:04:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								629eb98f1b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
						 | 
						
							2020-11-11 11:37:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								90e9e84c64
								
							
								
							
						 | 
						
							
							
								
								【觉醒】十一星的星级展示修改
							
							
							
							
							
						 | 
						
							2020-11-11 11:12:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								053de93608
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】 提交
							
							
							
							
							
						 | 
						
							2020-11-10 18:35:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								48e6d33b7b
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】 效果图 资源 提交
							
							
							
							
							
						 | 
						
							2020-11-10 17:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ebe03eff48
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】漏题
							
							
							
							
							
						 | 
						
							2020-11-10 16:43:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1ece0c1a77
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-10 16:25:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ec9458aac7
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】抽取灵兽报错修复
							
							
							
							
							
						 | 
						
							2020-11-10 16:25:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b8c6bf7a62
								
							
								
							
						 | 
						
							
							
								
								【白泽】音效修改
							
							
							
							
							
						 | 
						
							2020-11-10 15:46:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								0d56c34220
								
							
								
							
						 | 
						
							
							
								
								白泽灵兽语音修改
							
							
							
							
							
						 | 
						
							2020-11-10 15:28:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0d26c4d0ab
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-10 15:26:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2e125eaa47
								
							
								
							
						 | 
						
							
							
								
								新手引导修改
							
							
							
							
							
						 | 
						
							2020-11-10 15:26:33 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								21248cf571
								
							
								
							
						 | 
						
							
							
								
								定卦神锄资源
							
							
							
							
							
						 | 
						
							2020-11-10 14:56:03 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								3e24ba9bcf
								
							
								
							
						 | 
						
							
							
								
								Revert "定卦神锄新图标上传"
							
							
							
							
							
							
							
							This reverts commit 495ea6e24e. 
							
						 | 
						
							2020-11-10 14:47:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d493246f2f
								
							
								
							
						 | 
						
							
							
								
								【灵兽抽卡】  开坑
							
							
							
							
							
						 | 
						
							2020-11-10 11:34:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								53e538ea0d
								
							
								
							
						 | 
						
							
							
								
								【音效】 替换
							
							
							
							
							
						 | 
						
							2020-11-10 11:32:30 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7f5287baa2
								
							
								
							
						 | 
						
							
							
								
								【音效】 替换
							
							
							
							
							
						 | 
						
							2020-11-10 11:32:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								05911e105c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-10 11:04:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								89a90ae5c5
								
							
								
							
						 | 
						
							
							
								
								神医天降修改
							
							
							
							
							
						 | 
						
							2020-11-10 11:04:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8ef89acdde
								
							
								
							
						 | 
						
							
							
								
								【bug】修复部分界面文字显示错误的问题
							
							
							
							
							
						 | 
						
							2020-11-10 10:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a12003191c
								
							
								
							
						 | 
						
							
							
								
								【音效】孙悟空技能音效添加
							
							
							
							
							
						 | 
						
							2020-11-10 10:26:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								22d3761937
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-10 10:24:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3f7ae45011
								
							
								
							
						 | 
						
							
							
								
								皮肤修改
							
							
							
							
							
						 | 
						
							2020-11-10 10:23:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6278bb0cc8
								
							
								
							
						 | 
						
							
							
								
								【神将升级】 升星未卡住 and  神将合成报错
							
							
							
							
							
						 | 
						
							2020-11-10 10:16:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								92d85c4200
								
							
								
							
						 | 
						
							
							
								
								【神将升级】 升星未卡住 and  神将合成报错
							
							
							
							
							
						 | 
						
							2020-11-10 10:16:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6a1693939c
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 觉醒添加图鉴
							
							
							
							
							
						 | 
						
							2020-11-09 20:05:51 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								495ea6e24e
								
							
								
							
						 | 
						
							
							
								
								定卦神锄新图标上传
							
							
							
							
							
							
							
							(cherry picked from commit 89c73695e2) 
							
						 | 
						
							2020-11-09 18:10:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								85b21b27f0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
						 | 
						
							2020-11-09 18:04:54 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c4a466637f
								
							
								
							
						 | 
						
							
							
								
								【神将升级】 太快优化
							
							
							
							
							
						 | 
						
							2020-11-09 16:29:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								46b8e52524
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】全部领完后 切换最终奖励点击奖池预览报错修复
							
							
							
							
							
							
							
							(cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025) 
							
						 | 
						
							2020-11-09 16:02:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4fa66650f0
								
							
								
							
						 | 
						
							
							
								
								[皮肤]伤害统计界面添加皮肤显示
							
							
							
							
							
						 | 
						
							2020-11-09 15:54:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dca4f2511a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-09 15:29:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e6eb5d7673
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】格子点击位置不准确修复 曾加tips
							
							
							
							
							
						 | 
						
							2020-11-09 15:28:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d6ab502c45
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】 通关后返回问题修复
							
							
							
							
							
						 | 
						
							2020-11-09 15:24:38 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								4be2045801
								
							
								
							
						 | 
						
							
							
								
								添加容错 --by 焦杨钠
							
							
							
							
							
						 | 
						
							2020-11-13 07:12:51 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f94c84f1cd
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 增加觉醒页签
							
							
							
							
							
						 | 
						
							2020-11-09 15:04:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c4745e8c7c
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】最终奖励选择bug修复
							
							
							
							
							
						 | 
						
							2020-11-09 13:47:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								de677bee2f
								
							
								
							
						 | 
						
							
							
								
								【觉醒】增加脚本
							
							
							
							
							
						 | 
						
							2020-11-09 11:13:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d0e2133cbc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-09 11:09:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9ca403ebff
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】第三层抽取完成后bug修复
							
							
							
							
							
						 | 
						
							2020-11-09 11:09:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5d24bbb8a8
								
							
								
							
						 | 
						
							
							
								
								森罗环境英雄皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-09 10:32:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								5c73587f89
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/神将觉醒
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2020-11-09 10:16:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								de32379f8e
								
							
								
							
						 | 
						
							
							
								
								【竞技场】竞技场增加输赢奖励
							
							
							
							
							
						 | 
						
							2020-11-07 18:52:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f26214ac58
								
							
								
							
						 | 
						
							
							
								
								清楚红点提交
							
							
							
							
							
						 | 
						
							2020-11-07 17:23:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6cb1610d31
								
							
								
							
						 | 
						
							
							
								
								神医天降修改
							
							
							
							
							
						 | 
						
							2020-11-07 16:56:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bc097708e9
								
							
								
							
						 | 
						
							
							
								
								不满足进阶条件,显示红点
							
							
							
							
							
						 | 
						
							2020-11-07 16:41:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2b29242c7
								
							
								
							
						 | 
						
							
							
								
								有孙悟空皮肤,东华帝君皮肤点不到获取途径
							
							
							
							
							
						 | 
						
							2020-11-07 15:52:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4cf115e655
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-07 15:45:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f2f288c682
								
							
								
							
						 | 
						
							
							
								
								进阶页签属性图标显示错误
							
							
							
							
							
						 | 
						
							2020-11-07 15:44:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c3916271aa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-07 15:43:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bd6e61d92a
								
							
								
							
						 | 
						
							
							
								
								【语言工具】添加代码语言还原工具
							
							
							
							
							
						 | 
						
							2020-11-07 15:42:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e517e2a175
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-07 15:39:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								04fac7f216
								
							
								
							
						 | 
						
							
							
								
								魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗
							
							
							
							
							
						 | 
						
							2020-11-07 15:39:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								77047346dd
								
							
								
							
						 | 
						
							
							
								
								神医天降价格修改
							
							
							
							
							
						 | 
						
							2020-11-14 14:43:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ef4c4fccba
								
							
								
							
						 | 
						
							
							
								
								power change update
							
							
							
							
							
						 | 
						
							2020-11-14 14:31:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c639ea1c6b
								
							
								
							
						 | 
						
							
							
								
								delete log
							
							
							
							
							
						 | 
						
							2020-11-14 14:16:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								069d42baca
								
							
								
							
						 | 
						
							
							
								
								皮肤到期刷新
							
							
							
							
							
						 | 
						
							2020-11-14 14:16:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b113f94a6d
								
							
								
							
						 | 
						
							
							
								
								【幻境达人】 排行奖励显示问题
							
							
							
							
							
						 | 
						
							2020-11-07 15:20:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								68979d577e
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】 觉醒成功界面
							
							
							
							
							
						 | 
						
							2020-11-07 15:15:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8f1c52c5e3
								
							
								
							
						 | 
						
							
							
								
								属性加成修改
							
							
							
							
							
						 | 
						
							2020-11-06 21:23:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d4687b2b74
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 21:05:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a481d6d5f
								
							
								
							
						 | 
						
							
							
								
								[皮肤]修改提交
							
							
							
							
							
						 | 
						
							2020-11-06 21:05:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								05fb2f5e7f
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误
							
							
							
							
							
						 | 
						
							2020-11-06 20:45:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								93d9212f85
								
							
								
							
						 | 
						
							
							
								
								皮肤加成属性修改
							
							
							
							
							
						 | 
						
							2020-11-06 20:39:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0a772f466b
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-06 20:36:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								98ff210ae2
								
							
								
							
						 | 
						
							
							
								
								皮肤解锁提示
							
							
							
							
							
						 | 
						
							2020-11-06 20:21:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bd92d5339d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 19:54:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								22038419b7
								
							
								
							
						 | 
						
							
							
								
								神医天降提交
							
							
							
							
							
						 | 
						
							2020-11-06 19:54:00 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								34d67b93f6
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】 赛程 三局第一局结果有问题  修改
							
							
							
							
							
						 | 
						
							2020-11-06 18:32:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5128a02eba
								
							
								
							
						 | 
						
							
							
								
								[皮肤] 胜利最佳输出界面显示皮肤
							
							
							
							
							
						 | 
						
							2020-11-06 17:58:28 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7913bda03f
								
							
								
							
						 | 
						
							
							
								
								【资源】重名资源修改
							
							
							
							
							
						 | 
						
							2020-11-06 17:56:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5b0ac7cd0b
								
							
								
							
						 | 
						
							
							
								
								【音效】灵兽音效资源同步
							
							
							
							
							
						 | 
						
							2020-11-06 17:45:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a6904526d3
								
							
								
							
						 | 
						
							
							
								
								协议提交
							
							
							
							
							
						 | 
						
							2020-11-06 17:26:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								41f62176f2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 17:19:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fe9b73aa0b
								
							
								
							
						 | 
						
							
							
								
								协议提交
							
							
							
							
							
						 | 
						
							2020-11-06 17:19:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								98d4b3b024
								
							
								
							
						 | 
						
							
							
								
								【达人奖励排行】 显示问题修复
							
							
							
							
							
						 | 
						
							2020-11-06 17:18:17 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9eb5161c7e
								
							
								
							
						 | 
						
							
							
								
								【皮肤】东华帝君 ,孙悟空技能特效修改提交
							
							
							
							
							
						 | 
						
							2020-11-06 17:02:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								aa2db3e25e
								
							
								
							
						 | 
						
							
							
								
								【大闹天宫】 节点boss 站位错误 修复
							
							
							
							
							
						 | 
						
							2020-11-06 16:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7121be9c04
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 16:49:18 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ac64980843
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】 特效层级调整
							
							
							
							
							
						 | 
						
							2020-11-06 16:49:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6a95033b8b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 16:39:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cd99dd509b
								
							
								
							
						 | 
						
							
							
								
								立绘加载错误修改
							
							
							
							
							
						 | 
						
							2020-11-06 16:37:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1a4349d93b
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 界面提交
							
							
							
							
							
						 | 
						
							2020-11-06 16:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fab6570a26
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 16:17:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5e130a7585
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2020-11-06 16:17:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ccdba2b2df
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 16:11:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5251bc4059
								
							
								
							
						 | 
						
							
							
								
								[神将界面修改]
							
							
							
							
							
						 | 
						
							2020-11-06 16:11:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								36759d8044
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】增加稿子动效
							
							
							
							
							
						 | 
						
							2020-11-06 16:06:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								44350558c5
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】 头像特效设置层级有问题 线上
							
							
							
							
							
						 | 
						
							2020-11-06 15:49:08 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								327584750a
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】预设修改提交
							
							
							
							
							
						 | 
						
							2020-11-06 15:48:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								34617d419d
								
							
								
							
						 | 
						
							
							
								
								【资源】新增英雄icon资源位置移动
							
							
							
							
							
						 | 
						
							2020-11-06 15:48:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b98490f233
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】差一个稿子的动效
							
							
							
							
							
						 | 
						
							2020-11-06 15:11:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f1ca8398d3
								
							
								
							
						 | 
						
							
							
								
								【战斗】假战斗随机种子读表
							
							
							
							
							
						 | 
						
							2020-11-06 15:04:11 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4a6d8b393f
								
							
								
							
						 | 
						
							
							
								
								技能提交去除log
							
							
							
							
							
						 | 
						
							2020-11-06 15:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ab4f97fa0a
								
							
								
							
						 | 
						
							
							
								
								皮肤修改提交
							
							
							
							
							
						 | 
						
							2020-11-06 15:03:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c3422f1c8d
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复修改
							
							
							
							
							
						 | 
						
							2020-11-06 15:02:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								013ff84d34
								
							
								
							
						 | 
						
							
							
								
								【资源】孙悟空,东华帝君皮肤技能特效资源添加
							
							
							
							
							
						 | 
						
							2020-11-06 15:02:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								767541c1a6
								
							
								
							
						 | 
						
							
							
								
								编队界面皮肤位置修改
							
							
							
							
							
						 | 
						
							2020-11-06 14:30:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b516a8c202
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】没有QA 无法购买
							
							
							
							
							
						 | 
						
							2020-11-06 13:36:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								04fce03cd8
								
							
								
							
						 | 
						
							
							
								
								battlemanager修改提交
							
							
							
							
							
						 | 
						
							2020-11-06 13:32:04 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1123b38709
								
							
								
							
						 | 
						
							
							
								
								协议提交
							
							
							
							
							
						 | 
						
							2020-11-06 13:31:45 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3e917799bb
								
							
								
							
						 | 
						
							
							
								
								解决冲突提交
							
							
							
							
							
						 | 
						
							2020-11-06 13:31:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b7b4fb9d5d
								
							
								
							
						 | 
						
							
							
								
								meta 提交
							
							
							
							
							
						 | 
						
							2020-11-06 13:27:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								927f2280e8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-06 11:41:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								857f97f2ab
								
							
								
							
						 | 
						
							
							
								
								【战斗】假战斗数据组建错误修复
							
							
							
							
							
						 | 
						
							2020-11-06 11:41:40 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								b637d17a9b
								
							
								
							
						 | 
						
							
							
								
								孙悟空东华帝君皮肤资源
							
							
							
							
							
						 | 
						
							2020-11-06 11:21:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d668e4ffc3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua 
							
						 | 
						
							2020-11-06 11:19:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1ac0e6fc53
								
							
								
							
						 | 
						
							
							
								
								【战斗】添加新的假战斗功能
							
							
							
							
							
						 | 
						
							2020-11-06 11:18:09 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3ae2d1048e
								
							
								
							
						 | 
						
							
							
								
								【GM】gm工具优化
							
							
							
							
							
						 | 
						
							2020-11-06 11:16:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a109c2f93f
								
							
								
							
						 | 
						
							
							
								
								【皮肤】 战斗提交
							
							
							
							
							
						 | 
						
							2020-11-06 10:51:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e8be02de87
								
							
								
							
						 | 
						
							
							
								
								[移山倒海] 提交
							
							
							
							
							
						 | 
						
							2020-11-06 10:49:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								beec28a8b8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/皮肤
							
							
							
							
							
						 | 
						
							2020-11-06 10:34:22 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ea24696722
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】新增地图 xbhz
							
							
							
							
							
						 | 
						
							2020-11-06 10:15:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2fae0cc52
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-06 09:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f75850ae4
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】提交
							
							
							
							
							
						 | 
						
							2020-11-05 19:10:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ccf02fb171
								
							
								
							
						 | 
						
							
							
								
								【皮肤】添加倒计时
							
							
							
							
							
						 | 
						
							2020-11-05 18:26:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5026bdd0c3
								
							
								
							
						 | 
						
							
							
								
								【皮肤】提交
							
							
							
							
							
						 | 
						
							2020-11-05 16:02:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3bc2b74ce5
								
							
								
							
						 | 
						
							
							
								
								皮肤分解提交
							
							
							
							
							
						 | 
						
							2020-11-05 14:18:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								476057bd1c
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】主界面奖励显示 通用奖励界面创建
							
							
							
							
							
						 | 
						
							2020-11-04 19:51:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								14812dab65
								
							
								
							
						 | 
						
							
							
								
								[皮肤]倒计时修改
							
							
							
							
							
						 | 
						
							2020-11-04 18:29:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d7b9563e35
								
							
								
							
						 | 
						
							
							
								
								【皮肤】神将合成修改
							
							
							
							
							
						 | 
						
							2020-11-04 16:56:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								360727419e
								
							
								
							
						 | 
						
							
							
								
								【皮肤】修改皮肤显示
							
							
							
							
							
						 | 
						
							2020-11-04 16:51:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6930561350
								
							
								
							
						 | 
						
							
							
								
								[皮肤]神将界面修改提交
							
							
							
							
							
						 | 
						
							2020-11-04 14:24:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								644d984c0a
								
							
								
							
						 | 
						
							
							
								
								登陆报错修改
							
							
							
							
							
						 | 
						
							2020-11-04 14:24:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b18b4cfd58
								
							
								
							
						 | 
						
							
							
								
								【皮肤】协议提交
							
							
							
							
							
						 | 
						
							2020-11-04 13:52:10 +08:00 |