ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								48901f3817
								
							
								
							
						 | 
						
							
							
								
								【寻仙招募】心愿单中添加飞升石道具
							
							
							
							
							
						 | 
						
							2022-01-12 18:27:16 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3e11f70576
								
							
								
							
						 | 
						
							
							
								
								【云游商人】选择升级的装备,显示可以选择全部
							
							
							
							
							
						 | 
						
							2022-01-10 14:56:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ecaa9f1dbc
								
							
								
							
						 | 
						
							
							
								
								【英雄选择】英雄选择界面通用化
							
							
							
							
							
						 | 
						
							2022-01-08 17:47:34 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cb9fc77b15
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁文字提示提交
							
							
							
							
							
						 | 
						
							2022-01-06 15:52:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4133605f55
								
							
								
							
						 | 
						
							
							
								
								【家园】引导提交
							
							
							
							
							
						 | 
						
							2022-01-06 15:28:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7058575f3a
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 14:23:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								404618f9bc
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁突破显示
							
							
							
							
							
						 | 
						
							2022-01-06 11:53:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								68ad9cf7e1
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 11:45:28 +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
							
						 | 
						
							
							
							
							
								
							
								27ead6dcff
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-31 16:30:53 +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
							
						 | 
						
							
							
							
							
								
							
								f148668636
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-30 11:00:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								630d56c810
								
							
								
							
						 | 
						
							
							
								
								【家园】装备强化升级
							
							
							
							
							
						 | 
						
							2021-12-29 20:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								978689d9a7
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 17:52:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0e0f209440
								
							
								
							
						 | 
						
							
							
								
								探索时间选择修改
							
							
							
							
							
						 | 
						
							2021-12-28 13:37:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d83373ecab
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into tansuo
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua 
							
						 | 
						
							2021-12-27 17:00:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								337261f8b2
								
							
								
							
						 | 
						
							
							
								
								【家园】升级,取消,加速
							
							
							
							
							
						 | 
						
							2021-12-24 18:20:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dbc3395945
								
							
								
							
						 | 
						
							
							
								
								【家园】详情
							
							
							
							
							
						 | 
						
							2021-12-24 09:33:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								130a75c8dd
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-24 00:14:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5d37c0d4d9
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-23 17:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6fe4e5d3f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
						 | 
						
							2021-12-23 14:49:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f676ae8478
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-23 14:38:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7bb3325c99
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-23 13:09:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a197f16837
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua 
							
						 | 
						
							2021-12-17 15:46:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								73283bd818
								
							
								
							
						 | 
						
							
							
								
								回退修改提交
							
							
							
							
							
						 | 
						
							2021-12-16 10:09:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c6eb719fa6
								
							
								
							
						 | 
						
							
							
								
								添加回退消耗数量
							
							
							
							
							
						 | 
						
							2021-12-15 14:41:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								568ad92a9b
								
							
								
							
						 | 
						
							
							
								
								回退修改
							
							
							
							
							
						 | 
						
							2021-12-15 14:28:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7e85eeaa90
								
							
								
							
						 | 
						
							
							
								
								【ID1010843】
							
							
							
							
							
							
							
							增加英雄回退功能 
							
						 | 
						
							2021-12-14 17:57:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c83c3412e
								
							
								
							
						 | 
						
							
							
								
								【ID1010843】
							
							
							
							
							
							
							
							增加英雄回退功能 
							
						 | 
						
							2021-12-14 17:25:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f248583e9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-14 09:49:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								13815dd2a5
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-14 09:48:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b4e7faa04c
								
							
								
							
						 | 
						
							
							
								
								文字修改
							
							
							
							
							
						 | 
						
							2021-12-13 17:44:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0b9bd476dd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-13 17:26:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d91811a555
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-13 17:26:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								52ad37eee0
								
							
								
							
						 | 
						
							
							
								
								【ID1019400】
							
							
							
							
							
							
							
							【月卡】购买招募秘宝后不弹出激活月卡提示,领取招募秘宝奖励时才弹出,并且提示不正确 
							
						 | 
						
							2021-12-13 16:20:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								244aa76319
								
							
								
							
						 | 
						
							
							
								
								【ID1019396】
							
							
							
							
							
							
							
							【招募秘宝】激活秘宝后没有获得980妖晶 
							
						 | 
						
							2021-12-13 15:13:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ad589aa449
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 17:18:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4b4ae7a608
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 16:16:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f09556242d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua 
							
						 | 
						
							2021-12-10 14:16:28 +08:00 |