jl_ios
							
						 | 
						
							
							
							
							
								
							
								02b7e07d20
								
							
								
							
						 | 
						
							
							
								
								删除无用的sdk资源,bugly添加缺少的文件
							
							
							
							
							
						 | 
						
							2020-08-11 14:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								93e1d880c8
								
							
								
							
						 | 
						
							
							
								
								英雄合成界面拼接
							
							
							
							
							
						 | 
						
							2020-08-06 18:34:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4533695a3d
								
							
								
							
						 | 
						
							
							
								
								法宝归元界面提交
							
							
							
							
							
						 | 
						
							2020-08-07 12:22:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5ed5f7b8c4
								
							
								
							
						 | 
						
							
							
								
								修改Loading界面资源位置
							
							
							
							
							
						 | 
						
							2020-08-03 18:49:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								056fbe171e
								
							
								
							
						 | 
						
							
							
								
								loading界面资源替换
							
							
							
							
							
						 | 
						
							2020-07-31 16:28:13 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								6807c6c1a6
								
							
								
							
						 | 
						
							
							
								
								meta文件提交
							
							
							
							
							
						 | 
						
							2020-07-25 15:15:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								abfde3e8a9
								
							
								
							
						 | 
						
							
							
								
								巅峰战bug  and   使用按钮需求
							
							
							
							
							
						 | 
						
							2020-08-24 21:46:19 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								bd8e859703
								
							
								
							
						 | 
						
							
							
								
								猕猴桃测试0.1.0
							
							
							
							
							
						 | 
						
							2020-07-20 20:52:30 +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 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b682f97e66
								
							
								
							
						 | 
						
							
							
								
								首充第一版修改
							
							
							
							
							
						 | 
						
							2020-07-15 10:36:57 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9b97aef3d7
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.15
							
							
							
							
							
						 | 
						
							2020-07-10 18:20:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b89c0582c0
								
							
								
							
						 | 
						
							
							
								
								宝囊
							
							
							
							
							
						 | 
						
							2020-07-10 17:55:11 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								1b89e68c95
								
							
								
							
						 | 
						
							
							
								
								包囊
							
							
							
							
							
						 | 
						
							2020-07-08 16:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								e3c9fb459e
								
							
								
							
						 | 
						
							
							
								
								寻宝文字提示修改,特权界面资源替换
							
							
							
							
							
						 | 
						
							2020-07-06 17:01:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4b8bae38b3
								
							
								
							
						 | 
						
							
							
								
								宝物分解界面提交
							
							
							
							
							
						 | 
						
							2020-07-06 16:27:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e3b6de5404
								
							
								
							
						 | 
						
							
							
								
								内网0.15.17 外网 0.16.8
							
							
							
							
							
						 | 
						
							2020-06-19 21:44:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								75a3f83194
								
							
								
							
						 | 
						
							
							
								
								内网0.15.16 外网 0.16.7
							
							
							
							
							
						 | 
						
							2020-06-19 20:19:35 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e189462ac9
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.14
							
							
							
							
							
						 | 
						
							2020-06-18 20:39:29 +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
							
						 | 
						
							
							
							
							
								
							
								ab3dbad074
								
							
								
							
						 | 
						
							
							
								
								测试服热更0.15.6提交
							
							
							
							
							
						 | 
						
							2020-06-05 16:16:22 +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
							
						 | 
						
							
							
							
							
								
							
								6b3a4b5fb9
								
							
								
							
						 | 
						
							
							
								
								切换为android平台
							
							
							
							
							
						 | 
						
							2020-05-15 17:46:08 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								266b9065d8
								
							
								
							
						 | 
						
							
							
								
								测试版本 带热更 0.15.1
							
							
							
							
							
						 | 
						
							2020-05-15 16:52:35 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |