ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7fb91910fd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-24 15:22:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b3ddd8fc96
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-07-24 15:22:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6238892d99
								
							
								
							
						 | 
						
							
							
								
								巅峰赛刷新调位置  赛程增加-1
							
							
							
							
							
						 | 
						
							2020-08-05 21:28:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4d0b53adf9
								
							
								
							
						 | 
						
							
							
								
								巅峰赛货币显示
							
							
							
							
							
						 | 
						
							2020-08-05 21:03:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0ad52a3855
								
							
								
							
						 | 
						
							
							
								
								活动暂时关闭
							
							
							
							
							
						 | 
						
							2020-07-24 13:39:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f27300721a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-24 12:14:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1f5440c2e6
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2020-07-24 12:11:00 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								42959d0257
								
							
								
							
						 | 
						
							
							
								
								编队bug
							
							
							
							
							
						 | 
						
							2020-07-24 11:05:40 +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 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5edb6c9234
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-24 10:30:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f7424e83ca
								
							
								
							
						 | 
						
							
							
								
								元素共鸣
							
							
							
							
							
						 | 
						
							2020-07-24 10:30:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								dbb563fbe5
								
							
								
							
						 | 
						
							
							
								
								播放第三场战斗动画修改
							
							
							
							
							
						 | 
						
							2020-07-24 10:01:48 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								485c81da9f
								
							
								
							
						 | 
						
							
							
								
								禁止上下阵提示文字
							
							
							
							
							
						 | 
						
							2020-07-24 09:36:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3fa23c25ea
								
							
								
							
						 | 
						
							
							
								
								修改界面id
							
							
							
							
							
						 | 
						
							2020-07-23 21:29:40 +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
							
						 | 
						
							
							
							
							
								
							
								688662836a
								
							
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2020-07-23 21:18:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6a855cf7a2
								
							
								
							
						 | 
						
							
							
								
								巅峰赛问题修改
							
							
							
							
							
						 | 
						
							2020-07-23 20:39:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c268538c0e
								
							
								
							
						 | 
						
							
							
								
								共鸣资源替换
							
							
							
							
							
						 | 
						
							2020-07-23 19:46:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7b795f0daa
								
							
								
							
						 | 
						
							
							
								
								森罗bug
							
							
							
							
							
						 | 
						
							2020-07-23 19:05:43 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								94684153c3
								
							
								
							
						 | 
						
							
							
								
								回放三局两胜显示
							
							
							
							
							
						 | 
						
							2020-07-23 18:06:55 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								259daf6a92
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 17:42:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e0d156ad74
								
							
								
							
						 | 
						
							
							
								
								森罗英雄全部死亡战斗报错
							
							
							
							
							
						 | 
						
							2020-07-23 17:42:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5894babbf0
								
							
								
							
						 | 
						
							
							
								
								英雄献祭修改提交
							
							
							
							
							
						 | 
						
							2020-07-23 16:26:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4114a241dd
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-07-23 16:02:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7fb5ac778f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 15:44:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9b290c1ed5
								
							
								
							
						 | 
						
							
							
								
								图片资源替换
							
							
							
							
							
						 | 
						
							2020-07-23 15:44:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4af617da49
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 15:43:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								aefa2b0cac
								
							
								
							
						 | 
						
							
							
								
								添加一个万象境的入口列表
							
							
							
							
							
						 | 
						
							2020-07-23 15:42:42 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								60b7e750a6
								
							
								
							
						 | 
						
							
							
								
								【ID1007274】
							
							
							
							
							
							
							
							【技能】无敌盾应清除目标所有负面状态 
							
						 | 
						
							2020-07-23 16:19:00 +09:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								561c3299f2
								
							
								
							
						 | 
						
							
							
								
								.asset commit
							
							
							
							
							
						 | 
						
							2020-07-23 16:05:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2fd0311c3c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Audio/Skill/skill/Audio_c_xy_0012_skeff_tapsk_healeff.mp3.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset 
							
						 | 
						
							2020-07-23 16:02:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b424927bbb
								
							
								
							
						 | 
						
							
							
								
								tupian tijiao
							
							
							
							
							
						 | 
						
							2020-07-23 16:01:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3b3dbec6a7
								
							
								
							
						 | 
						
							
							
								
								添加巅峰赛编队
							
							
							
							
							
						 | 
						
							2020-07-23 14:36:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c7da3db86d
								
							
								
							
						 | 
						
							
							
								
								大闹天宫打完boss不加积分问题修复
							
							
							
							
							
						 | 
						
							2020-07-23 13:55:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f35ad19c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 12:47:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								207dd8e2ec
								
							
								
							
						 | 
						
							
							
								
								天宫秘宝刷新时间修改
							
							
							
							
							
						 | 
						
							2020-07-23 12:46:48 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9bb7008a6d
								
							
								
							
						 | 
						
							
							
								
								淘汰赛战斗 可以观看多场记录
							
							
							
							
							
						 | 
						
							2020-07-23 12:19:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6e81d30a5d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 11:20:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e266292288
								
							
								
							
						 | 
						
							
							
								
								关卡掉落装备显示问题修复
							
							
							
							
							
						 | 
						
							2020-07-23 11:19:27 +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
							
						 | 
						
							
							
							
							
								
							
								db4ffb1e95
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-07-23 11:08:11 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								228d2da247
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 11:34:22 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e12c485c99
								
							
								
							
						 | 
						
							
							
								
								添加225效果及 添加减乘运算
							
							
							
							
							
						 | 
						
							2020-07-23 11:34:08 +09:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								346a1a5f6f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_test' into master_develop
							
							
							
							
							
						 | 
						
							2020-07-22 22:21:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								256954f620
								
							
								
							
						 | 
						
							
							
								
								sdk修改
							
							
							
							
							
						 | 
						
							2020-07-22 22:12:20 +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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d6561a8c07
								
							
								
							
						 | 
						
							
							
								
								先后手协议添加
							
							
							
							
							
						 | 
						
							2020-07-22 21:39:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								aa16826682
								
							
								
							
						 | 
						
							
							
								
								战斗先后手功能添加
							
							
							
							
							
						 | 
						
							2020-07-22 21:24:42 +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 |