ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								898f88a0b9
								
							
								
							
						 | 
						
							
							
								
								【寻仙招募】修改奖励显示内容
							
							
							
							
							
						 | 
						
							2022-01-13 16:03:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2599afd6de
								
							
								
							
						 | 
						
							
							
								
								【寻仙招募】心愿选飞升石,查看奖励报错
							
							
							
							
							
						 | 
						
							2022-01-13 15:28:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0e8e6e1874
								
							
								
							
						 | 
						
							
							
								
								探索修改提交
							
							
							
							
							
						 | 
						
							2022-01-13 13:59:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8b4533aac9
								
							
								
							
						 | 
						
							
							
								
								一键探索调整编队后探索地图修改提交
							
							
							
							
							
						 | 
						
							2022-01-13 11:17:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								05e078dadc
								
							
								
							
						 | 
						
							
							
								
								探索引导修改提交
							
							
							
							
							
						 | 
						
							2022-01-12 15:27:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								60c31c1d5b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-11 18:20:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								617a557071
								
							
								
							
						 | 
						
							
							
								
								【家园】修改按钮
							
							
							
							
							
						 | 
						
							2022-01-11 18:20:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9826244e7e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-11 18:19:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8d82a962a6
								
							
								
							
						 | 
						
							
							
								
								【家园】特效提交
							
							
							
							
							
						 | 
						
							2022-01-11 18:18:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e3c1c348e7
								
							
								
							
						 | 
						
							
							
								
								【家园】特权剩余时间修改
							
							
							
							
							
						 | 
						
							2022-01-11 13:29:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c40be4411d
								
							
								
							
						 | 
						
							
							
								
								【家园】特权时间显示跳帧
							
							
							
							
							
						 | 
						
							2022-01-10 18:22:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								567f5c1aa0
								
							
								
							
						 | 
						
							
							
								
								【家园】升级倒计时显示错误修改
							
							
							
							
							
						 | 
						
							2022-01-10 17:38:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2455410a0c
								
							
								
							
						 | 
						
							
							
								
								【命格】镶嵌按钮显示穿戴
							
							
							
							
							
						 | 
						
							2022-01-10 15:29:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6ddd4c543f
								
							
								
							
						 | 
						
							
							
								
								【修为】修为点击问号,弹出鬼畜动画,当前是元婴期
							
							
							
							
							
						 | 
						
							2022-01-10 15:06:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c157985e24
								
							
								
							
						 | 
						
							
							
								
								【建木神树】调整
							
							
							
							
							
						 | 
						
							2022-01-08 11:36:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								54b01f4d86
								
							
								
							
						 | 
						
							
							
								
								【家园+易经宝库】提交
							
							
							
							
							
						 | 
						
							2022-01-06 18:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e0c228bf3f
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】提交
							
							
							
							
							
						 | 
						
							2022-01-06 18:27:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								956826c46a
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁提交
							
							
							
							
							
						 | 
						
							2022-01-06 17:53:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6b1c28a920
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2022-01-06 16:40:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b1be355601
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'tansuo' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2022-01-06 16:07:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9c874f1789
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua 
							
						 | 
						
							2022-01-06 15:38:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								79364232f0
								
							
								
							
						 | 
						
							
							
								
								【ID1010966】
							
							
							
							
							
							
							
							【优化】法宝聚灵调整 
							
						 | 
						
							2022-01-06 14:52:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								893e33d920
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 10:33:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2f03bf5ab7
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 19:12:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								aa761fc4e9
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:04:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b45f74781c
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 17:06:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f4942e87e
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 16:21:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f0de43aad2
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 14:17:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c0d27feac2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua 
							
						 | 
						
							2022-01-05 10:16:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								19c27ae7bb
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 10:12:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5e0c53e322
								
							
								
							
						 | 
						
							
							
								
								【家园】替换底图
							
							
							
							
							
						 | 
						
							2022-01-04 18:58:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								14044932b5
								
							
								
							
						 | 
						
							
							
								
								【命格】属性加成报错修改
							
							
							
							
							
						 | 
						
							2022-01-04 16:57:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a07fdc40ac
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-04 15:10:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ebc67f1602
								
							
								
							
						 | 
						
							
							
								
								战力修改提交
							
							
							
							
							
						 | 
						
							2022-01-04 14:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								39244f8ce5
								
							
								
							
						 | 
						
							
							
								
								【家园】特权完成,2021最后的提交!!
							
							
							
							
							
						 | 
						
							2021-12-31 18:58:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2b3afae7ea
								
							
								
							
						 | 
						
							
							
								
								【家园】特权
							
							
							
							
							
						 | 
						
							2021-12-31 18:13:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d1b84299c2
								
							
								
							
						 | 
						
							
							
								
								【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS
							
							
							
							
							
						 | 
						
							2022-01-03 02:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								27ead6dcff
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-31 16:30:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d4d1653bc2
								
							
								
							
						 | 
						
							
							
								
								探索优化
							
							
							
							
							
						 | 
						
							2021-12-30 14:01:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4b6de5c984
								
							
								
							
						 | 
						
							
							
								
								探索优化提交
							
							
							
							
							
						 | 
						
							2021-12-30 13:27:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d91afe4326
								
							
								
							
						 | 
						
							
							
								
								探索
							
							
							
							
							
						 | 
						
							2021-12-29 14:35:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								73eebe80e0
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 14:33:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								32cc5de541
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 14:30:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4e4ebd563c
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 14:24:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5c51490cf5
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 10:33:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dac88a6dbf
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 10:02:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								197b28b3da
								
							
								
							
						 | 
						
							
							
								
								【家园】加速确认
							
							
							
							
							
						 | 
						
							2021-12-28 18:27:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d06a5e6471
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 18:16:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b256c7a9c5
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 14:50:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9dafa85858
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 13:30:27 +08:00 |