wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								aaa4b987eb
								
							
								
							
						 | 
						
							
							
								
								玉虚论道修改
							
							
							
							
							
						 | 
						
							2021-09-11 19:47:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								683b48fb0c
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-11 18:53:58 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d9214666c2
								
							
								
							
						 | 
						
							
							
								
								玉虚论道回放优化
							
							
							
							
							
						 | 
						
							2021-09-11 16:00:39 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4b5c55a1ab
								
							
								
							
						 | 
						
							
							
								
								qqq
							
							
							
							
							
						 | 
						
							2021-09-11 15:05:37 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								cbb088a491
								
							
								
							
						 | 
						
							
							
								
								他人队伍灵兽修改
							
							
							
							
							
						 | 
						
							2021-09-10 22:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								489f6f7e37
								
							
								
							
						 | 
						
							
							
								
								编对拖动英雄保存队伍修改
							
							
							
							
							
						 | 
						
							2021-09-10 21:34:45 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								16289857a5
								
							
								
							
						 | 
						
							
							
								
								aaaa
							
							
							
							
							
						 | 
						
							2021-09-10 18:21:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f7d1601c79
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua 
							
						 | 
						
							2021-09-10 16:26:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								16633b37a8
								
							
								
							
						 | 
						
							
							
								
								【编队优化】
							
							
							
							
							
						 | 
						
							2021-09-10 16:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e2f7284507
								
							
								
							
						 | 
						
							
							
								
								qqqq
							
							
							
							
							
						 | 
						
							2021-09-10 15:50:24 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3257b89e70
								
							
								
							
						 | 
						
							
							
								
								eeeeeeee
							
							
							
							
							
						 | 
						
							2021-09-09 23:01:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								159f2e2494
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua 
							
						 | 
						
							2021-09-09 20:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a1c21eb441
								
							
								
							
						 | 
						
							
							
								
								qqqqq
							
							
							
							
							
						 | 
						
							2021-09-09 20:32:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8bb679214b
								
							
								
							
						 | 
						
							
							
								
								【玉虚】QA提示添加
							
							
							
							
							
						 | 
						
							2021-09-09 19:21:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ed1f153fa1
								
							
								
							
						 | 
						
							
							
								
								【玉虚】挑战界面动画添加,优化界面显示,挑战完成后关闭界面时刷新挑战列表
							
							
							
							
							
						 | 
						
							2021-09-09 18:04:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								48e25d05e7
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 16:47:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								21a222cb27
								
							
								
							
						 | 
						
							
							
								
								aaaaaaaa
							
							
							
							
							
						 | 
						
							2021-09-09 16:47:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1094c3678a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 16:40:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b29d7b43fe
								
							
								
							
						 | 
						
							
							
								
								【玉虚】每日挑战奖励显示优化
							
							
							
							
							
						 | 
						
							2021-09-09 16:40:29 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ea457002be
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 16:27:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c27379226c
								
							
								
							
						 | 
						
							
							
								
								aaaaaaaaaaaaa
							
							
							
							
							
						 | 
						
							2021-09-09 16:27:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b1c987b16f
								
							
								
							
						 | 
						
							
							
								
								【玉虚】界面显示优化,星星显示优化
							
							
							
							
							
						 | 
						
							2021-09-09 16:22:35 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								49a7a2b242
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' of http://60.1.1.230/gaoxin/JL_Client into 0功能/玉虚论道
							
							
							
							
							
						 | 
						
							2021-09-09 15:44:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0d82056bc2
								
							
								
							
						 | 
						
							
							
								
								主界面显示修改
							
							
							
							
							
						 | 
						
							2021-09-09 15:44:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								065734184e
								
							
								
							
						 | 
						
							
							
								
								【玉虚】商店跳转添加
							
							
							
							
							
						 | 
						
							2021-09-09 15:16:41 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a58b5f2d88
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-09 11:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c531b3776b
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-07 18:27:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5f0bfe53bd
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-07 17:05:46 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								dcacc94fad
								
							
								
							
						 | 
						
							
							
								
								玉虚论道脚本预设提交
							
							
							
							
							
						 | 
						
							2021-08-31 15:10:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								01ad6f3229
								
							
								
							
						 | 
						
							
							
								
								【玉虚轮道】=====功能入口提交
							
							
							
							
							
						 | 
						
							2021-08-30 15:41:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								74f0e3f8a2
								
							
								
							
						 | 
						
							
							
								
								【玉虚论道】编队界面提交
							
							
							
							
							
						 | 
						
							2021-08-27 13:45:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f13f1937c7
								
							
								
							
						 | 
						
							
							
								
								【玉虚论道】其他人信息界面
							
							
							
							
							
						 | 
						
							2021-08-26 18:14:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dc943be130
								
							
								
							
						 | 
						
							
							
								
								【玉虚论道】其他人信息界面提价
							
							
							
							
							
						 | 
						
							2021-08-26 17:36:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c0ea5e1b7f
								
							
								
							
						 | 
						
							
							
								
								【玉虚论道】其他人编队信息界面
							
							
							
							
							
						 | 
						
							2021-08-26 17:14:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6345a18ebe
								
							
								
							
						 | 
						
							
							
								
								【玉虚论道】我的编队界面
							
							
							
							
							
						 | 
						
							2021-08-26 13:42:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								94b4d550e5
								
							
								
							
						 | 
						
							
							
								
								【玉虚论道】我的编队界面提交
							
							
							
							
							
						 | 
						
							2021-08-25 20:31:21 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								989323916b
								
							
								
							
						 | 
						
							
							
								
								主界面脚本提交
							
							
							
							
							
						 | 
						
							2021-08-25 11:44:48 +08:00 |