zhangqiang
							
						 | 
						
							
							
							
							
								
							
								176f9d4c47
								
							
								
							
						 | 
						
							
							
								
								合成bug
							
							
							
							
							
						 | 
						
							2020-08-10 16:17:13 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a417e88b0b
								
							
								
							
						 | 
						
							
							
								
								恭送编队不检测大门闹天宫  and  车迟斗法失败刷新顺序修改
							
							
							
							
							
						 | 
						
							2020-08-10 11:30:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cca8355c33
								
							
								
							
						 | 
						
							
							
								
								神将合成提交
							
							
							
							
							
						 | 
						
							2020-08-10 11:28:25 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3937426101
								
							
								
							
						 | 
						
							
							
								
								神将合成提交
							
							
							
							
							
						 | 
						
							2020-08-10 10:56:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7749211534
								
							
								
							
						 | 
						
							
							
								
								合成修改
							
							
							
							
							
						 | 
						
							2020-08-08 19:27:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								32c788b8ac
								
							
								
							
						 | 
						
							
							
								
								神将合成代码
							
							
							
							
							
						 | 
						
							2020-08-08 18:18:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								17b6db91e2
								
							
								
							
						 | 
						
							
							
								
								英雄合成提交部分代码
							
							
							
							
							
						 | 
						
							2020-08-08 15:51:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6dd95ec834
								
							
								
							
						 | 
						
							
							
								
								神将合成部分显示代码
							
							
							
							
							
						 | 
						
							2020-08-08 11:06:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f2d743a343
								
							
								
							
						 | 
						
							
							
								
								英雄合成预设更新
							
							
							
							
							
						 | 
						
							2020-08-07 14:23:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								93e1d880c8
								
							
								
							
						 | 
						
							
							
								
								英雄合成界面拼接
							
							
							
							
							
						 | 
						
							2020-08-06 18:34:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ed373d1851
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/法宝归元和神将置换' of http://60.1.1.230/gaoxin/JL_Client into 0功能/法宝归元和神将置换
							
							
							
							
							
						 | 
						
							2020-08-06 10:43:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								44497f73bd
								
							
								
							
						 | 
						
							
							
								
								神将置换页面制作1
							
							
							
							
							
						 | 
						
							2020-08-06 10:43:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3bb0906865
								
							
								
							
						 | 
						
							
							
								
								法宝归元中文表
							
							
							
							
							
						 | 
						
							2020-08-06 10:38:55 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								eeaa1f26f8
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-08-05 19:18:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0a37b3cb11
								
							
								
							
						 | 
						
							
							
								
								法宝回归协议提交
							
							
							
							
							
						 | 
						
							2020-08-07 12:41:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4533695a3d
								
							
								
							
						 | 
						
							
							
								
								法宝归元界面提交
							
							
							
							
							
						 | 
						
							2020-08-07 12:22:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								203514d85f
								
							
								
							
						 | 
						
							
							
								
								神将置换入口添加
							
							
							
							
							
						 | 
						
							2020-08-05 16:30:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ee19d26bd3
								
							
								
							
						 | 
						
							
							
								
								神将置换界面创建
							
							
							
							
							
						 | 
						
							2020-08-05 15:36:22 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ed53f7e760
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_develop2
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx 
							
						 | 
						
							2020-08-07 06:54:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								54148395b4
								
							
								
							
						 | 
						
							
							
								
								日常副本判断开启临时添加战力计算
							
							
							
							
							
						 | 
						
							2020-08-07 06:06:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dd4800f657
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-04 20:49:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1b7f35e41f
								
							
								
							
						 | 
						
							
							
								
								bg update
							
							
							
							
							
						 | 
						
							2020-08-04 20:49:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								989703a0e4
								
							
								
							
						 | 
						
							
							
								
								乾坤宝盒单抽bug修复、四元阵赠送“元神玉”
							
							
							
							
							
						 | 
						
							2020-08-04 20:30:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6acaa8549d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-04 20:23:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ee28c18254
								
							
								
							
						 | 
						
							
							
								
								森罗bug修复
							
							
							
							
							
						 | 
						
							2020-08-04 20:22:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								802286d743
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-04 18:41:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e9438df1b7
								
							
								
							
						 | 
						
							
							
								
								图鉴优化
							
							
							
							
							
						 | 
						
							2020-08-04 18:41:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e45e6c9325
								
							
								
							
						 | 
						
							
							
								
								公会技能升级优化
							
							
							
							
							
						 | 
						
							2020-08-04 18:37:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f548b53b46
								
							
								
							
						 | 
						
							
							
								
								开引导 在森罗杀进程 重新登陆后 不回到森罗
							
							
							
							
							
						 | 
						
							2020-08-04 18:19:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7b73f4ae77
								
							
								
							
						 | 
						
							
							
								
								升星成功界面加天赋解锁显示
							
							
							
							
							
						 | 
						
							2020-08-04 17:24:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ade7ee88bc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-04 16:19:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								24381aba57
								
							
								
							
						 | 
						
							
							
								
								森罗bug修复
							
							
							
							
							
						 | 
						
							2020-08-04 16:18:48 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e11b5fd7bb
								
							
								
							
						 | 
						
							
							
								
								寻宝红点修改  添加解锁新章节音效
							
							
							
							
							
						 | 
						
							2020-08-04 15:33:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0a8bdc5765
								
							
								
							
						 | 
						
							
							
								
								援助  十绝阵  合成  提示性bug
							
							
							
							
							
						 | 
						
							2020-08-04 14:02:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9a53f20f60
								
							
								
							
						 | 
						
							
							
								
								小游戏提交
							
							
							
							
							
						 | 
						
							2020-08-04 10:39:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								04e6c2fb42
								
							
								
							
						 | 
						
							
							
								
								删除不必要的符号
							
							
							
							
							
						 | 
						
							2020-08-03 21:23:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f6b827c922
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-03 20:02:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c2024a15cb
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2020-08-03 20:01:59 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								13cad0dd5b
								
							
								
							
						 | 
						
							
							
								
								排行榜切磋玩回来立绘丢了问题修改
							
							
							
							
							
						 | 
						
							2020-08-03 19:41:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6c6f28f634
								
							
								
							
						 | 
						
							
							
								
								fix bug
							
							
							
							
							
						 | 
						
							2020-08-03 18:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ffdb4c9666
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-03 17:07:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3c6043d32c
								
							
								
							
						 | 
						
							
							
								
								destroy guildmaincitypanel close playerheadview
							
							
							
							
							
						 | 
						
							2020-08-03 17:07:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ab93491cfe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-03 16:59:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9b28e7c140
								
							
								
							
						 | 
						
							
							
								
								森罗bug修改
							
							
							
							
							
						 | 
						
							2020-08-03 16:59:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								72dd128c1f
								
							
								
							
						 | 
						
							
							
								
								添加星级天赋描述叠加   去掉无用打印
							
							
							
							
							
						 | 
						
							2020-08-03 16:49:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a9f8f39280
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-03 16:11:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0cd5ffca9d
								
							
								
							
						 | 
						
							
							
								
								魂印特效关闭
							
							
							
							
							
						 | 
						
							2020-08-03 16:11:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								54aae5181f
								
							
								
							
						 | 
						
							
							
								
								fix bug
							
							
							
							
							
						 | 
						
							2020-08-03 15:51:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								70cd06da2b
								
							
								
							
						 | 
						
							
							
								
								计算战斗力卡顿的问题优化
							
							
							
							
							
						 | 
						
							2020-08-03 15:36:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								880b52763f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-03 15:20:39 +08:00 |