zhangqiang
							
						 | 
						
							
							
							
							
								
							
								88456863c2
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-02 16:44:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								39e9728561
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab 
							
						 | 
						
							2020-09-02 13:36:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e3e95e2379
								
							
								
							
						 | 
						
							
							
								
								森罗 无尽 流程优化和界面调整
							
							
							
							
							
						 | 
						
							2020-09-02 13:35:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								13ab0dc54f
								
							
								
							
						 | 
						
							
							
								
								小弹窗界面屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 10:29:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8d19f5c583
								
							
								
							
						 | 
						
							
							
								
								prefab commit
							
							
							
							
							
						 | 
						
							2020-09-09 10:11:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								933aadbf65
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-01 18:36:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								00b75cc097
								
							
								
							
						 | 
						
							
							
								
								prefab commit
							
							
							
							
							
						 | 
						
							2020-09-01 18:36:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								97eaf77009
								
							
								
							
						 | 
						
							
							
								
								主界面底部界面经验条显示调整
							
							
							
							
							
						 | 
						
							2020-09-01 17:12:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eeecbca77a
								
							
								
							
						 | 
						
							
							
								
								部分界面适配调整
							
							
							
							
							
						 | 
						
							2020-09-01 16:56:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e74c120d01
								
							
								
							
						 | 
						
							
							
								
								大闹天宫重置红点、无尽副本界面红点
							
							
							
							
							
						 | 
						
							2020-09-01 11:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4b41b5def9
								
							
								
							
						 | 
						
							
							
								
								副本界面显示优化
							
							
							
							
							
						 | 
						
							2020-08-26 20:20:40 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b0222ccd61
								
							
								
							
						 | 
						
							
							
								
								艺术字体替换,美元显示优化
							
							
							
							
							
						 | 
						
							2020-08-26 12:26:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								59204790d2
								
							
								
							
						 | 
						
							
							
								
								xuanyuan commit
							
							
							
							
							
						 | 
						
							2020-08-26 10:58:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0f90bbe3fb
								
							
								
							
						 | 
						
							
							
								
								副本预设修改
							
							
							
							
							
						 | 
						
							2020-08-24 10:07:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								95593175ec
								
							
								
							
						 | 
						
							
							
								
								dailycarbonpanel update
							
							
							
							
							
						 | 
						
							2020-08-18 14:00:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								740eb7253d
								
							
								
							
						 | 
						
							
							
								
								xuanyuan commit
							
							
							
							
							
						 | 
						
							2020-08-14 20:41:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40b9550c54
								
							
								
							
						 | 
						
							
							
								
								修改轩辕副本立绘提交
							
							
							
							
							
						 | 
						
							2020-08-14 14:35:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								937d46ff75
								
							
								
							
						 | 
						
							
							
								
								xuanyuan commit
							
							
							
							
							
						 | 
						
							2020-08-12 21:10:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								39fb3d113c
								
							
								
							
						 | 
						
							
							
								
								xuyuan commit
							
							
							
							
							
						 | 
						
							2020-08-12 21:10:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8c27eecbf6
								
							
								
							
						 | 
						
							
							
								
								xuanyuan update
							
							
							
							
							
						 | 
						
							2020-08-12 14:30:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7bee1280b3
								
							
								
							
						 | 
						
							
							
								
								xuanyuan update
							
							
							
							
							
						 | 
						
							2020-08-12 14:13:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f7fe1d9513
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop2' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	data_execl/base_data/GlobalActivity.xlsx
#	data_execl/base_data/GlobalSystemConfig.xlsx
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/RechargeCommodityConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx 
							
						 | 
						
							2020-08-11 14:07:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6f05841519
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2020-08-11 11:00:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3d2f288934
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜提交
							
							
							
							
							
						 | 
						
							2020-08-11 09:48:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c095459166
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2020-08-05 21:01:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8b3bcecb59
								
							
								
							
						 | 
						
							
							
								
								activity commit
							
							
							
							
							
						 | 
						
							2020-08-03 10:18:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b9084626eb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 17:51:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b2af34a2b3
								
							
								
							
						 | 
						
							
							
								
								副本红点提交
							
							
							
							
							
						 | 
						
							2020-07-29 17:50:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b2a54634d2
								
							
								
							
						 | 
						
							
							
								
								适配调整   巅峰赛入口
							
							
							
							
							
						 | 
						
							2020-08-15 00:08:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ee79439f39
								
							
								
							
						 | 
						
							
							
								
								万象境 bug修复
							
							
							
							
							
						 | 
						
							2020-07-28 10:42:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b6c2b22a3d
								
							
								
							
						 | 
						
							
							
								
								【日常副本优化】每个日常副本标题下方增加副本描述文字
							
							
							
							
							
						 | 
						
							2020-07-27 20:34:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								18c6ad6555
								
							
								
							
						 | 
						
							
							
								
								carbon prefab commit
							
							
							
							
							
						 | 
						
							2020-07-27 20:08:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								54b3aad5e9
								
							
								
							
						 | 
						
							
							
								
								【副本优化】副本入口处增加文字提示
							
							
							
							
							
						 | 
						
							2020-07-27 19:48:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								064b819f4a
								
							
								
							
						 | 
						
							
							
								
								修改星星提交
							
							
							
							
							
						 | 
						
							2020-07-24 20:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								aefa2b0cac
								
							
								
							
						 | 
						
							
							
								
								添加一个万象境的入口列表
							
							
							
							
							
						 | 
						
							2020-07-23 15:42:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								04e9a24db0
								
							
								
							
						 | 
						
							
							
								
								xuanyuanmirror tijiao
							
							
							
							
							
						 | 
						
							2020-07-20 19:46:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b11c108e5d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua 
							
						 | 
						
							2020-07-20 09:47:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1838823c37
								
							
								
							
						 | 
						
							
							
								
								幸运探宝提交
							
							
							
							
							
						 | 
						
							2020-07-16 20:24:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cb56ec6b22
								
							
								
							
						 | 
						
							
							
								
								森罗小游戏bug修改
							
							
							
							
							
						 | 
						
							2020-07-16 16:59:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e15bf9a7b2
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜资源提交
							
							
							
							
							
						 | 
						
							2020-07-15 16:27:58 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d08552ca2f
								
							
								
							
						 | 
						
							
							
								
								外网0.16.13 内网0.15.24
							
							
							
							
							
						 | 
						
							2020-06-30 18:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7382b2db77
								
							
								
							
						 | 
						
							
							
								
								版本开发提交
							
							
							
							
							
						 | 
						
							2020-06-28 17:52:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d87ab3767e
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.20
							
							
							
							
							
						 | 
						
							2020-06-23 18:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								063868ce73
								
							
								
							
						 | 
						
							
							
								
								外网包 0.16.1
							
							
							
							
							
						 | 
						
							2020-05-25 19:16:23 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |