jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2b2517ad0
								
							
								
							
						 | 
						
							
							
								
								live2d commit
							
							
							
							
							
						 | 
						
							2020-08-18 15:42:21 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								66687a1ce4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-14 17:49:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								84f82d488d
								
							
								
							
						 | 
						
							
							
								
								live2d commit
							
							
							
							
							
						 | 
						
							2020-08-14 17:43:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7453825d63
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into 0功能/资源加密方式二
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Icons/c_dhdj_00042_t1.png.meta
#	Assets/ManagedResources/Icons/c_dhdj_00042_t3.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t1.png.meta
#	Assets/ManagedResources/Icons/c_ttjz_00048_t3.png.meta
#	Assets/ManagedResources/Spine/c_dhdj_00042/c_dhdj_00042.png.meta 
							
						 | 
						
							2020-08-14 17:41:21 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								ad3ee94a75
								
							
								
							
						 | 
						
							
							
								
								资源压缩方式修改,苹果资源压缩方式添加,
							
							
							
							
							
						 | 
						
							2020-08-14 17:29:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d27b4b165f
								
							
								
							
						 | 
						
							
							
								
								资源名重复修改提交
							
							
							
							
							
						 | 
						
							2020-08-14 14:29:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3834e1960e
								
							
								
							
						 | 
						
							
							
								
								图片导入
							
							
							
							
							
						 | 
						
							2020-08-14 14:17:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b4acffd954
								
							
								
							
						 | 
						
							
							
								
								动态立绘提交
							
							
							
							
							
						 | 
						
							2020-08-14 12:20:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								be57d5d44a
								
							
								
							
						 | 
						
							
							
								
								删除错误的spine
							
							
							
							
							
						 | 
						
							2020-07-28 16:11:04 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								89169b7291
								
							
								
							
						 | 
						
							
							
								
								资源文件名重复
							
							
							
							
							
						 | 
						
							2020-07-25 14:45:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								561c3299f2
								
							
								
							
						 | 
						
							
							
								
								.asset commit
							
							
							
							
							
						 | 
						
							2020-07-23 16:05:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b424927bbb
								
							
								
							
						 | 
						
							
							
								
								tupian tijiao
							
							
							
							
							
						 | 
						
							2020-07-23 16:01:26 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								73c6cc9582
								
							
								
							
						 | 
						
							
							
								
								删除meta文件
							
							
							
							
							
						 | 
						
							2020-07-02 17:58:34 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								461c64b04a
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-02 14:53:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								52f8a9922f
								
							
								
							
						 | 
						
							
							
								
								无用meta文件删除
							
							
							
							
							
						 | 
						
							2020-07-01 17:43:55 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								5154fdbac0
								
							
								
							
						 | 
						
							
							
								
								外网0.16.14 内网0.15.25
							
							
							
							
							
						 | 
						
							2020-07-01 09:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7a410e1b60
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.5
							
							
							
							
							
						 | 
						
							2020-06-19 16:18:05 +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
							
						 | 
						
							
							
							
							
								
							
								90e12f1a4a
								
							
								
							
						 | 
						
							
							
								
								外网0.16.5,测试0.15.11
							
							
							
							
							
						 | 
						
							2020-06-08 20:18:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b499b77bbe
								
							
								
							
						 | 
						
							
							
								
								外网0.16.4版本热更
							
							
							
							
							
						 | 
						
							2020-06-08 13:57:30 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								063868ce73
								
							
								
							
						 | 
						
							
							
								
								外网包 0.16.1
							
							
							
							
							
						 | 
						
							2020-05-25 19:16:23 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |