zhangjiannan 
							
						 | 
						
							
							
							
							
								
							
								45cfbffd3d
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-04-18 15:11:59 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 zhangjiannan 
							
						 | 
						
							
							
							
							
								
							
								67bc362bb7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/CRC/game.asset
#	Assets/ManagedResources/BG/changjing_07.JPG.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2025-04-09 11:35:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 zhangjiannan 
							
						 | 
						
							
							
							
							
								
							
								59a5ae3ec0
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2025-03-14 11:58:20 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 zhangjiannan 
							
						 | 
						
							
							
							
							
								
							
								8dbef5a6c7
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2025-02-24 10:09:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 zhangjiannan 
							
						 | 
						
							
							
							
							
								
							
								38eff016b2
								
							
								
							
						 | 
						
							
							
								
								1
							
							
							
							
							
						 | 
						
							2024-12-31 20:25:27 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								8d5818a84c
								
							
								
							
						 | 
						
							
							
								
								英文版
							
							
							
							
							
						 | 
						
							2024-11-06 12:24:10 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 zhangjiannan 
							
						 | 
						
							
							
							
							
								
							
								0bb647a100
								
							
								
							
						 | 
						
							
							
								
								同步新差异
							
							
							
							
							
						 | 
						
							2024-09-25 12:07:02 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 zhangjiannan 
							
						 | 
						
							
							
							
							
								
							
								95921de93b
								
							
								
							
						 | 
						
							
							
								
								meta文件
							
							
							
							
							
						 | 
						
							2024-09-03 18:53:01 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								9365bde653
								
							
								
							
						 | 
						
							
							
								
								升级小人
							
							
							
							
							
						 | 
						
							2024-09-02 11:52:09 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								e438ccfcae
								
							
								
							
						 | 
						
							
							
								
								本地化
							
							
							
							
							
						 | 
						
							2024-08-29 15:28:53 +08:00 | 
						
					
				
					
						
							
							
								
								 DESKTOP-MMO982B\User
							
						 | 
						
							
							
							
							
								
							
								e968129b5a
								
							
								
							
						 | 
						
							
							
								
								本地化修改图片名以_zh结尾
							
							
							
							
							
						 | 
						
							2024-08-14 16:44:07 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								57dfbaeac5
								
							
								
							
						 | 
						
							
							
								
								男主spine修改
							
							
							
							
							
						 | 
						
							2024-05-13 16:51:30 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								dd6b395e9f
								
							
								
							
						 | 
						
							
							
								
								修改部分spine
							
							
							
							
							
						 | 
						
							2024-05-12 11:45:09 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								8bbf654ce7
								
							
								
							
						 | 
						
							
							
								
								修改部分spine
							
							
							
							
							
						 | 
						
							2024-05-12 00:56:42 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								0d0d0f5679
								
							
								
							
						 | 
						
							
							
								
								修改部分spine
							
							
							
							
							
						 | 
						
							2024-05-12 00:35:31 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								545211cad2
								
							
								
							
						 | 
						
							
							
								
								修改部分spine
							
							
							
							
							
						 | 
						
							2024-05-12 00:30:41 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								f48bad6e22
								
							
								
							
						 | 
						
							
							
								
								修改部分spine
							
							
							
							
							
						 | 
						
							2024-05-12 00:25:26 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								cdaf56992e
								
							
								
							
						 | 
						
							
							
								
								修改精卫
							
							
							
							
							
						 | 
						
							2024-05-11 23:59:33 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								ab064ffe97
								
							
								
							
						 | 
						
							
							
								
								修改部分spine
							
							
							
							
							
						 | 
						
							2024-05-11 23:43:01 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								c9ac00a3a9
								
							
								
							
						 | 
						
							
							
								
								替换部分spine
							
							
							
							
							
						 | 
						
							2024-05-11 23:42:03 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								ca90ebb6e2
								
							
								
							
						 | 
						
							
							
								
								替换新版主角spine
							
							
							
							
							
						 | 
						
							2024-05-09 18:55:27 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								161669ece1
								
							
								
							
						 | 
						
							
							
								
								修改灵扇仙资源
							
							
							
							
							
						 | 
						
							2024-04-20 19:58:07 +08:00 | 
						
					
				
					
						
							
							
								
								 PC-202302260912\Administrator
							
						 | 
						
							
							
							
							
								
							
								a02a34ba11
								
							
								
							
						 | 
						
							
							
								
								小兵资源提交
							
							
							
							
							
						 | 
						
							2024-04-15 11:32:10 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								f979b09616
								
							
								
							
						 | 
						
							
							
								
								新增立绘
							
							
							
							
							
						 | 
						
							2024-04-10 11:54:10 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								80514dd0fe
								
							
								
							
						 | 
						
							
							
								
								删除老的白骨精资源
							
							
							
							
							
						 | 
						
							2024-04-10 11:42:34 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								63eb2adde4
								
							
								
							
						 | 
						
							
							
								
								新增白骨夫人立绘
							
							
							
							
							
						 | 
						
							2024-04-10 11:30:48 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								abab94dded
								
							
								
							
						 | 
						
							
							
								
								删除不需要的spine
							
							
							
							
							
						 | 
						
							2024-04-03 15:58:20 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								612dbb622e
								
							
								
							
						 | 
						
							
							
								
								新增角色立绘
							
							
							
							
							
						 | 
						
							2024-04-03 15:49:20 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								c28c76dd9f
								
							
								
							
						 | 
						
							
							
								
								删除老spine
							
							
							
							
							
						 | 
						
							2024-03-26 11:31:55 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								7641275fb6
								
							
								
							
						 | 
						
							
							
								
								删除老spine
							
							
							
							
							
						 | 
						
							2024-03-26 11:27:03 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								50b50a80d6
								
							
								
							
						 | 
						
							
							
								
								新增角色立绘
							
							
							
							
							
						 | 
						
							2024-03-26 11:18:45 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								526cfcae9f
								
							
								
							
						 | 
						
							
							
								
								增加猪八戒立绘
							
							
							
							
							
						 | 
						
							2024-03-25 16:38:54 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								3ec4010f39
								
							
								
							
						 | 
						
							
							
								
								删除旧角色
							
							
							
							
							
						 | 
						
							2024-03-13 19:09:22 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								428c81c98e
								
							
								
							
						 | 
						
							
							
								
								新增罗刹
							
							
							
							
							
						 | 
						
							2024-03-13 19:06:33 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								530409d777
								
							
								
							
						 | 
						
							
							
								
								修改九河神女spine
							
							
							
							
							
						 | 
						
							2024-02-27 18:45:19 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								0ecdac9ded
								
							
								
							
						 | 
						
							
							
								
								增加新英雄
							
							
							
							
							
						 | 
						
							2024-02-27 15:58:11 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								fc0948faf9
								
							
								
							
						 | 
						
							
							
								
								替换新英雄立绘
							
							
							
							
							
						 | 
						
							2024-02-23 19:07:56 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								d7e503e486
								
							
								
							
						 | 
						
							
							
								
								增加新英雄
							
							
							
							
							
						 | 
						
							2024-01-23 14:36:26 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								a583260d2b
								
							
								
							
						 | 
						
							
							
								
								增加女儿国王spine
							
							
							
							
							
						 | 
						
							2024-01-19 18:53:16 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-C3M45P4\dengdan
							
						 | 
						
							
							
							
							
								
							
								016d27435f
								
							
								
							
						 | 
						
							
							
								
								增加新赵公明spine
							
							
							
							
							
						 | 
						
							2024-01-19 18:50:12 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0708630890
								
							
								
							
						 | 
						
							
							
								
								新英雄  ===================雨女资源提交
							
							
							
							
							
						 | 
						
							2023-02-28 10:59:28 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								113e0ceb73
								
							
								
							
						 | 
						
							
							
								
								数字游戏缺失资源提交
							
							
							
							
							
						 | 
						
							2022-07-13 18:37:23 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								d952b9a44c
								
							
								
							
						 | 
						
							
							
								
								数字游戏模块提交
							
							
							
							
							
						 | 
						
							2022-07-11 15:43:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8558152b29
								
							
								
							
						 | 
						
							
							
								
								【立绘】东华帝君,孟婆立绘回归
							
							
							
							
							
						 | 
						
							2022-03-02 19:00:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d03215cc16
								
							
								
							
						 | 
						
							
							
								
								[资源]========神菩提提交
							
							
							
							
							
							
							
							(cherry picked from commit fb9ad83e40f24e680cbc395ba82f777db7422e7e) 
							
						 | 
						
							2022-02-17 10:40:12 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d7749de932
								
							
								
							
						 | 
						
							
							
								
								【资源】======女儿国王 申公豹spine修改
							
							
							
							
							
						 | 
						
							2021-12-27 15:45:21 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c7c6889e27
								
							
								
							
						 | 
						
							
							
								
								[资源]============虎年坐骑修改提交
							
							
							
							
							
						 | 
						
							2021-12-24 14:06:50 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b7bfc1d867
								
							
								
							
						 | 
						
							
							
								
								【资源】======虎年坐骑提交
							
							
							
							
							
						 | 
						
							2021-12-22 16:15:51 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a7dac651c6
								
							
								
							
						 | 
						
							
							
								
								[资源]=======罗刹spine修改
							
							
							
							
							
						 | 
						
							2021-12-22 16:14:42 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9c07c341e5
								
							
								
							
						 | 
						
							
							
								
								【资源】===嫦娥新动作提交
							
							
							
							
							
						 | 
						
							2021-12-17 15:08:30 +08:00 |