jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b93f69cfa6
								
							
								
							
						 | 
						
							
							
								
								文字导出
							
							
							
							
							
						 | 
						
							2021-02-26 09:59:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								df38aea68e
								
							
								
							
						 | 
						
							
							
								
								巅峰赛修改
							
							
							
							
							
						 | 
						
							2021-02-25 14:20:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e4f4649cf9
								
							
								
							
						 | 
						
							
							
								
								文本提交
							
							
							
							
							
						 | 
						
							2021-02-20 18:01:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								602dbc924c
								
							
								
							
						 | 
						
							
							
								
								文本还原
							
							
							
							
							
						 | 
						
							2021-02-20 16:43:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								78e7305c15
								
							
								
							
						 | 
						
							
							
								
								【本地化】导出中文
							
							
							
							
							
						 | 
						
							2021-02-05 15:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								927025f6de
								
							
								
							
						 | 
						
							
							
								
								【本地化】中文字还原,合并用
							
							
							
							
							
						 | 
						
							2021-02-05 12:44:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9559607b51
								
							
								
							
						 | 
						
							
							
								
								【本地化】部分扫光特效处理,充值界面妖精文字改图标
							
							
							
							
							
						 | 
						
							2021-01-28 15:37:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								adf591cbec
								
							
								
							
						 | 
						
							
							
								
								【本地化】lua代码还原
							
							
							
							
							
						 | 
						
							2021-01-27 18:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c567dcd426
								
							
								
							
						 | 
						
							
							
								
								【本地化】代码本地化提交
							
							
							
							
							
						 | 
						
							2021-01-26 17:08:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								81b3ca1ddc
								
							
								
							
						 | 
						
							
							
								
								【本地化】 中文字还原,合并代码用
							
							
							
							
							
						 | 
						
							2021-01-26 11:13:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								802881378c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into gx/xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua 
							
						 | 
						
							2021-01-26 11:08:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3b83a72215
								
							
								
							
						 | 
						
							
							
								
								【本地化】文字还原
							
							
							
							
							
						 | 
						
							2021-01-26 11:05:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4cec608eed
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】回滚提交2
							
							
							
							
							
						 | 
						
							2021-01-25 11:33:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								13bca53a69
								
							
								
							
						 | 
						
							
							
								
								Revert "【巅峰赛 bug】 三局两胜 第三场不刷新bug 2"
							
							
							
							
							
							
							
							This reverts commit 55383c6684. 
							
						 | 
						
							2021-01-25 11:26:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								82bb3d164e
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】回滚提交1
							
							
							
							
							
						 | 
						
							2021-01-25 11:26:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								55383c6684
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛 bug】 三局两胜 第三场不刷新bug 2
							
							
							
							
							
						 | 
						
							2021-01-21 14:48:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6b8196637e
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛 bug】 三局两胜 第三场不刷新bug
							
							
							
							
							
						 | 
						
							2021-01-21 14:47:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								81373217b0
								
							
								
							
						 | 
						
							
							
								
								巅峰赛 帮助修改
							
							
							
							
							
							
							
							(cherry picked from commit 03a22d27a5fcf6baf17746cd3eeba878eb9dda80) 
							
						 | 
						
							2021-01-14 16:04:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f501e92272
								
							
								
							
						 | 
						
							
							
								
								【本地化】代码还原,合并用
							
							
							
							
							
						 | 
						
							2021-01-12 11:00:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ae7da93056
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文字
							
							
							
							
							
						 | 
						
							2021-01-12 10:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								27b3c1ea32
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文本到代码中合并用
							
							
							
							
							
						 | 
						
							2021-01-09 14:20:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b1e1fdcab0
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛 bug】 竞猜修改2   +    巅峰赛结束后 竞猜界面没有刷新问题修改
							
							
							
							
							
						 | 
						
							2020-12-05 13:31:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								44350558c5
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】 头像特效设置层级有问题 线上
							
							
							
							
							
						 | 
						
							2020-11-06 15:49:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e2fae0cc52
								
							
								
							
						 | 
						
							
							
								
								皮肤提交
							
							
							
							
							
						 | 
						
							2020-11-06 09:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b3d15c1945
								
							
								
							
						 | 
						
							
							
								
								头像特效添加
							
							
							
							
							
						 | 
						
							2020-09-27 16:58:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4d19e7ce98
								
							
								
							
						 | 
						
							
							
								
								中文表导出提交
							
							
							
							
							
						 | 
						
							2020-08-25 15:46:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e0359bb37a
								
							
								
							
						 | 
						
							
							
								
								encoding upate
							
							
							
							
							
						 | 
						
							2020-08-06 17:52:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b853030d8a
								
							
								
							
						 | 
						
							
							
								
								巅峰战被淘汰还可自动进入战斗bug修复
							
							
							
							
							
						 | 
						
							2020-08-19 00:09:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b2a54634d2
								
							
								
							
						 | 
						
							
							
								
								适配调整   巅峰赛入口
							
							
							
							
							
						 | 
						
							2020-08-15 00:08:25 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								74b9cc5c55
								
							
								
							
						 | 
						
							
							
								
								成员红点检测  巅峰战编队入口显示修复
							
							
							
							
							
						 | 
						
							2020-08-11 00:08:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								565d0392fc
								
							
								
							
						 | 
						
							
							
								
								背景颜色根据星级变化
							
							
							
							
							
						 | 
						
							2020-07-31 15:40:43 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7f9c4f6862
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-09-13 22:25:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b0002cf781
								
							
								
							
						 | 
						
							
							
								
								语言文字替换
							
							
							
							
							
						 | 
						
							2020-07-25 20:42:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d8fa2b9459
								
							
								
							
						 | 
						
							
							
								
								头像背景修改
							
							
							
							
							
						 | 
						
							2020-07-25 19:59:43 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fe01796ded
								
							
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2020-09-11 21:10:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6742056a93
								
							
								
							
						 | 
						
							
							
								
								冲突解决提交
							
							
							
							
							
						 | 
						
							2020-07-25 15:18:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1845d662ab
								
							
								
							
						 | 
						
							
							
								
								巅峰战竞猜结果新加界面    新手引导修改主线开始战斗按钮名称
							
							
							
							
							
						 | 
						
							2020-09-07 21:15:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								caadda04e1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab 
							
						 | 
						
							2020-07-24 20:04:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								064b819f4a
								
							
								
							
						 | 
						
							
							
								
								修改星星提交
							
							
							
							
							
						 | 
						
							2020-07-24 20:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								abfde3e8a9
								
							
								
							
						 | 
						
							
							
								
								巅峰战bug  and   使用按钮需求
							
							
							
							
							
						 | 
						
							2020-08-24 21:46:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								dbb563fbe5
								
							
								
							
						 | 
						
							
							
								
								播放第三场战斗动画修改
							
							
							
							
							
						 | 
						
							2020-07-24 10:01:48 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								688662836a
								
							
								
							
						 | 
						
							
							
								
								修改
							
							
							
							
							
						 | 
						
							2020-07-23 21:18:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6a855cf7a2
								
							
								
							
						 | 
						
							
							
								
								巅峰赛问题修改
							
							
							
							
							
						 | 
						
							2020-07-23 20:39:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								94684153c3
								
							
								
							
						 | 
						
							
							
								
								回放三局两胜显示
							
							
							
							
							
						 | 
						
							2020-07-23 18:06:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3b3dbec6a7
								
							
								
							
						 | 
						
							
							
								
								添加巅峰赛编队
							
							
							
							
							
						 | 
						
							2020-07-23 14:36:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9bb7008a6d
								
							
								
							
						 | 
						
							
							
								
								淘汰赛战斗 可以观看多场记录
							
							
							
							
							
						 | 
						
							2020-07-23 12:19:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								db4ffb1e95
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-07-23 11:08:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0b747a5179
								
							
								
							
						 | 
						
							
							
								
								竞猜币提交
							
							
							
							
							
						 | 
						
							2020-07-22 19:40:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								19046587e4
								
							
								
							
						 | 
						
							
							
								
								竞猜结果修改
							
							
							
							
							
						 | 
						
							2020-07-17 17:59:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								897b14aa65
								
							
								
							
						 | 
						
							
							
								
								巅峰战提交
							
							
							
							
							
						 | 
						
							2020-07-17 10:28:02 +08:00 |