ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2063690199
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-08-14 23:34:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								416d6eb16c
								
							
								
							
						 | 
						
							
							
								
								每日签到
							
							
							
							
							
						 | 
						
							2020-08-13 22:30:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fbf7c3b41d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-13 14:44:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b2f5dbc2ca
								
							
								
							
						 | 
						
							
							
								
								xuanyuan update
							
							
							
							
							
						 | 
						
							2020-08-13 14:43:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dd3c814c2a
								
							
								
							
						 | 
						
							
							
								
								四元阵中 添加 置换入口
							
							
							
							
							
						 | 
						
							2020-08-13 14:43:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								39fb3d113c
								
							
								
							
						 | 
						
							
							
								
								xuyuan commit
							
							
							
							
							
						 | 
						
							2020-08-12 21:10:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								783583404e
								
							
								
							
						 | 
						
							
							
								
								神将合成修改提交
							
							
							
							
							
						 | 
						
							2020-08-12 20:59:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								95dff6f0e9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop2' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2020-08-12 14:20:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								06bc9c1f1d
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/法宝归元和神将置换' into master_develop2
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2020-08-12 14:15:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ed319be87e
								
							
								
							
						 | 
						
							
							
								
								神将置换
							
							
							
							
							
						 | 
						
							2020-08-12 14:13:16 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								e797e9f48d
								
							
								
							
						 | 
						
							
							
								
								合并develop &2   进程中,暂时不要更新
							
							
							
							
							
						 | 
						
							2020-08-12 11:37:26 +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
							
						 | 
						
							
							
							
							
								
							
								3d2f288934
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜提交
							
							
							
							
							
						 | 
						
							2020-08-11 09:48:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5c13a25bb5
								
							
								
							
						 | 
						
							
							
								
								encoding convert
							
							
							
							
							
						 | 
						
							2020-08-06 17:37:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								22b02b5cca
								
							
								
							
						 | 
						
							
							
								
								encoding convert
							
							
							
							
							
						 | 
						
							2020-08-06 17:35:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								44497f73bd
								
							
								
							
						 | 
						
							
							
								
								神将置换页面制作1
							
							
							
							
							
						 | 
						
							2020-08-06 10:43:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4533695a3d
								
							
								
							
						 | 
						
							
							
								
								法宝归元界面提交
							
							
							
							
							
						 | 
						
							2020-08-07 12:22:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ee19d26bd3
								
							
								
							
						 | 
						
							
							
								
								神将置换界面创建
							
							
							
							
							
						 | 
						
							2020-08-05 15:36:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ab8889ae8c
								
							
								
							
						 | 
						
							
							
								
								破阵诛仙活动界面
							
							
							
							
							
						 | 
						
							2020-07-31 16:18:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dd06fc4652
								
							
								
							
						 | 
						
							
							
								
								充值入口恢复,加 充值switch
							
							
							
							
							
						 | 
						
							2020-07-31 13:35:15 +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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f058668af6
								
							
								
							
						 | 
						
							
							
								
								修复红点id重复,导致聊天红点显示错误的问题
							
							
							
							
							
						 | 
						
							2020-07-29 11:39:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bf77931b88
								
							
								
							
						 | 
						
							
							
								
								边框修改提交
							
							
							
							
							
						 | 
						
							2020-07-28 18:38:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ddfbb25e2e
								
							
								
							
						 | 
						
							
							
								
								森罗bug修复
							
							
							
							
							
						 | 
						
							2020-07-28 16:45:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								52c34aa2a3
								
							
								
							
						 | 
						
							
							
								
								花费妖晶抽卡提示优化
							
							
							
							
							
						 | 
						
							2020-07-28 15:24:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								48ac527f1a
								
							
								
							
						 | 
						
							
							
								
								限时召唤 乾坤宝盒 页面整合
							
							
							
							
							
						 | 
						
							2020-07-28 09:48:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								48c209b4aa
								
							
								
							
						 | 
						
							
							
								
								formation commit
							
							
							
							
							
						 | 
						
							2020-07-25 22:58:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b1bf2876cb
								
							
								
							
						 | 
						
							
							
								
								10 star update
							
							
							
							
							
						 | 
						
							2020-07-25 21:57:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7c92ddc60a
								
							
								
							
						 | 
						
							
							
								
								副本置灰修改提交
							
							
							
							
							
						 | 
						
							2020-07-25 18:35:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6742056a93
								
							
								
							
						 | 
						
							
							
								
								冲突解决提交
							
							
							
							
							
						 | 
						
							2020-07-25 15:18:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c2239bd11
								
							
								
							
						 | 
						
							
							
								
								编队修改提交
							
							
							
							
							
						 | 
						
							2020-07-25 13:21:30 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								abfde3e8a9
								
							
								
							
						 | 
						
							
							
								
								巅峰战bug  and   使用按钮需求
							
							
							
							
							
						 | 
						
							2020-08-24 21:46:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4d0b53adf9
								
							
								
							
						 | 
						
							
							
								
								巅峰赛货币显示
							
							
							
							
							
						 | 
						
							2020-08-05 21:03:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								667b3e0bf5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-24 10:32:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								15976637f4
								
							
								
							
						 | 
						
							
							
								
								log提交
							
							
							
							
							
						 | 
						
							2020-07-24 10:32:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3588a17c00
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_arena
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	data_execl/base_data/UIConfig.xlsx 
							
						 | 
						
							2020-07-23 21:24:00 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3b3dbec6a7
								
							
								
							
						 | 
						
							
							
								
								添加巅峰赛编队
							
							
							
							
							
						 | 
						
							2020-07-23 14:36:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b53907dda2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_arena
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2020-07-23 11:10:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f844305e0e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_arena
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua 
							
						 | 
						
							2020-07-22 21:55:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cafa630185
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua 
							
						 | 
						
							2020-07-22 20:19:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ba8b5a3c93
								
							
								
							
						 | 
						
							
							
								
								【宝物合成】一键合成预览处显示错误
							
							
							
							
							
						 | 
						
							2020-07-22 15:50:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								03107d240a
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜提交
							
							
							
							
							
						 | 
						
							2020-07-21 10:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9b7e47aaef
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	data_execl/base_data/RaceTowerConfig.xlsx 
							
						 | 
						
							2020-07-20 20:00:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								02b37b2d67
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_test
							
							
							
							
							
						 | 
						
							2020-07-20 19:58:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								04e9a24db0
								
							
								
							
						 | 
						
							
							
								
								xuanyuanmirror tijiao
							
							
							
							
							
						 | 
						
							2020-07-20 19:46:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a325bfb781
								
							
								
							
						 | 
						
							
							
								
								竞技场排名
							
							
							
							
							
						 | 
						
							2020-07-20 15:34:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								97bfdd53b6
								
							
								
							
						 | 
						
							
							
								
								十绝阵开启阶段加入公会不可挑战十绝阵
							
							
							
							
							
						 | 
						
							2020-07-20 11:21:16 +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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5c962f330a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '接入SDK' into master_test
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/Effect.meta
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
#	BuildABs/Android/lzma/resconfigs.unity3d
#	ProjectSettings/ProjectSettings.asset 
							
						 | 
						
							2020-07-18 19:55:02 +08:00 |