szxhzz
							
						 | 
						
							
							
							
							
								
							
								43f2a437a6
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-16 11:03:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c282e19b5e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-16 10:49:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								adc3b71e40
								
							
								
							
						 | 
						
							
							
								
								分解修改提交
							
							
							
							
							
						 | 
						
							2020-07-16 10:49:01 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9f6fa391c4
								
							
								
							
						 | 
						
							
							
								
								删除战斗音效加速的效果
							
							
							
							
							
						 | 
						
							2020-07-16 10:22:51 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2c744690bc
								
							
								
							
						 | 
						
							
							
								
								赛程数据合并
							
							
							
							
							
						 | 
						
							2020-07-16 10:13:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8974820606
								
							
								
							
						 | 
						
							
							
								
								生成warp文件,修复本地运行时的错误
							
							
							
							
							
						 | 
						
							2020-07-15 19:15:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								b175124c6b
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 18:39:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bdf9331b79
								
							
								
							
						 | 
						
							
							
								
								巅峰战提交
							
							
							
							
							
						 | 
						
							2020-07-15 18:23:40 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								f84d08ffeb
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 18:14:51 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								037290c657
								
							
								
							
						 | 
						
							
							
								
								sdk工程加入猕猴桃sdk
							
							
							
							
							
						 | 
						
							2020-07-15 17:53:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cbe238fc9d
								
							
								
							
						 | 
						
							
							
								
								跳过战斗特权 修改
							
							
							
							
							
						 | 
						
							2020-07-15 17:33:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								18c189cd0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-15 16:36:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								de9290e4a0
								
							
								
							
						 | 
						
							
							
								
								物品掉落特效+跳过按钮
							
							
							
							
							
						 | 
						
							2020-07-15 16:35:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e15bf9a7b2
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜资源提交
							
							
							
							
							
						 | 
						
							2020-07-15 16:27:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								cb7af0967b
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 16:19:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								deee98f641
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 15:48:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								81f8a73de0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-15 15:03:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9497cfae78
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2020-07-15 15:03:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								5e229778e0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-15 14:54:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								dc5799c229
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 14:54:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fc4e2c35ff
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2020-07-15 14:50:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7605156317
								
							
								
							
						 | 
						
							
							
								
								sdk结构修改
							
							
							
							
							
						 | 
						
							2020-07-15 13:44:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9e23f56e00
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-15 13:41:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9f59d1f574
								
							
								
							
						 | 
						
							
							
								
								森罗幻境 小游戏与效果图的差异修改
							
							
							
							
							
						 | 
						
							2020-07-15 13:41:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ed5a942875
								
							
								
							
						 | 
						
							
							
								
								探宝红点未完成
							
							
							
							
							
						 | 
						
							2020-07-15 13:34:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								de81c1f5c2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-15 11:15:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								10414deee5
								
							
								
							
						 | 
						
							
							
								
								领取挂机宝箱时,增加道具获取动画效果 修改
							
							
							
							
							
						 | 
						
							2020-07-15 11:15:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ee95a1ee55
								
							
								
							
						 | 
						
							
							
								
								【探宝优化】增加每日探宝次数限制
							
							
							
							
							
						 | 
						
							2020-07-15 11:07:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b682f97e66
								
							
								
							
						 | 
						
							
							
								
								首充第一版修改
							
							
							
							
							
						 | 
						
							2020-07-15 10:36:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2ab6d17841
								
							
								
							
						 | 
						
							
							
								
								森罗小游戏修改
							
							
							
							
							
						 | 
						
							2020-07-14 21:03:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f3048c9904
								
							
								
							
						 | 
						
							
							
								
								巅峰赛 修改
							
							
							
							
							
						 | 
						
							2020-07-14 20:27:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5a3e8f8b1b
								
							
								
							
						 | 
						
							
							
								
								乾坤宝盒红点显示
							
							
							
							
							
						 | 
						
							2020-07-16 09:02:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								01f6157c3e
								
							
								
							
						 | 
						
							
							
								
								特效修改
							
							
							
							
							
						 | 
						
							2020-07-14 16:52:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0d82750315
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-14 16:14:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1d9d318cb5
								
							
								
							
						 | 
						
							
							
								
								【限时召唤】只有第一次免费召唤有红点,刷新免费次数后,主城入口,限时召唤页签上不显示红点
							
							
							
							
							
						 | 
						
							2020-07-14 16:14:03 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4968389a68
								
							
								
							
						 | 
						
							
							
								
								援助红点
							
							
							
							
							
						 | 
						
							2020-07-14 16:06:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f54529ce21
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-14 15:54:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								798c730f56
								
							
								
							
						 | 
						
							
							
								
								公会红点显示,
							
							
							
							
							
						 | 
						
							2020-07-14 15:54:18 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								592d3385e8
								
							
								
							
						 | 
						
							
							
								
								129  战力计算
							
							
							
							
							
						 | 
						
							2020-07-14 14:49:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e9b2845315
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-14 14:03:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7785a7c472
								
							
								
							
						 | 
						
							
							
								
								神将生阶属性显示错误问题修复
							
							
							
							
							
						 | 
						
							2020-07-14 14:03:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								15dd908ace
								
							
								
							
						 | 
						
							
							
								
								【ID1008354】
							
							
							
							
							
							
							
							【公会祭祀】在原公会祭祀,加新公会,进度奖励不能领取,不需要显示红点 
							
						 | 
						
							2020-07-14 13:55:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6d3faec09e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-14 11:43:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								06e87b8c66
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2020-07-14 11:43:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								59a9f073ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-14 11:40:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fb4891d005
								
							
								
							
						 | 
						
							
							
								
								修复打开关卡界面报错的问题
							
							
							
							
							
						 | 
						
							2020-07-14 11:39:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								39bd3e8523
								
							
								
							
						 | 
						
							
							
								
								限时召唤ui调整
							
							
							
							
							
						 | 
						
							2020-07-14 11:34:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								eddaa95312
								
							
								
							
						 | 
						
							
							
								
								宝囊
							
							
							
							
							
						 | 
						
							2020-07-14 11:05:47 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7d724437ee
								
							
								
							
						 | 
						
							
							
								
								巅峰战提示等待其他玩家战斗结束提交
							
							
							
							
							
						 | 
						
							2020-07-14 10:12:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								791af67033
								
							
								
							
						 | 
						
							
							
								
								【公会祭祀】祭祀进度条显示不准确
							
							
							
							
							
						 | 
						
							2020-07-13 20:47:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4c6369e51d
								
							
								
							
						 | 
						
							
							
								
								乾坤宝囊修改
							
							
							
							
							
						 | 
						
							2020-07-13 20:07:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0b26bb33c6
								
							
								
							
						 | 
						
							
							
								
								归元修改
							
							
							
							
							
						 | 
						
							2020-07-13 18:31:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								96316f4b39
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-13 18:21:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								48fc5c61fb
								
							
								
							
						 | 
						
							
							
								
								取消背景音乐加速
							
							
							
							
							
						 | 
						
							2020-07-13 18:01:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a37151646a
								
							
								
							
						 | 
						
							
							
								
								战斗音效播放速度随战斗速度变化
							
							
							
							
							
						 | 
						
							2020-07-13 17:53:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								889d3abf68
								
							
								
							
						 | 
						
							
							
								
								【送神祠】归元,点敖丙报错
							
							
							
							
							
						 | 
						
							2020-07-13 17:32:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d2f25e1845
								
							
								
							
						 | 
						
							
							
								
								归元修改
							
							
							
							
							
						 | 
						
							2020-07-13 17:12:46 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								07f2d763e6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-13 16:52:35 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								11add2dd81
								
							
								
							
						 | 
						
							
							
								
								乾坤魂印兑换图标资源
							
							
							
							
							
						 | 
						
							2020-07-13 16:52:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d25e87289c
								
							
								
							
						 | 
						
							
							
								
								修复打包后不能充值的bug
							
							
							
							
							
						 | 
						
							2020-07-13 16:50:41 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								240818a620
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-13 16:49:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								db1118aa9c
								
							
								
							
						 | 
						
							
							
								
								修复打包后不能充值得bug
							
							
							
							
							
						 | 
						
							2020-07-13 16:48:50 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d10581150a
								
							
								
							
						 | 
						
							
							
								
								sdk修改配置
							
							
							
							
							
						 | 
						
							2020-07-13 16:47:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ff2e9aaaa3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-13 16:47:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d16ecd259a
								
							
								
							
						 | 
						
							
							
								
								【公会】公会成员信息点开报错
							
							
							
							
							
						 | 
						
							2020-07-13 16:46:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1645736a5c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-13 16:41:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								416ba72c2f
								
							
								
							
						 | 
						
							
							
								
								森罗小游戏bug修改
							
							
							
							
							
						 | 
						
							2020-07-13 16:41:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bfd6a89b20
								
							
								
							
						 | 
						
							
							
								
								特效资源提交
							
							
							
							
							
						 | 
						
							2020-07-13 16:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f80ac29435
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-13 16:23:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b2c9b88991
								
							
								
							
						 | 
						
							
							
								
								【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解
							
							
							
							
							
						 | 
						
							2020-07-13 16:16:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bc270de90d
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-07-13 15:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								74a4d7e4dd
								
							
								
							
						 | 
						
							
							
								
								猪八戒特效资源提交
							
							
							
							
							
						 | 
						
							2020-07-13 15:38:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								926ff911da
								
							
								
							
						 | 
						
							
							
								
								一键上阵修改
							
							
							
							
							
						 | 
						
							2020-07-13 15:08:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3953a76280
								
							
								
							
						 | 
						
							
							
								
								【宝物】一键装备替下来的,不在背包显示
							
							
							
							
							
						 | 
						
							2020-07-13 15:00:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eba4b7cf50
								
							
								
							
						 | 
						
							
							
								
								shader引用文件提交
							
							
							
							
							
						 | 
						
							2020-07-13 13:38:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bd83a45de2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_test' into 接入SDK
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Audio/Skill/actor_voc.meta
#	Assets/ManagedResources/PublicArtRes/Models/Materials.meta
#	Assets/ManagedResources/~Lua/Config/Data.meta 
							
						 | 
						
							2020-07-13 12:55:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3f54c121b1
								
							
								
							
						 | 
						
							
							
								
								sdk=接口完善
							
							
							
							
							
						 | 
						
							2020-07-13 12:25:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40fa614a52
								
							
								
							
						 | 
						
							
							
								
								限时召唤】点十连,单抽的免费不显示了
							
							
							
							
							
						 | 
						
							2020-07-13 12:01:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6ff6b5315b
								
							
								
							
						 | 
						
							
							
								
								分解、重置相关功能修改
							
							
							
							
							
						 | 
						
							2020-07-13 11:15:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9dfb75b169
								
							
								
							
						 | 
						
							
							
								
								竞猜币
							
							
							
							
							
						 | 
						
							2020-07-11 18:40:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fdf82e47ac
								
							
								
							
						 | 
						
							
							
								
								分解、重置相关功能修改
							
							
							
							
							
						 | 
						
							2020-07-11 18:00:07 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								325d9c7224
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.28
							
							
							
							
							
						 | 
						
							2020-07-11 17:33:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4edc074ca3
								
							
								
							
						 | 
						
							
							
								
								抛弹竞猜结束 打开 ATM_GuessTipView时机修改
							
							
							
							
							
						 | 
						
							2020-07-11 17:16:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8be0056346
								
							
								
							
						 | 
						
							
							
								
								技能名称音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 16:26:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								679752e628
								
							
								
							
						 | 
						
							
							
								
								技能音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 16:26:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								106a7f7763
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua 
							
						 | 
						
							2020-07-11 16:25:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0fb81547d3
								
							
								
							
						 | 
						
							
							
								
								分解提交
							
							
							
							
							
						 | 
						
							2020-07-11 16:21:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								28f2a1c4f4
								
							
								
							
						 | 
						
							
							
								
								去掉每秒刷新赔率
							
							
							
							
							
						 | 
						
							2020-07-11 16:04:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f96f07865f
								
							
								
							
						 | 
						
							
							
								
								meta文件提交
							
							
							
							
							
						 | 
						
							2020-07-11 15:45:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5c1e235228
								
							
								
							
						 | 
						
							
							
								
								技能名称音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 15:42:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ee0c035731
								
							
								
							
						 | 
						
							
							
								
								技能音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 15:19:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f03214aa1a
								
							
								
							
						 | 
						
							
							
								
								技能音效添加
							
							
							
							
							
						 | 
						
							2020-07-11 15:19:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fdb4c66ed5
								
							
								
							
						 | 
						
							
							
								
								访客id接口修改
							
							
							
							
							
						 | 
						
							2020-07-11 15:05:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								310802e967
								
							
								
							
						 | 
						
							
							
								
								language导出
							
							
							
							
							
						 | 
						
							2020-07-10 19:13:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7279a7edd1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-10 19:03:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3ab971eaea
								
							
								
							
						 | 
						
							
							
								
								宝囊红点
							
							
							
							
							
						 | 
						
							2020-07-10 19:02:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								27343e6fca
								
							
								
							
						 | 
						
							
							
								
								【特权】白片
							
							
							
							
							
						 | 
						
							2020-07-10 18:34:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a85c6e339
								
							
								
							
						 | 
						
							
							
								
								分解,限时召唤提交
							
							
							
							
							
						 | 
						
							2020-07-10 18:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9b97aef3d7
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.15
							
							
							
							
							
						 | 
						
							2020-07-10 18:20:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0a5212d265
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-10 17:55:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b89c0582c0
								
							
								
							
						 | 
						
							
							
								
								宝囊
							
							
							
							
							
						 | 
						
							2020-07-10 17:55:11 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								b61fc5fb1e
								
							
								
							
						 | 
						
							
							
								
								法宝资源
							
							
							
							
							
						 | 
						
							2020-07-10 16:50:00 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								d02a3adee8
								
							
								
							
						 | 
						
							
							
								
								法宝资源部分替换
							
							
							
							
							
						 | 
						
							2020-07-10 16:33:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ab724d407e
								
							
								
							
						 | 
						
							
							
								
								嫦娥,东华帝君,洛神特效添加
							
							
							
							
							
						 | 
						
							2020-07-10 16:22:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4a0ee0c3dc
								
							
								
							
						 | 
						
							
							
								
								巅峰赛打印提交
							
							
							
							
							
						 | 
						
							2020-07-10 15:16:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								13283fe135
								
							
								
							
						 | 
						
							
							
								
								巅峰战提交
							
							
							
							
							
						 | 
						
							2020-07-10 13:38:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								465ca19e84
								
							
								
							
						 | 
						
							
							
								
								sdk相关文档提交
							
							
							
							
							
						 | 
						
							2020-07-10 09:59:56 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								ce1d7014f3
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-07-09 19:59:23 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								12b0fa9f73
								
							
								
							
						 | 
						
							
							
								
								特权修改,宝囊商店
							
							
							
							
							
						 | 
						
							2020-07-09 18:20:53 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								f158fa6536
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-09 16:14:56 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								10a2181305
								
							
								
							
						 | 
						
							
							
								
								小游戏18bugxiugai
							
							
							
							
							
						 | 
						
							2020-07-09 16:14:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6303805bfa
								
							
								
							
						 | 
						
							
							
								
								修复未命中时报错的问题
							
							
							
							
							
						 | 
						
							2020-07-09 15:18:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c3e1aaff6e
								
							
								
							
						 | 
						
							
							
								
								【限时召唤】奖池预览,去掉一二星神将
							
							
							
							
							
							
							
							【心魔试炼】奖励预览,数量多的时候,需要调整 
							
						 | 
						
							2020-07-09 13:35:59 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								8e853b2758
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-09 11:53:10 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								47b34f9d6e
								
							
								
							
						 | 
						
							
							
								
								宝囊
							
							
							
							
							
						 | 
						
							2020-07-09 11:52:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f9c49d00e3
								
							
								
							
						 | 
						
							
							
								
								宝物bug修改
							
							
							
							
							
						 | 
						
							2020-07-09 10:53:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								37c7c839c4
								
							
								
							
						 | 
						
							
							
								
								限时召唤提交
							
							
							
							
							
						 | 
						
							2020-07-09 10:04:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6bdc5a1db8
								
							
								
							
						 | 
						
							
							
								
								巅峰战竞猜记录显示
							
							
							
							
							
						 | 
						
							2020-07-08 21:38:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3e43ea4876
								
							
								
							
						 | 
						
							
							
								
								Merge branch '优化cardrenderer' into master_develop
							
							
							
							
							
						 | 
						
							2020-07-08 21:23:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b5ab2384c3
								
							
								
							
						 | 
						
							
							
								
								优化rendertexture的数量20->6
							
							
							
							
							
						 | 
						
							2020-07-08 21:21:49 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								12d9208f90
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-08 21:19:49 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								7c7684a714
								
							
								
							
						 | 
						
							
							
								
								冲突提交
							
							
							
							
							
						 | 
						
							2020-07-08 21:19:34 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								39d035b21a
								
							
								
							
						 | 
						
							
							
								
								no message
							
							
							
							
							
						 | 
						
							2020-07-08 21:09:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0b40fda687
								
							
								
							
						 | 
						
							
							
								
								巅峰战
							
							
							
							
							
						 | 
						
							2020-07-08 20:48:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ce13a0263e
								
							
								
							
						 | 
						
							
							
								
								Merge branch '战斗优化v_n.0' into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/QianKunBox.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
#	Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
#	Assets/StreamingAssets/Android.meta 
							
						 | 
						
							2020-07-08 19:55:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								21778b4a74
								
							
								
							
						 | 
						
							
							
								
								限时提交
							
							
							
							
							
						 | 
						
							2020-07-08 19:16:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								da6bb67d50
								
							
								
							
						 | 
						
							
							
								
								技能配置优化
							
							
							
							
							
						 | 
						
							2020-07-08 18:23:12 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								5e00986d05
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-08 17:03:44 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								7e1e15f8af
								
							
								
							
						 | 
						
							
							
								
								报错修改
							
							
							
							
							
						 | 
						
							2020-07-08 17:03:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d247e40129
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-08 16:50:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4e49e4582a
								
							
								
							
						 | 
						
							
							
								
								天宫商店数量显示调整,去除log
							
							
							
							
							
						 | 
						
							2020-07-08 16:49:59 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								d5bc2b4ef1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-08 16:24:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9b138fe566
								
							
								
							
						 | 
						
							
							
								
								限时召唤提交
							
							
							
							
							
						 | 
						
							2020-07-08 16:23:04 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								1b89e68c95
								
							
								
							
						 | 
						
							
							
								
								包囊
							
							
							
							
							
						 | 
						
							2020-07-08 16:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								070fb43964
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua 
							
						 | 
						
							2020-07-08 16:20:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1df7a8006a
								
							
								
							
						 | 
						
							
							
								
								【ID1008244】
							
							
							
							
							
							
							
							【限时招募】阶段奖励进度条显示不准 
							
						 | 
						
							2020-07-08 16:19:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b3dc6d0688
								
							
								
							
						 | 
						
							
							
								
								巅峰赛
							
							
							
							
							
						 | 
						
							2020-07-08 15:02:16 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								51089bd2c8
								
							
								
							
						 | 
						
							
							
								
								福利界面报错
							
							
							
							
							
						 | 
						
							2020-07-08 11:46:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b999786cbb
								
							
								
							
						 | 
						
							
							
								
								部分技能配置
							
							
							
							
							
						 | 
						
							2020-07-08 10:34:41 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								272cfdc71a
								
							
								
							
						 | 
						
							
							
								
								乾坤包囊
							
							
							
							
							
						 | 
						
							2020-07-08 09:41:56 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								4aed395ed3
								
							
								
							
						 | 
						
							
							
								
								乾坤包囊
							
							
							
							
							
						 | 
						
							2020-07-08 09:40:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								67b4631368
								
							
								
							
						 | 
						
							
							
								
								高级探宝提交
							
							
							
							
							
						 | 
						
							2020-07-07 20:13:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c15b84b096
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into equip
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua 
							
						 | 
						
							2020-07-07 18:13:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0f611408b8
								
							
								
							
						 | 
						
							
							
								
								合成装备刷新界面
							
							
							
							
							
						 | 
						
							2020-07-07 17:51:02 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								9d8deac0e1
								
							
								
							
						 | 
						
							
							
								
								背包界面报错修改
							
							
							
							
							
						 | 
						
							2020-07-07 17:27:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c6bfa772e5
								
							
								
							
						 | 
						
							
							
								
								装备提交
							
							
							
							
							
						 | 
						
							2020-07-07 16:35:57 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								562e482740
								
							
								
							
						 | 
						
							
							
								
								图鉴bug修改
							
							
							
							
							
						 | 
						
							2020-07-07 15:44:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bff7df21e4
								
							
								
							
						 | 
						
							
							
								
								装备出售界面添加
							
							
							
							
							
						 | 
						
							2020-07-07 15:20:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3b7e9e2cdd
								
							
								
							
						 | 
						
							
							
								
								特效文件新增
							
							
							
							
							
						 | 
						
							2020-07-07 14:33:48 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								bdc2c095a7
								
							
								
							
						 | 
						
							
							
								
								点将台奖池修改
							
							
							
							
							
						 | 
						
							2020-07-07 14:16:28 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								504e6010e3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-07 10:57:34 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								8eaa1f6e8c
								
							
								
							
						 | 
						
							
							
								
								增加 图鉴、神将归元、恭送神将界面“全部”按钮
							
							
							
							
							
						 | 
						
							2020-07-07 10:57:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								64059c7808
								
							
								
							
						 | 
						
							
							
								
								导表工具优化,语言表路径修改
							
							
							
							
							
						 | 
						
							2020-07-07 09:48:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7f54e3c88a
								
							
								
							
						 | 
						
							
							
								
								装备提交
							
							
							
							
							
						 | 
						
							2020-07-06 20:35:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								105d3bf53e
								
							
								
							
						 | 
						
							
							
								
								宝器分解计算掉落
							
							
							
							
							
						 | 
						
							2020-07-06 19:11:15 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								b0bee3f1d7
								
							
								
							
						 | 
						
							
							
								
								神将界面“全部”按钮
							
							
							
							
							
						 | 
						
							2020-07-06 18:37:29 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								9c698254a7
								
							
								
							
						 | 
						
							
							
								
								删除 英雄、战斗界面的特权显示
							
							
							
							
							
						 | 
						
							2020-07-06 17:10:49 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								e3c9fb459e
								
							
								
							
						 | 
						
							
							
								
								寻宝文字提示修改,特权界面资源替换
							
							
							
							
							
						 | 
						
							2020-07-06 17:01:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4b8bae38b3
								
							
								
							
						 | 
						
							
							
								
								宝物分解界面提交
							
							
							
							
							
						 | 
						
							2020-07-06 16:27:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9053926e02
								
							
								
							
						 | 
						
							
							
								
								bug 点将台卡池预览,再查看四元阵卡池,显示的是点将台卡池
							
							
							
							
							
						 | 
						
							2020-07-04 17:04:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								608558d3cd
								
							
								
							
						 | 
						
							
							
								
								中文表 不提竞技场报错
							
							
							
							
							
						 | 
						
							2020-07-04 16:19:47 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								16bf6d9f7e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-04 16:13:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								94a160d682
								
							
								
							
						 | 
						
							
							
								
								修改玩家信息时,应按照位置顺序显示该玩家主线阵容
							
							
							
							
							
						 | 
						
							2020-07-04 16:11:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								55d52887a0
								
							
								
							
						 | 
						
							
							
								
								误删恢复
							
							
							
							
							
						 | 
						
							2020-07-04 15:34:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2552afa72e
								
							
								
							
						 | 
						
							
							
								
								忽略lua数据表文件
							
							
							
							
							
						 | 
						
							2020-07-04 15:32:09 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bc9dae0cff
								
							
								
							
						 | 
						
							
							
								
								漏提
							
							
							
							
							
						 | 
						
							2020-07-04 14:27:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								74830b4b90
								
							
								
							
						 | 
						
							
							
								
								开服狂欢奖励预览返回按钮不关闭预览bug
							
							
							
							
							
						 | 
						
							2020-07-04 14:24:30 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4630199505
								
							
								
							
						 | 
						
							
							
								
								提交试试
							
							
							
							
							
						 | 
						
							2020-07-03 19:54:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9c7377e3d6
								
							
								
							
						 | 
						
							
							
								
								未命中效果添加
							
							
							
							
							
						 | 
						
							2020-07-03 18:55:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ae8aa71edf
								
							
								
							
						 | 
						
							
							
								
								成员左右切换动画位置修改
							
							
							
							
							
						 | 
						
							2020-07-03 18:25:46 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								f7c842eb9a
								
							
								
							
						 | 
						
							
							
								
								add zhushi
							
							
							
							
							
						 | 
						
							2020-07-03 17:59:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0bdb498338
								
							
								
							
						 | 
						
							
							
								
								添加全屏弹道按列区分释放位移
							
							
							
							
							
						 | 
						
							2020-07-03 16:50:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cf93ea3910
								
							
								
							
						 | 
						
							
							
								
								新技能资源添加
							
							
							
							
							
						 | 
						
							2020-07-03 16:48:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9c68ea0c73
								
							
								
							
						 | 
						
							
							
								
								巅峰战修改提交
							
							
							
							
							
						 | 
						
							2020-07-03 16:10:54 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								e2c5b69f38
								
							
								
							
						 | 
						
							
							
								
								星级成长里bug修复
							
							
							
							
							
						 | 
						
							2020-07-03 16:02:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								dbd65fc321
								
							
								
							
						 | 
						
							
							
								
								添加忽略文件
							
							
							
							
							
						 | 
						
							2020-07-03 15:30:22 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								6a317d3f7b
								
							
								
							
						 | 
						
							
							
								
								测试热更0.15.25、svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-03 11:52:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6f30179f57
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-07 13:33:51 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								70bbb3cee2
								
							
								
							
						 | 
						
							
							
								
								竞技场修改
							
							
							
							
							
						 | 
						
							2020-07-07 13:29:40 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								abfbfc423b
								
							
								
							
						 | 
						
							
							
								
								心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
							
							
							
							
							
						 | 
						
							2020-07-03 11:27:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ab98e17e8a
								
							
								
							
						 | 
						
							
							
								
								添加判断命中的方法
							
							
							
							
							
						 | 
						
							2020-07-02 21:33:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d53bac2d5a
								
							
								
							
						 | 
						
							
							
								
								修复中毒死亡后依然可以释放技能
							
							
							
							
							
						 | 
						
							2020-07-02 21:02:59 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								1796c48583
								
							
								
							
						 | 
						
							
							
								
								森罗幻境bug修改
							
							
							
							
							
						 | 
						
							2020-07-02 20:50:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5b5577d50b
								
							
								
							
						 | 
						
							
							
								
								添加全屏弹道技能
							
							
							
							
							
						 | 
						
							2020-07-02 19:23:42 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								73c6cc9582
								
							
								
							
						 | 
						
							
							
								
								删除meta文件
							
							
							
							
							
						 | 
						
							2020-07-02 17:58:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								00b12f3cee
								
							
								
							
						 | 
						
							
							
								
								无用文件删除
							
							
							
							
							
						 | 
						
							2020-07-02 17:25:32 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e409bb2020
								
							
								
							
						 | 
						
							
							
								
								关闭红点显示
							
							
							
							
							
						 | 
						
							2020-07-02 17:05:21 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								ab411b3d0d
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-02 17:04:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								edc24d7efd
								
							
								
							
						 | 
						
							
							
								
								修复获取奖励卡顿的问题
							
							
							
							
							
						 | 
						
							2020-07-02 17:01:40 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								461c64b04a
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-02 14:53:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8653437ee1
								
							
								
							
						 | 
						
							
							
								
								修复退出战斗界面持续伤害特效导致报错的问题,修复2号位立绘第一次没有淡出效果的问题
							
							
							
							
							
						 | 
						
							2020-07-01 18:35:45 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b3c70f66e4
								
							
								
							
						 | 
						
							
							
								
								svn逻辑tongbu
							
							
							
							
							
						 | 
						
							2020-07-01 18:14:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								78b6a988d2
								
							
								
							
						 | 
						
							
							
								
								战斗添加前摇特效,添加多段伤害
							
							
							
							
							
						 | 
						
							2020-07-01 17:48:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								956dcfbcd2
								
							
								
							
						 | 
						
							
							
								
								删除预制体中的立绘
							
							
							
							
							
						 | 
						
							2020-07-01 17:45:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								52f8a9922f
								
							
								
							
						 | 
						
							
							
								
								无用meta文件删除
							
							
							
							
							
						 | 
						
							2020-07-01 17:43:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								997ba146bf
								
							
								
							
						 | 
						
							
							
								
								奖励界面挂机时长显示修改
							
							
							
							
							
						 | 
						
							2020-07-01 12:09:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a2c6290cc2
								
							
								
							
						 | 
						
							
							
								
								Merge branch '战斗优化v_n.0' into master_develop
							
							
							
							
							
						 | 
						
							2020-07-01 12:04:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0677aa9c04
								
							
								
							
						 | 
						
							
							
								
								离线挂机时常随vip增加
							
							
							
							
							
						 | 
						
							2020-07-01 12:04:25 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								c4751eed0a
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-01 10:54:39 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								5154fdbac0
								
							
								
							
						 | 
						
							
							
								
								外网0.16.14 内网0.15.25
							
							
							
							
							
						 | 
						
							2020-07-01 09:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d08552ca2f
								
							
								
							
						 | 
						
							
							
								
								外网0.16.13 内网0.15.24
							
							
							
							
							
						 | 
						
							2020-06-30 18:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								097c3acbc4
								
							
								
							
						 | 
						
							
							
								
								Merge branch '穿戴装备bug'
							
							
							
							
							
						 | 
						
							2020-06-28 17:56:48 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								5a5fa715c8
								
							
								
							
						 | 
						
							
							
								
								修复穿戴装备卡死的bug, 外网热更 0.16.11
							
							
							
							
							
						 | 
						
							2020-06-28 17:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7382b2db77
								
							
								
							
						 | 
						
							
							
								
								版本开发提交
							
							
							
							
							
						 | 
						
							2020-06-28 17:52:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								8c61581548
								
							
								
							
						 | 
						
							
							
								
								外网 0.16.10  内网 0.15.23
							
							
							
							
							
						 | 
						
							2020-06-28 17:48:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d87ab3767e
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.20
							
							
							
							
							
						 | 
						
							2020-06-23 18:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e3b6de5404
								
							
								
							
						 | 
						
							
							
								
								内网0.15.17 外网 0.16.8
							
							
							
							
							
						 | 
						
							2020-06-19 21:44:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								75a3f83194
								
							
								
							
						 | 
						
							
							
								
								内网0.15.16 外网 0.16.7
							
							
							
							
							
						 | 
						
							2020-06-19 20:19:35 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7a410e1b60
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.5
							
							
							
							
							
						 | 
						
							2020-06-19 16:18:05 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e189462ac9
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.14
							
							
							
							
							
						 | 
						
							2020-06-18 20:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								cf5f3e9952
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.12
							
							
							
							
							
						 | 
						
							2020-06-13 11:47:13 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								2db43096de
								
							
								
							
						 | 
						
							
							
								
								补充提交
							
							
							
							
							
						 | 
						
							2020-06-12 18:04:22 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								90e12f1a4a
								
							
								
							
						 | 
						
							
							
								
								外网0.16.5,测试0.15.11
							
							
							
							
							
						 | 
						
							2020-06-08 20:18:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b499b77bbe
								
							
								
							
						 | 
						
							
							
								
								外网0.16.4版本热更
							
							
							
							
							
						 | 
						
							2020-06-08 13:57:30 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								ab3dbad074
								
							
								
							
						 | 
						
							
							
								
								测试服热更0.15.6提交
							
							
							
							
							
						 | 
						
							2020-06-05 16:16:22 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								59db757cf9
								
							
								
							
						 | 
						
							
							
								
								六月三号开发提交
							
							
							
							
							
						 | 
						
							2020-06-03 19:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9a7de6479c
								
							
								
							
						 | 
						
							
							
								
								外网0.16.3
							
							
							
							
							
						 | 
						
							2020-06-03 19:01:14 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								6019de7c1e
								
							
								
							
						 | 
						
							
							
								
								外网0.16.2
							
							
							
							
							
						 | 
						
							2020-05-25 19:55:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								063868ce73
								
							
								
							
						 | 
						
							
							
								
								外网包 0.16.1
							
							
							
							
							
						 | 
						
							2020-05-25 19:16:23 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								5a9bbcaa7f
								
							
								
							
						 | 
						
							
							
								
								打包资源提交 0.15.1
							
							
							
							
							
						 | 
						
							2020-05-15 17:55:14 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								6b3a4b5fb9
								
							
								
							
						 | 
						
							
							
								
								切换为android平台
							
							
							
							
							
						 | 
						
							2020-05-15 17:46:08 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7dea7af830
								
							
								
							
						 | 
						
							
							
								
								同步
							
							
							
							
							
						 | 
						
							2020-05-15 17:03:13 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								266b9065d8
								
							
								
							
						 | 
						
							
							
								
								测试版本 带热更 0.15.1
							
							
							
							
							
						 | 
						
							2020-05-15 16:52:35 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								00892194b5
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-11 09:38:52 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								3a6591404d
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 14:12:31 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4046f7220e
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 12:51:21 +08:00 |