jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								37b7071ccf
								
							
								
							
						 | 
						
							
							
								
								【ID1009590】
							
							
							
							
							
							
							
							【神将信息】增加神将获取途径来源预览功能 
							
						 | 
						
							2021-06-29 20:05:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1c89a4218c
								
							
								
							
						 | 
						
							
							
								
								假人骑牛修改
							
							
							
							
							
						 | 
						
							2021-06-23 11:05:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e5a491b7b9
								
							
								
							
						 | 
						
							
							
								
								随机人物修改提交
							
							
							
							
							
						 | 
						
							2021-06-23 10:20:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								15361c2ef5
								
							
								
							
						 | 
						
							
							
								
								大圣跳转
							
							
							
							
							
						 | 
						
							2021-06-19 17:07:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e562176180
								
							
								
							
						 | 
						
							
							
								
								超凡入圣提交
							
							
							
							
							
						 | 
						
							2021-06-18 18:24:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a4fa7cacff
								
							
								
							
						 | 
						
							
							
								
								Revert "【山河试炼】差红点的检测"
							
							
							
							
							
							
							
							This reverts commit 160a3e1a6f. 
							
						 | 
						
							2021-06-16 10:08:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								160a3e1a6f
								
							
								
							
						 | 
						
							
							
								
								【山河试炼】差红点的检测
							
							
							
							
							
						 | 
						
							2021-06-15 20:33:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ed4472a298
								
							
								
							
						 | 
						
							
							
								
								挂机卡死修改提交
							
							
							
							
							
						 | 
						
							2021-06-11 10:48:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2419089ff4
								
							
								
							
						 | 
						
							
							
								
								【ID1016454】
							
							
							
							
							
							
							
							【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示 
							
						 | 
						
							2021-06-11 10:30:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								11bb03fd2b
								
							
								
							
						 | 
						
							
							
								
								【ID1016454】
							
							
							
							
							
							
							
							【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示 
							
						 | 
						
							2021-06-11 10:18:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								04fba6a182
								
							
								
							
						 | 
						
							
							
								
								【页签优化】游戏内分页签高度距离统一化
							
							
							
							
							
						 | 
						
							2021-06-09 12:32:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bf5c4197ce
								
							
								
							
						 | 
						
							
							
								
								【ID1009418】
							
							
							
							
							
							
							
							【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面 
							
						 | 
						
							2021-06-09 11:03:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fe517d91ed
								
							
								
							
						 | 
						
							
							
								
								【红点】还原清空所有红点的操作
							
							
							
							
							
						 | 
						
							2021-06-04 23:56:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								39180183a9
								
							
								
							
						 | 
						
							
							
								
								【任务头像】红点问题修改
							
							
							
							
							
						 | 
						
							2021-06-04 18:41:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4077e33390
								
							
								
							
						 | 
						
							
							
								
								【红点】箭头红点不消失修复
							
							
							
							
							
						 | 
						
							2021-06-03 19:30:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								07a877bd4c
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】红点修改
							
							
							
							
							
						 | 
						
							2021-06-03 18:19:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d19325ce7b
								
							
								
							
						 | 
						
							
							
								
								【公会红点】报错修改
							
							
							
							
							
						 | 
						
							2021-06-03 17:59:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2cde942f47
								
							
								
							
						 | 
						
							
							
								
								[限时祈愿]=====红点逻辑修改
							
							
							
							
							
						 | 
						
							2021-06-03 12:04:04 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								1f75672cb8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-05-26 18:15:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f265cb07ef
								
							
								
							
						 | 
						
							
							
								
								【山河社稷图】红点帮错    公会技能属性名称修改
							
							
							
							
							
						 | 
						
							2021-06-02 17:39:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fb8410eaa5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-01 19:48:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								859bd6679e
								
							
								
							
						 | 
						
							
							
								
								点将台10连加入红点提示
							
							
							
							
							
						 | 
						
							2021-06-01 19:47:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a1ac495ca2
								
							
								
							
						 | 
						
							
							
								
								红点提交
							
							
							
							
							
						 | 
						
							2021-06-01 17:22:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c4c0cb5a69
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-01 16:53:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								259155fe52
								
							
								
							
						 | 
						
							
							
								
								【ID1016093】
							
							
							
							
							
							
							
							【无尽副本】点亮新图鉴时,副本没红点 
							
						 | 
						
							2021-06-01 16:53:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2a4927477c
								
							
								
							
						 | 
						
							
							
								
								【主题活动】跳转问题
							
							
							
							
							
						 | 
						
							2021-06-01 14:58:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9ebd4c5e05
								
							
								
							
						 | 
						
							
							
								
								【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面
							
							
							
							
							
						 | 
						
							2021-05-31 18:00:42 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								10f97f9b8b
								
							
								
							
						 | 
						
							
							
								
								[许愿神将]===活动修改
							
							
							
							
							
						 | 
						
							2021-05-31 11:31:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1d4842a7d6
								
							
								
							
						 | 
						
							
							
								
								【修行】印记提交
							
							
							
							
							
						 | 
						
							2021-05-29 19:32:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5aeb2f0ed3
								
							
								
							
						 | 
						
							
							
								
								【修行】名字左侧印记提交
							
							
							
							
							
						 | 
						
							2021-05-29 18:06:15 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								675ef2efd7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua 
							
						 | 
						
							2021-05-28 10:47:07 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								21574bebf1
								
							
								
							
						 | 
						
							
							
								
								【限时祈愿】==祈愿活动提交
							
							
							
							
							
						 | 
						
							2021-05-28 10:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6adde33bf8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-05-28 10:34:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								458ab29053
								
							
								
							
						 | 
						
							
							
								
								【清除Log】清楚部分Log
							
							
							
							
							
						 | 
						
							2021-05-28 10:33:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4b33fee287
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
						 | 
						
							2021-05-28 10:20:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								89c667d314
								
							
								
							
						 | 
						
							
							
								
								无尽红点修改提交
							
							
							
							
							
						 | 
						
							2021-05-28 09:55:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a996bbc219
								
							
								
							
						 | 
						
							
							
								
								无尽修改提交
							
							
							
							
							
						 | 
						
							2021-05-27 22:34:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b0226b664f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-05-27 19:55:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								13b222d998
								
							
								
							
						 | 
						
							
							
								
								【每日豪礼】可领取,没红点
							
							
							
							
							
						 | 
						
							2021-05-27 19:54:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1e247043ac
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0优化/无尽副本' into china/dev-c
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2021-05-27 19:42:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7779c1dbb1
								
							
								
							
						 | 
						
							
							
								
								无尽副本修改提交
							
							
							
							
							
						 | 
						
							2021-05-27 15:04:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ac0feb82be
								
							
								
							
						 | 
						
							
							
								
								【bug】
							
							
							
							
							
						 | 
						
							2021-05-27 11:07:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f758982d32
								
							
								
							
						 | 
						
							
							
								
								【山河社稷图】跳转
							
							
							
							
							
						 | 
						
							2021-05-27 09:50:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								35d0927881
								
							
								
							
						 | 
						
							
							
								
								无尽副本修改提交
							
							
							
							
							
						 | 
						
							2021-05-26 22:00:33 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								0ad3913381
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
						 | 
						
							2021-05-26 18:15:37 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b7eaf9a65a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-05-26 16:03:40 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d821836909
								
							
								
							
						 | 
						
							
							
								
								福利红包修改提交
							
							
							
							
							
						 | 
						
							2021-05-26 16:03:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c95211428b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into 0优化/无尽副本
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2021-05-26 11:55:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								da9aeed441
								
							
								
							
						 | 
						
							
							
								
								【心魔试炼】提交
							
							
							
							
							
						 | 
						
							2021-05-26 11:48:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9e6dc29cb9
								
							
								
							
						 | 
						
							
							
								
								【主界面】右上伸缩条红点
							
							
							
							
							
						 | 
						
							2021-05-25 21:08:48 +08:00 |