gongjiawei
							
						 | 
						
							
							
							
							
								
							
								781a1e8453
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-21 14:24:57 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e15bf9a7b2
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜资源提交
							
							
							
							
							
						 | 
						
							2020-07-15 16:27:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7785a7c472
								
							
								
							
						 | 
						
							
							
								
								神将生阶属性显示错误问题修复
							
							
							
							
							
						 | 
						
							2020-07-14 14:03:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								db1118aa9c
								
							
								
							
						 | 
						
							
							
								
								修复打包后不能充值得bug
							
							
							
							
							
						 | 
						
							2020-07-13 16:48:50 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9b97aef3d7
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.15
							
							
							
							
							
						 | 
						
							2020-07-10 18:20:58 +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
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |