jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6b0af3d7fb
								
							
								
							
						 | 
						
							
							
								
								pozhenzhuxian commit
							
							
							
							
							
						 | 
						
							2020-08-20 17:36:19 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								3b32ac2645
								
							
								
							
						 | 
						
							
							
								
								增加降龙罗汉特效
							
							
							
							
							
						 | 
						
							2020-07-31 13:31:07 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								80eb12321b
								
							
								
							
						 | 
						
							
							
								
								修改姜子牙特效
							
							
							
							
							
						 | 
						
							2020-07-30 19:29:12 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								bc213b95b3
								
							
								
							
						 | 
						
							
							
								
								增加雷震子特效
							
							
							
							
							
						 | 
						
							2020-07-30 14:42:48 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								ade2d10899
								
							
								
							
						 | 
						
							
							
								
								增加标注
							
							
							
							
							
						 | 
						
							2020-07-29 17:17:10 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								f48b05e535
								
							
								
							
						 | 
						
							
							
								
								修改特效配置,挂机对话,帮助文字
							
							
							
							
							
						 | 
						
							2020-07-28 16:38:49 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								aff5c002a9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	data_execl/base_data/CombatControl.xlsx 
							
						 | 
						
							2020-07-27 21:04:51 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								66f2e2860d
								
							
								
							
						 | 
						
							
							
								
								修改特效及文字表
							
							
							
							
							
						 | 
						
							2020-07-27 20:05:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c25fc7e39d
								
							
								
							
						 | 
						
							
							
								
								bulletTime字段权限修改
							
							
							
							
							
						 | 
						
							2020-07-27 19:45:37 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								5d08c6832a
								
							
								
							
						 | 
						
							
							
								
								修改受击特效
							
							
							
							
							
						 | 
						
							2020-07-27 18:09:38 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								9f5b75213e
								
							
								
							
						 | 
						
							
							
								
								修改特效配置
							
							
							
							
							
						 | 
						
							2020-07-25 20:39:20 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								8281ce1733
								
							
								
							
						 | 
						
							
							
								
								添加缺失效果
							
							
							
							
							
						 | 
						
							2020-07-25 17:38:52 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								773448d96c
								
							
								
							
						 | 
						
							
							
								
								修改特效
							
							
							
							
							
						 | 
						
							2020-07-25 16:11:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3cf3cf7e90
								
							
								
							
						 | 
						
							
							
								
								特效旋转功能添加
							
							
							
							
							
						 | 
						
							2020-07-23 13:44:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								560b366938
								
							
								
							
						 | 
						
							
							
								
								添加前置特效转向的效果
							
							
							
							
							
						 | 
						
							2020-07-22 14:49:32 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								8b06b6dd95
								
							
								
							
						 | 
						
							
							
								
								标注修改部分
							
							
							
							
							
						 | 
						
							2020-07-22 11:12:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								abf8830744
								
							
								
							
						 | 
						
							
							
								
								前置特效添加全屏类型
							
							
							
							
							
						 | 
						
							2020-07-21 21:34:47 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								7859285404
								
							
								
							
						 | 
						
							
							
								
								调整特效
							
							
							
							
							
						 | 
						
							2020-07-20 20:54:16 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								dbb22677ca
								
							
								
							
						 | 
						
							
							
								
								修改特效配置
							
							
							
							
							
						 | 
						
							2020-07-16 19:58:20 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								752cd999cc
								
							
								
							
						 | 
						
							
							
								
								添加英雄特效
							
							
							
							
							
						 | 
						
							2020-07-15 20:00:54 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								7c7684a714
								
							
								
							
						 | 
						
							
							
								
								冲突提交
							
							
							
							
							
						 | 
						
							2020-07-08 21:19:34 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d08552ca2f
								
							
								
							
						 | 
						
							
							
								
								外网0.16.13 内网0.15.24
							
							
							
							
							
						 | 
						
							2020-06-30 18:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								cf5f3e9952
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.12
							
							
							
							
							
						 | 
						
							2020-06-13 11:47:13 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b499b77bbe
								
							
								
							
						 | 
						
							
							
								
								外网0.16.4版本热更
							
							
							
							
							
						 | 
						
							2020-06-08 13:57:30 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								59db757cf9
								
							
								
							
						 | 
						
							
							
								
								六月三号开发提交
							
							
							
							
							
						 | 
						
							2020-06-03 19:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								063868ce73
								
							
								
							
						 | 
						
							
							
								
								外网包 0.16.1
							
							
							
							
							
						 | 
						
							2020-05-25 19:16:23 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9f11647205
								
							
								
							
						 | 
						
							
							
								
								表数据提交
							
							
							
							
							
						 | 
						
							2020-05-09 12:49:09 +08:00 |