|  jiaoyangna | 68e88e0f0d | commit spine | 2020-08-24 16:49:20 +08:00 | 
				
					
						|  jiaoyangna | 122c86444a | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 16:44:11 +08:00 | 
				
					
						|  jiaoyangna | d1e4f04b21 | spine commit | 2020-08-24 16:43:48 +08:00 | 
				
					
						|  zhangqiang | 3a209ba629 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 16:31:34 +08:00 | 
				
					
						|  zhangqiang | b36ebe510c | 修改宝物分解 | 2020-08-24 16:29:27 +08:00 | 
				
					
						|  jiaoyangna | ecd7717cf1 | commit spine | 2020-08-24 16:26:05 +08:00 | 
				
					
						|  jiaoyangna | e67934ca50 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 16:08:50 +08:00 | 
				
					
						|  jiaoyangna | f05c6094b5 | 恭送英雄宝物修改提交 | 2020-08-24 16:08:03 +08:00 | 
				
					
						|  ZhangBiao | 4b59561b3d | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop # Conflicts:
#	Assets/ManagedResources/BG/UI/MainScene/xuanwo_002.png.meta | 2020-08-24 16:08:01 +08:00 | 
				
					
						|  ZhangBiao | 6013365ad1 | 剑影仙踪特效更新 | 2020-08-24 16:07:08 +08:00 | 
				
					
						|  gaoxin | d7c34ec63d | 创建角色界面立绘位置调整 | 2020-08-24 16:03:21 +08:00 | 
				
					
						|  gaoxin | 85b5641162 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 15:46:11 +08:00 | 
				
					
						|  jiaoyangna | 6e5cb7d922 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 15:41:03 +08:00 | 
				
					
						|  jiaoyangna | d7258b7fa5 | 一键装备提交 | 2020-08-24 15:40:58 +08:00 | 
				
					
						|  gaoxin | e806410e8a | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop # Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset | 2020-08-24 15:25:23 +08:00 | 
				
					
						|  ZhangBiao | 36d96dcd84 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 15:20:13 +08:00 | 
				
					
						|  ZhangBiao | 939fa0227a | 无尽入口例会、化虚进入修复、剪影仙踪 | 2020-08-24 15:20:00 +08:00 | 
				
					
						|  jiaoyangna | 7c069c390d | 一键装备报错修改 | 2020-08-24 15:08:21 +08:00 | 
				
					
						|  gaoxin | 2abfd842cf | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 15:01:26 +08:00 | 
				
					
						|  jiaoyangna | dedeab993b | commit spine | 2020-08-24 14:58:30 +08:00 | 
				
					
						|  jiaoyangna | 3675b3e8a0 | spine commit | 2020-08-24 14:54:33 +08:00 | 
				
					
						|  gaoxin | 395c41ef79 | Merge branch 'temp' into master_develop | 2020-08-24 14:36:54 +08:00 | 
				
					
						|  gaoxin | 74951cedd8 | 修复登录界面错误,修复战斗背景音乐缺失的问题 | 2020-08-24 14:35:45 +08:00 | 
				
					
						|  jiaoyangna | af58044b17 | 【宝物】宝物合成,合成预览和恭喜获得不一致 | 2020-08-24 14:31:44 +08:00 | 
				
					
						|  jiaoyangna | 264bf8d4f0 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 14:01:25 +08:00 | 
				
					
						|  jiaoyangna | 80a7f569f7 | qinglong commit | 2020-08-24 14:00:15 +08:00 | 
				
					
						|  zhangqiang | 1949d1148f | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-24 13:59:22 +08:00 | 
				
					
						|  zhangqiang | 6deae3c54c | 公会副本次数修改     送神祠修改bug | 2020-08-24 13:59:08 +08:00 | 
				
					
						|  jiaoyangna | ada573a8d0 | 00042 commit | 2020-08-24 11:29:13 +08:00 | 
				
					
						|  jiaoyangna | 78c3a0fcbd | spine commit | 2020-08-24 11:23:52 +08:00 | 
				
					
						|  jiaoyangna | a58f779771 | 【送神祠】卡牌归元和分解 背景图片串了 | 2020-08-24 10:38:58 +08:00 | 
				
					
						|  jiaoyangna | 7419c97899 | 限时折扣刷新update | 2020-08-24 10:22:27 +08:00 | 
				
					
						|  jiaoyangna | 0f90bbe3fb | 副本预设修改 | 2020-08-24 10:07:16 +08:00 | 
				
					
						|  zhangqiang | 351c811c67 | 添加副本红点检测位置 | 2020-08-24 09:48:13 +08:00 | 
				
					
						|  jiaoyangna | fb4d9e0d45 | commit | 2020-08-22 22:27:52 +08:00 | 
				
					
						|  zhangqiang | 35899a49a4 | 公会副本调整  红点判断 | 2020-08-22 21:43:58 +08:00 | 
				
					
						|  jiaoyangna | cf0747566b | qinglong commit | 2020-08-22 21:28:44 +08:00 | 
				
					
						|  jiaoyangna | 4604d95f9d | qinglong commit | 2020-08-22 21:20:12 +08:00 | 
				
					
						|  gaoxin | a5441aa4f4 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-22 21:04:09 +08:00 | 
				
					
						|  gaoxin | ba39d930b8 | 添加特权推送打印 | 2020-08-22 21:03:55 +08:00 | 
				
					
						|  jiaoyangna | 887329a458 | hondian | 2020-08-22 20:57:19 +08:00 | 
				
					
						|  jiaoyangna | c10b4eec2d | jisu daren tijiao | 2020-08-22 20:54:18 +08:00 | 
				
					
						|  gaoxin | 1700c3bf80 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-22 20:50:59 +08:00 | 
				
					
						|  gaoxin | d17c99956d | 修复破阵诛仙-累计充值奖励不显示的问题 | 2020-08-22 20:50:45 +08:00 | 
				
					
						|  jiaoyangna | a63f5e92d2 | 急速达人红点提交 | 2020-08-22 20:46:06 +08:00 | 
				
					
						|  jiaoyangna | 4b6fb01f41 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-22 20:26:35 +08:00 | 
				
					
						|  jiaoyangna | aebf37e150 | 云梦祈福提交 | 2020-08-22 20:26:11 +08:00 | 
				
					
						|  zhangqiang | fe00d8726a | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-08-22 20:25:28 +08:00 | 
				
					
						|  zhangqiang | 028761ebaf | 打开暴力输出 | 2020-08-22 20:25:12 +08:00 | 
				
					
						|  jiaoyangna | adff7af35a | qinglong commit | 2020-08-22 20:22:30 +08:00 |