gongjiawei
							
						 | 
						
							
							
							
							
								
							
								8445b33d18
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-27 18:32:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								c8280b455c
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-27 18:02:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								cd340bb0fc
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-27 17:49:31 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b28309e14e
								
							
								
							
						 | 
						
							
							
								
								资源位置移动
							
							
							
							
							
						 | 
						
							2020-08-25 19:26:51 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								af6dcc4410
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-18 16:23:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jl_ios
							
						 | 
						
							
							
							
							
								
							
								02b7e07d20
								
							
								
							
						 | 
						
							
							
								
								删除无用的sdk资源,bugly添加缺少的文件
							
							
							
							
							
						 | 
						
							2020-08-11 14:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								6c4dab9fbb
								
							
								
							
						 | 
						
							
							
								
								音頻跟新
							
							
							
							
							
						 | 
						
							2020-08-05 18:15:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								0c1250f88c
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-08-05 11:43:13 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								2175be7bfc
								
							
								
							
						 | 
						
							
							
								
								配音更新
							
							
							
							
							
						 | 
						
							2020-07-28 10:25:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								ffccc6d77a
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-27 14:20:50 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								127d675497
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-21 15:39:06 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								bd8e859703
								
							
								
							
						 | 
						
							
							
								
								猕猴桃测试0.1.0
							
							
							
							
							
						 | 
						
							2020-07-20 20:52:30 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								c46047fe2c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_test
							
							
							
							
							
							
							
							# Conflicts:
#	data_execl/base_data/GuideConfig.xlsx 
							
						 | 
						
							2020-07-17 16:13:04 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								531a21608b
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-16 20:53:40 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								2be4cc20e6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_test
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	data_execl/base_data/CombatControl.xlsx
#	data_execl/base_data/GuideConfig.xlsx 
							
						 | 
						
							2020-07-16 20:08:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								cb7af0967b
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 16:19:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								deee98f641
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 15:48:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								dc5799c229
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 14:54:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								325d9c7224
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.28
							
							
							
							
							
						 | 
						
							2020-07-11 17:33:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8be0056346
								
							
								
							
						 | 
						
							
							
								
								技能名称音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 16:26:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								679752e628
								
							
								
							
						 | 
						
							
							
								
								技能音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 16:26:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5c1e235228
								
							
								
							
						 | 
						
							
							
								
								技能名称音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 15:42:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ee0c035731
								
							
								
							
						 | 
						
							
							
								
								技能音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 15:19:49 +08:00 |