ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4faa39ab2a
								
							
								
							
						 | 
						
							
							
								
								【道具使用跳转】使用跳转修改,活动道具要大于10000
							
							
							
							
							
							
							
							(cherry picked from commit b2f8d14470) 
							
						 | 
						
							2020-12-24 16:42:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1f05f5f8f6
								
							
								
							
						 | 
						
							
							
								
								逍遥游 红点提交
							
							
							
							
							
						 | 
						
							2020-12-24 16:19:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a6e07bf1c
								
							
								
							
						 | 
						
							
							
								
								【逍遥游优化】逍遥游玩法优化内容
							
							
							
							
							
						 | 
						
							2020-12-23 20:18:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d0b94a1c3b
								
							
								
							
						 | 
						
							
							
								
								【新将活动】新将来袭、新疆招募、升星有礼 提交
							
							
							
							
							
						 | 
						
							2020-12-23 14:36:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6fc63af086
								
							
								
							
						 | 
						
							
							
								
								【增加跳转】增加跳转id
							
							
							
							
							
						 | 
						
							2020-12-23 11:31:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								12760d7cb1
								
							
								
							
						 | 
						
							
							
								
								【升星有礼】完成
							
							
							
							
							
						 | 
						
							2020-12-21 15:41:31 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								4f4542d53a
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】
							
							
							
							
							
						 | 
						
							2020-12-18 13:39:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8df6de20e5
								
							
								
							
						 | 
						
							
							
								
								【副本】isInMap字段删除bug修复
							
							
							
							
							
						 | 
						
							2020-11-16 15:24:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a5c36cf58a
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】未开启更换灵兽版本
							
							
							
							
							
						 | 
						
							2020-11-12 17:11:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								23717d6fc9
								
							
								
							
						 | 
						
							
							
								
								【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题
							
							
							
							
							
						 | 
						
							2020-11-03 15:34:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								54f1660bc2
								
							
								
							
						 | 
						
							
							
								
								【好友切磋】修复战斗结果显示错误的问题
							
							
							
							
							
						 | 
						
							2020-11-02 19:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0bf6e05add
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交6
							
							
							
							
							
						 | 
						
							2020-10-24 18:58:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f57b10696f
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】云游值自动恢复修改
							
							
							
							
							
						 | 
						
							2020-10-20 00:29:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d9434f425d
								
							
								
							
						 | 
						
							
							
								
								修复部分奖励不刷新的问题
							
							
							
							
							
						 | 
						
							2020-10-20 00:28:41 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								a3c461aff9
								
							
								
							
						 | 
						
							
							
								
								云游值恢复问题修改
							
							
							
							
							
						 | 
						
							2020-10-20 00:28:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f53a566ce8
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能入口随功能开启添加
							
							
							
							
							
						 | 
						
							2020-10-19 22:57:02 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								131d1aab1b
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】红点和帮助弹窗提交
							
							
							
							
							
						 | 
						
							2020-10-19 21:39:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								364c9c99fc
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能合并到local分支
							
							
							
							
							
						 | 
						
							2020-10-19 20:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								05780afedb
								
							
								
							
						 | 
						
							
							
								
								【自动恢复物品】物品恢复机制改为前端计算
							
							
							
							
							
						 | 
						
							2020-10-19 18:37:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f35bad0ee2
								
							
								
							
						 | 
						
							
							
								
								神州令跳转修改
							
							
							
							
							
						 | 
						
							2020-10-15 21:36:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f2d3f045aa
								
							
								
							
						 | 
						
							
							
								
								森罗幻境提交1
							
							
							
							
							
						 | 
						
							2020-10-12 14:46:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c91a81329
								
							
								
							
						 | 
						
							
							
								
								【跳转】碧海卷使用按钮跳转位置不正确
							
							
							
							
							
						 | 
						
							2020-10-15 16:05:53 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								783c61eed8
								
							
								
							
						 | 
						
							
							
								
								修复新玩家登陆卡在登陆100%
							
							
							
							
							
						 | 
						
							2020-09-27 20:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6a764f569e
								
							
								
							
						 | 
						
							
							
								
								跳转限时兑换修改
							
							
							
							
							
						 | 
						
							2020-09-27 16:21:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								96ab48c22f
								
							
								
							
						 | 
						
							
							
								
								遴选 线上活动: 三周活动 寻宝达人  四周 天宫达人2  有中文表
							
							
							
							
							
						 | 
						
							2020-09-27 16:14:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bd6fdce461
								
							
								
							
						 | 
						
							
							
								
								遴选  线上活动 :   三周活动 寻宝达人  四周  天宫达人
							
							
							
							
							
						 | 
						
							2020-09-27 16:12:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d8013ccd8c
								
							
								
							
						 | 
						
							
							
								
								打开充值每日礼包 和 成长礼包 红点检测
							
							
							
							
							
						 | 
						
							2020-09-21 16:40:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5a861862d5
								
							
								
							
						 | 
						
							
							
								
								商店添加动画
							
							
							
							
							
						 | 
						
							2020-09-04 16:54:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								04b18aa4ad
								
							
								
							
						 | 
						
							
							
								
								竞技场有免费次数 时提示红点
							
							
							
							
							
						 | 
						
							2020-09-03 14:42:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c3b0f590d2
								
							
								
							
						 | 
						
							
							
								
								好友增加一键领取红点
							
							
							
							
							
						 | 
						
							2020-09-03 10:50:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								541d4277c7
								
							
								
							
						 | 
						
							
							
								
								部分界面屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 16:11:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5b68ae2cb9
								
							
								
							
						 | 
						
							
							
								
								tujian commit
							
							
							
							
							
						 | 
						
							2020-09-12 14:12:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								aabef68ccb
								
							
								
							
						 | 
						
							
							
								
								气泡提交
							
							
							
							
							
						 | 
						
							2020-09-01 11:50:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e74c120d01
								
							
								
							
						 | 
						
							
							
								
								大闹天宫重置红点、无尽副本界面红点
							
							
							
							
							
						 | 
						
							2020-09-01 11:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a6fa4453e6
								
							
								
							
						 | 
						
							
							
								
								需求主城或关卡停留过长添加聊天气泡
							
							
							
							
							
						 | 
						
							2020-08-31 20:52:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								40266d1120
								
							
								
							
						 | 
						
							
							
								
								删除一些log、修复升级豪礼红点bug
							
							
							
							
							
						 | 
						
							2020-08-31 16:32:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2bf39b8a9c
								
							
								
							
						 | 
						
							
							
								
								副本红点提交
							
							
							
							
							
						 | 
						
							2020-08-31 15:01:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								366343b72b
								
							
								
							
						 | 
						
							
							
								
								副本红点修改提交
							
							
							
							
							
						 | 
						
							2020-08-31 13:58:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6436392c8e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-29 17:36:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								93602b9cfb
								
							
								
							
						 | 
						
							
							
								
								commit
							
							
							
							
							
						 | 
						
							2020-08-29 17:36:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a99aa6ef6e
								
							
								
							
						 | 
						
							
							
								
								还是红点检测
							
							
							
							
							
						 | 
						
							2020-08-28 17:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0c3b0e6326
								
							
								
							
						 | 
						
							
							
								
								车迟斗法副本界面红点
							
							
							
							
							
						 | 
						
							2020-08-28 16:35:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								01fc7cae51
								
							
								
							
						 | 
						
							
							
								
								森罗幻境奖励红点
							
							
							
							
							
						 | 
						
							2020-08-28 13:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cdc5c07b84
								
							
								
							
						 | 
						
							
							
								
								天宫秘宝在副本界面的红点
							
							
							
							
							
						 | 
						
							2020-08-28 10:36:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								811418e222
								
							
								
							
						 | 
						
							
							
								
								森罗 无尽红点
							
							
							
							
							
						 | 
						
							2020-08-27 13:59:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dc9615b4fc
								
							
								
							
						 | 
						
							
							
								
								无尽进图武神将问题、取消对话战斗结束神将数据界面
							
							
							
							
							
						 | 
						
							2020-08-26 16:22:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3deb27c862
								
							
								
							
						 | 
						
							
							
								
								跳转无尽副本修改
							
							
							
							
							
						 | 
						
							2020-08-26 14:53:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7f9c8122c4
								
							
								
							
						 | 
						
							
							
								
								跳转修改提交
							
							
							
							
							
						 | 
						
							2020-08-26 14:51:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4d19e7ce98
								
							
								
							
						 | 
						
							
							
								
								中文表导出提交
							
							
							
							
							
						 | 
						
							2020-08-25 15:46:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8fb4e8cf13
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-25 11:22:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9ad0593572
								
							
								
							
						 | 
						
							
							
								
								qinglong redpoint commit
							
							
							
							
							
						 | 
						
							2020-08-25 11:21:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a5c401bd34
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-08-24 20:55:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								395c41ef79
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'temp' into master_develop
							
							
							
							
							
						 | 
						
							2020-08-24 14:36:54 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6deae3c54c
								
							
								
							
						 | 
						
							
							
								
								公会副本次数修改     送神祠修改bug
							
							
							
							
							
						 | 
						
							2020-08-24 13:59:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ba39d930b8
								
							
								
							
						 | 
						
							
							
								
								添加特权推送打印
							
							
							
							
							
						 | 
						
							2020-08-22 21:03:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4477c38a25
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-22 19:40:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								056815a8b6
								
							
								
							
						 | 
						
							
							
								
								patch commit
							
							
							
							
							
						 | 
						
							2020-08-22 19:40:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4f8026425d
								
							
								
							
						 | 
						
							
							
								
								sdk添加上传新手数据的接口
							
							
							
							
							
						 | 
						
							2020-08-22 19:14:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8f72af20cc
								
							
								
							
						 | 
						
							
							
								
								公会副本提交 达人排行修改
							
							
							
							
							
						 | 
						
							2020-08-22 18:03:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								af532fce6e
								
							
								
							
						 | 
						
							
							
								
								海外相关修改合并
							
							
							
							
							
						 | 
						
							2020-08-22 16:19:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								baaee2e547
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-08-21 18:56:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7592690072
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-08-28 18:07:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8c17479fd6
								
							
								
							
						 | 
						
							
							
								
								破阵诛仙活动 调整
							
							
							
							
							
						 | 
						
							2020-08-28 17:46:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								aa551923b1
								
							
								
							
						 | 
						
							
							
								
								破阵诛仙 珍奇宝阁
							
							
							
							
							
						 | 
						
							2020-08-20 18:32:14 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6b0af3d7fb
								
							
								
							
						 | 
						
							
							
								
								pozhenzhuxian commit
							
							
							
							
							
						 | 
						
							2020-08-20 17:36:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4e1236de8c
								
							
								
							
						 | 
						
							
							
								
								qinglongserecttreasure commit
							
							
							
							
							
						 | 
						
							2020-08-19 10:05:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2063690199
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-08-14 23:34:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b2f5dbc2ca
								
							
								
							
						 | 
						
							
							
								
								xuanyuan update
							
							
							
							
							
						 | 
						
							2020-08-13 14:43:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								937d46ff75
								
							
								
							
						 | 
						
							
							
								
								xuanyuan commit
							
							
							
							
							
						 | 
						
							2020-08-12 21:10:47 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								058b18bc6f
								
							
								
							
						 | 
						
							
							
								
								最新表  协议数据
							
							
							
							
							
						 | 
						
							2020-08-12 18:29:11 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								e797e9f48d
								
							
								
							
						 | 
						
							
							
								
								合并develop &2   进程中,暂时不要更新
							
							
							
							
							
						 | 
						
							2020-08-12 11:37:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e0359bb37a
								
							
								
							
						 | 
						
							
							
								
								encoding upate
							
							
							
							
							
						 | 
						
							2020-08-06 17:52:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ee19d26bd3
								
							
								
							
						 | 
						
							
							
								
								神将置换界面创建
							
							
							
							
							
						 | 
						
							2020-08-05 15:36:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6c6f28f634
								
							
								
							
						 | 
						
							
							
								
								fix bug
							
							
							
							
							
						 | 
						
							2020-08-03 18:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5f20e3e100
								
							
								
							
						 | 
						
							
							
								
								fixed bug
							
							
							
							
							
						 | 
						
							2020-08-03 13:37:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								01e5a62715
								
							
								
							
						 | 
						
							
							
								
								#115003 UnityLogError
							
							
							
							
							
							
							
							E:/Git/JL/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua:373: table index is nil ,
UnityEngine.Application.CallLogCallback(String, String, LogType, Boolean)   公会红包红点的问题 
							
						 | 
						
							2020-08-03 10:36:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0a19c1dd82
								
							
								
							
						 | 
						
							
							
								
								优化红点检测机制为分帧刷新,优化人物升级红点检测
							
							
							
							
							
						 | 
						
							2020-08-01 13:15:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1ac12b1721
								
							
								
							
						 | 
						
							
							
								
								妖精单抽提示数量错误修改
							
							
							
							
							
						 | 
						
							2020-08-15 23:23:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ce7c70820b
								
							
								
							
						 | 
						
							
							
								
								界面适配 跳转竞技场进攻阵容检测
							
							
							
							
							
						 | 
						
							2020-08-15 19:02:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b2af34a2b3
								
							
								
							
						 | 
						
							
							
								
								副本红点提交
							
							
							
							
							
						 | 
						
							2020-07-29 17:50:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								48ac527f1a
								
							
								
							
						 | 
						
							
							
								
								限时召唤 乾坤宝盒 页面整合
							
							
							
							
							
						 | 
						
							2020-07-28 09:48:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a53b1edd7d
								
							
								
							
						 | 
						
							
							
								
								元素共鸣 “已激活”字样删除
							
							
							
							
							
						 | 
						
							2020-07-27 11:00:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4945f99452
								
							
								
							
						 | 
						
							
							
								
								--(24暂时关闭)
							
							
							
							
							
						 | 
						
							2020-07-24 18:30:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d398804a83
								
							
								
							
						 | 
						
							
							
								
								--(24暂时关闭)
							
							
							
							
							
						 | 
						
							2020-07-24 16:38:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b3ddd8fc96
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-07-24 15:22:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0ad52a3855
								
							
								
							
						 | 
						
							
							
								
								活动暂时关闭
							
							
							
							
							
						 | 
						
							2020-07-24 13:39:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5c962f330a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '接入SDK' into master_test
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/Effect.meta
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
#	BuildABs/Android/lzma/resconfigs.unity3d
#	ProjectSettings/ProjectSettings.asset 
							
						 | 
						
							2020-07-18 19:55:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a1acdd13fb
								
							
								
							
						 | 
						
							
							
								
								支付接口接入,打点数据完善
							
							
							
							
							
						 | 
						
							2020-07-18 19:24:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9876ec5f5a
								
							
								
							
						 | 
						
							
							
								
								红点检测修改
							
							
							
							
							
						 | 
						
							2020-07-17 18:20:31 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								25896729ff
								
							
								
							
						 | 
						
							
							
								
								商店去掉刷新红点
							
							
							
							
							
						 | 
						
							2020-07-17 11:32:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8f96d9f067
								
							
								
							
						 | 
						
							
							
								
								探宝红点
							
							
							
							
							
						 | 
						
							2020-07-16 18:01:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40fa614a52
								
							
								
							
						 | 
						
							
							
								
								限时召唤】点十连,单抽的免费不显示了
							
							
							
							
							
						 | 
						
							2020-07-13 12:01:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3ab971eaea
								
							
								
							
						 | 
						
							
							
								
								宝囊红点
							
							
							
							
							
						 | 
						
							2020-07-10 19:02:54 +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
							
						 | 
						
							
							
							
							
								
							
								7f54e3c88a
								
							
								
							
						 | 
						
							
							
								
								装备提交
							
							
							
							
							
						 | 
						
							2020-07-06 20:35:39 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e409bb2020
								
							
								
							
						 | 
						
							
							
								
								关闭红点显示
							
							
							
							
							
						 | 
						
							2020-07-02 17:05:21 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								461c64b04a
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-02 14:53:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b3c70f66e4
								
							
								
							
						 | 
						
							
							
								
								svn逻辑tongbu
							
							
							
							
							
						 | 
						
							2020-07-01 18:14:03 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d08552ca2f
								
							
								
							
						 | 
						
							
							
								
								外网0.16.13 内网0.15.24
							
							
							
							
							
						 | 
						
							2020-06-30 18:59:44 +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
							
						 | 
						
							
							
							
							
								
							
								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
							
						 | 
						
							
							
							
							
								
							
								b499b77bbe
								
							
								
							
						 | 
						
							
							
								
								外网0.16.4版本热更
							
							
							
							
							
						 | 
						
							2020-06-08 13:57:30 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								59db757cf9
								
							
								
							
						 | 
						
							
							
								
								六月三号开发提交
							
							
							
							
							
						 | 
						
							2020-06-03 19:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								063868ce73
								
							
								
							
						 | 
						
							
							
								
								外网包 0.16.1
							
							
							
							
							
						 | 
						
							2020-05-25 19:16:23 +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
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |