jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8f226ad066
								
							
								
							
						 | 
						
							
							
								
								玲珑宝镜提交
							
							
							
							
							
						 | 
						
							2021-06-28 18:25:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								10e4552c4f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into 0功能/玲珑宝镜
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua 
							
						 | 
						
							2021-06-28 10:31:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0bb076913b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-25 18:28:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b3679b70f3
								
							
								
							
						 | 
						
							
							
								
								首充修改提交
							
							
							
							
							
						 | 
						
							2021-06-25 18:28:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c2d3a481ff
								
							
								
							
						 | 
						
							
							
								
								【登录】修复服务器列表界面,推荐服tips错误显示已有角色的问题
							
							
							
							
							
						 | 
						
							2021-06-25 16:44:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								757ec35f44
								
							
								
							
						 | 
						
							
							
								
								【登录】容错处理添加
							
							
							
							
							
						 | 
						
							2021-06-25 16:02:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a19795a39c
								
							
								
							
						 | 
						
							
							
								
								首充修改
							
							
							
							
							
						 | 
						
							2021-06-25 15:44:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6b70f85740
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-24 14:05:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								748f9be757
								
							
								
							
						 | 
						
							
							
								
								首充修改提交
							
							
							
							
							
						 | 
						
							2021-06-24 11:12:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f7d97ef4aa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-23 18:51:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								234f3cb48f
								
							
								
							
						 | 
						
							
							
								
								ID1009568】
							
							
							
							
							
							
							
							【优化】首充活动页签优化,下方页签实现可拖动
(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41) 
							
						 | 
						
							2021-06-23 18:51:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								08588974a9
								
							
								
							
						 | 
						
							
							
								
								心愿抽卡单抽动画修改
							
							
							
							
							
						 | 
						
							2021-06-23 16:43:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								622ea5c6a2
								
							
								
							
						 | 
						
							
							
								
								乾坤宝盒 提交
							
							
							
							
							
						 | 
						
							2021-06-23 16:13:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4abdfba82a
								
							
								
							
						 | 
						
							
							
								
								乾坤宝盒修改提交
							
							
							
							
							
						 | 
						
							2021-06-23 16:11:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7f7a534a2f
								
							
								
							
						 | 
						
							
							
								
								主题活动修改提交
							
							
							
							
							
							
							
							(cherry picked from commit e7352701e7) 
							
						 | 
						
							2021-06-23 15:12:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fef55ac7ad
								
							
								
							
						 | 
						
							
							
								
								假人骑牛修改
							
							
							
							
							
							
							
							(cherry picked from commit 1c89a4218c) 
							
						 | 
						
							2021-06-23 15:12:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								84cda5fdaf
								
							
								
							
						 | 
						
							
							
								
								随机人物修改提交
							
							
							
							
							
							
							
							(cherry picked from commit e5a491b7b9) 
							
						 | 
						
							2021-06-23 15:12:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e7352701e7
								
							
								
							
						 | 
						
							
							
								
								主题活动修改提交
							
							
							
							
							
						 | 
						
							2021-06-23 15:11:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1c89a4218c
								
							
								
							
						 | 
						
							
							
								
								假人骑牛修改
							
							
							
							
							
						 | 
						
							2021-06-23 11:05:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e5a491b7b9
								
							
								
							
						 | 
						
							
							
								
								随机人物修改提交
							
							
							
							
							
						 | 
						
							2021-06-23 10:20:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								24c2de4c6d
								
							
								
							
						 | 
						
							
							
								
								【公告】修改公告在分子包时配置的字段
							
							
							
							
							
						 | 
						
							2021-06-22 17:51:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2d5667f9ec
								
							
								
							
						 | 
						
							
							
								
								【登录】serverversion改为从后端获取
							
							
							
							
							
						 | 
						
							2021-06-22 15:01:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								274f315d2b
								
							
								
							
						 | 
						
							
							
								
								大圣购买修改
							
							
							
							
							
						 | 
						
							2021-06-22 10:08:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								252aff3423
								
							
								
							
						 | 
						
							
							
								
								【月卡激活】如果购买的礼包不弹恭喜获得,就不会提示已激活月卡,待下次任意界面弹恭喜获得才会提示
							
							
							
							
							
						 | 
						
							2021-06-21 17:37:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fe16795d8c
								
							
								
							
						 | 
						
							
							
								
								【主城】右上伸缩条闪烁修改
							
							
							
							
							
						 | 
						
							2021-06-21 16:57:22 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3f320f1e89
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】修复协程导致报错
							
							
							
							
							
						 | 
						
							2021-06-21 14:12:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								057e32fe52
								
							
								
							
						 | 
						
							
							
								
								【福星高照】领取完所有奖励后,按钮红点不消失
							
							
							
							
							
						 | 
						
							2021-06-21 13:52:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								be75375dd6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-21 10:53:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0f309447c2
								
							
								
							
						 | 
						
							
							
								
								【ID1016740】
							
							
							
							
							
							
							
							【每日豪礼】先遣测试包礼文案丢失,本地正常 
							
						 | 
						
							2021-06-21 10:53:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cf38744969
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-21 10:52:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								428df0c41d
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】限时商市道具光效穿透
							
							
							
							
							
						 | 
						
							2021-06-21 10:51:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8152d96e1e
								
							
								
							
						 | 
						
							
							
								
								【福星高照】领取完所有奖励后,按钮红点不消失
							
							
							
							
							
						 | 
						
							2021-06-21 10:42:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3feebf1ef6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-21 10:22:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c2f6c54063
								
							
								
							
						 | 
						
							
							
								
								【ID1016741】
							
							
							
							
							
							
							
							【界面UI】全面屏手机界面适配异常 
							
						 | 
						
							2021-06-21 10:22:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								65794931b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-21 09:51:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8c0980e750
								
							
								
							
						 | 
						
							
							
								
								【降妖夺宝】十连上方资源显示修改
							
							
							
							
							
						 | 
						
							2021-06-21 09:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								46efd9b960
								
							
								
							
						 | 
						
							
							
								
								关闭帮助界面
							
							
							
							
							
						 | 
						
							2021-06-19 17:50:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f4fe155533
								
							
								
							
						 | 
						
							
							
								
								大圣修改
							
							
							
							
							
						 | 
						
							2021-06-19 17:47:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b85b94fa68
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-19 17:07:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								15361c2ef5
								
							
								
							
						 | 
						
							
							
								
								大圣跳转
							
							
							
							
							
						 | 
						
							2021-06-19 17:07:17 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5184ced8c8
								
							
								
							
						 | 
						
							
							
								
								[战斗]==============免疫buff清除提示修改
							
							
							
							
							
						 | 
						
							2021-06-19 16:41:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8342399870
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-19 15:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								46621252d9
								
							
								
							
						 | 
						
							
							
								
								惊喜礼包拍脸修改
							
							
							
							
							
						 | 
						
							2021-06-19 15:50:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d11833e088
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-19 15:46:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								04c89ccaa9
								
							
								
							
						 | 
						
							
							
								
								【月卡】月卡激活提示修改到关闭奖励界面之后
							
							
							
							
							
						 | 
						
							2021-06-19 15:45:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b6b55590b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-19 15:29:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								67e5cbf8c9
								
							
								
							
						 | 
						
							
							
								
								大圣 不能查看详情修改
							
							
							
							
							
						 | 
						
							2021-06-19 15:29:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6d4d1fc49b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
							
							
							
							
							
						 | 
						
							2021-06-19 15:28:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b423005b6e
								
							
								
							
						 | 
						
							
							
								
								【活动】页签使用原图大小
							
							
							
							
							
						 | 
						
							2021-06-19 15:28:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2e693575a6
								
							
								
							
						 | 
						
							
							
								
								抽卡提示只在神将抽里出现
							
							
							
							
							
						 | 
						
							2021-06-19 15:00:37 +08:00 |