jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								981aba2417
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 11:26:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								48901f3817
								
							
								
							
						 | 
						
							
							
								
								【寻仙招募】心愿单中添加飞升石道具
							
							
							
							
							
						 | 
						
							2022-01-12 18:27:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9f8ee231ac
								
							
								
							
						 | 
						
							
							
								
								【装备界面】排行榜数据错误修改
							
							
							
							
							
						 | 
						
							2022-01-11 17:51:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0ee930c550
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 14:01:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5d2838554d
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动/新大圣升星' into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 14:00:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								dbbfc9dfe3
								
							
								
							
						 | 
						
							
							
								
								【限时升星】选择神将界面标题错误
							
							
							
							
							
						 | 
						
							2022-01-14 11:50:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6bb00a785c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-11 11:28:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40e37473dc
								
							
								
							
						 | 
						
							
							
								
								【ID1011029】
							
							
							
							
							
							
							
							【优化】 神将界面优化 
							
						 | 
						
							2022-01-11 11:09:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cc3791e0d5
								
							
								
							
						 | 
						
							
							
								
								【家园】修改到达上线提示文字、红点修改
							
							
							
							
							
						 | 
						
							2022-01-10 17:24:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6b2860c5f4
								
							
								
							
						 | 
						
							
							
								
								【命格】获得命石后,有可穿戴入口没红点
							
							
							
							
							
						 | 
						
							2022-01-10 15:38:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3e11f70576
								
							
								
							
						 | 
						
							
							
								
								【云游商人】选择升级的装备,显示可以选择全部
							
							
							
							
							
						 | 
						
							2022-01-10 14:56:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								244c8050e0
								
							
								
							
						 | 
						
							
							
								
								【装备】装备界面套装属性显示不正确修改
							
							
							
							
							
						 | 
						
							2022-01-08 17:49:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ecaa9f1dbc
								
							
								
							
						 | 
						
							
							
								
								【英雄选择】英雄选择界面通用化
							
							
							
							
							
						 | 
						
							2022-01-08 17:47:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								94cf5e4aec
								
							
								
							
						 | 
						
							
							
								
								【建木神树】提交
							
							
							
							
							
						 | 
						
							2022-01-08 10:33:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								956826c46a
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁提交
							
							
							
							
							
						 | 
						
							2022-01-06 17:53:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0bed9188dc
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁提交
							
							
							
							
							
						 | 
						
							2022-01-06 17:04:13 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f2b684ecd
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 16:25:20 +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
							
						 | 
						
							
							
							
							
								
							
								cb9fc77b15
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁文字提示提交
							
							
							
							
							
						 | 
						
							2022-01-06 15:52:51 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4133605f55
								
							
								
							
						 | 
						
							
							
								
								【家园】引导提交
							
							
							
							
							
						 | 
						
							2022-01-06 15:28:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7058575f3a
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 14:23:41 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7c0726e5b9
								
							
								
							
						 | 
						
							
							
								
								【神将详情】根据魂印的显示修改界面的大小
							
							
							
							
							
						 | 
						
							2022-01-06 12:03:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								404618f9bc
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁突破显示
							
							
							
							
							
						 | 
						
							2022-01-06 11:53:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								68ad9cf7e1
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 11:45:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2f03bf5ab7
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 19:12:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								29a16ba5c8
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:16:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								aa761fc4e9
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:04:57 +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
							
						 | 
						
							
							
							
							
								
							
								5e0c53e322
								
							
								
							
						 | 
						
							
							
								
								【家园】替换底图
							
							
							
							
							
						 | 
						
							2022-01-04 18:58:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								39244f8ce5
								
							
								
							
						 | 
						
							
							
								
								【家园】特权完成,2021最后的提交!!
							
							
							
							
							
						 | 
						
							2021-12-31 18:58:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								27ead6dcff
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-31 16:30:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cf9cbc5ac9
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁装备属性加持+战斗力
							
							
							
							
							
						 | 
						
							2021-12-31 13:44:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								85319e89f0
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-30 20:09:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8de1e4e596
								
							
								
							
						 | 
						
							
							
								
								【家园】资源提交
							
							
							
							
							
						 | 
						
							2021-12-30 19:02:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								57b0689de6
								
							
								
							
						 | 
						
							
							
								
								【ID1010911】
							
							
							
							
							
							
							
							【森罗优化】退出森罗幻境时弹出累积收益 
							
						 | 
						
							2021-12-30 18:06:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5ab9c8d915
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into tansuo
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua 
							
						 | 
						
							2021-12-30 16:47:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5672203920
								
							
								
							
						 | 
						
							
							
								
								【云游商人】优化
							
							
							
							
							
						 | 
						
							2021-12-30 16:29:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f500bc9ed1
								
							
								
							
						 | 
						
							
							
								
								【云游商人】更改索引方式
							
							
							
							
							
						 | 
						
							2021-12-30 15:51:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0f32a05956
								
							
								
							
						 | 
						
							
							
								
								【装备界面】增加摘星阁加持
							
							
							
							
							
						 | 
						
							2021-12-30 11:49:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7b67ef38df
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into tansuo
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua 
							
						 | 
						
							2021-12-30 11:43:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								44aa663ab0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
						 | 
						
							2021-12-30 11:24:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f148668636
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-30 11:00:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								630d56c810
								
							
								
							
						 | 
						
							
							
								
								【家园】装备强化升级
							
							
							
							
							
						 | 
						
							2021-12-29 20:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a1301a4a22
								
							
								
							
						 | 
						
							
							
								
								【家园】任务
							
							
							
							
							
						 | 
						
							2021-12-29 14:03:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								978689d9a7
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 17:52:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d81a2b7265
								
							
								
							
						 | 
						
							
							
								
								【命格】界面无法打开修改
							
							
							
							
							
						 | 
						
							2021-12-28 15:01:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0e0f209440
								
							
								
							
						 | 
						
							
							
								
								探索时间选择修改
							
							
							
							
							
						 | 
						
							2021-12-28 13:37:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4a9792363d
								
							
								
							
						 | 
						
							
							
								
								协议提交
							
							
							
							
							
						 | 
						
							2021-12-27 17:13:54 +08:00 |