zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2a87d43fd0
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
							
						 | 
						
							2020-07-31 17:36:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								565d0392fc
								
							
								
							
						 | 
						
							
							
								
								背景颜色根据星级变化
							
							
							
							
							
						 | 
						
							2020-07-31 15:40:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b0002cf781
								
							
								
							
						 | 
						
							
							
								
								语言文字替换
							
							
							
							
							
						 | 
						
							2020-07-25 20:42:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1845d662ab
								
							
								
							
						 | 
						
							
							
								
								巅峰战竞猜结果新加界面    新手引导修改主线开始战斗按钮名称
							
							
							
							
							
						 | 
						
							2020-09-07 21:15:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								abfde3e8a9
								
							
								
							
						 | 
						
							
							
								
								巅峰战bug  and   使用按钮需求
							
							
							
							
							
						 | 
						
							2020-08-24 21:46:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6238892d99
								
							
								
							
						 | 
						
							
							
								
								巅峰赛刷新调位置  赛程增加-1
							
							
							
							
							
						 | 
						
							2020-08-05 21:28:16 +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
							
						 | 
						
							
							
							
							
								
							
								9bb7008a6d
								
							
								
							
						 | 
						
							
							
								
								淘汰赛战斗 可以观看多场记录
							
							
							
							
							
						 | 
						
							2020-07-23 12:19:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								db4ffb1e95
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-07-23 11:08:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f844305e0e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_arena
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua 
							
						 | 
						
							2020-07-22 21:55:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0b747a5179
								
							
								
							
						 | 
						
							
							
								
								竞猜币提交
							
							
							
							
							
						 | 
						
							2020-07-22 19:40:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								897b14aa65
								
							
								
							
						 | 
						
							
							
								
								巅峰战提交
							
							
							
							
							
						 | 
						
							2020-07-17 10:28:02 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1aa78a2dd7
								
							
								
							
						 | 
						
							
							
								
								戴峰提交
							
							
							
							
							
						 | 
						
							2020-07-16 15:52:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6fbed83b28
								
							
								
							
						 | 
						
							
							
								
								巅峰赛修改提交
							
							
							
							
							
						 | 
						
							2020-07-16 14:13:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2c744690bc
								
							
								
							
						 | 
						
							
							
								
								赛程数据合并
							
							
							
							
							
						 | 
						
							2020-07-16 10:13:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bdf9331b79
								
							
								
							
						 | 
						
							
							
								
								巅峰战提交
							
							
							
							
							
						 | 
						
							2020-07-15 18:23:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7d724437ee
								
							
								
							
						 | 
						
							
							
								
								巅峰战提示等待其他玩家战斗结束提交
							
							
							
							
							
						 | 
						
							2020-07-14 10:12:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4edc074ca3
								
							
								
							
						 | 
						
							
							
								
								抛弹竞猜结束 打开 ATM_GuessTipView时机修改
							
							
							
							
							
						 | 
						
							2020-07-11 17:16:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4a0ee0c3dc
								
							
								
							
						 | 
						
							
							
								
								巅峰赛打印提交
							
							
							
							
							
						 | 
						
							2020-07-10 15:16:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								13283fe135
								
							
								
							
						 | 
						
							
							
								
								巅峰战提交
							
							
							
							
							
						 | 
						
							2020-07-10 13:38:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0b40fda687
								
							
								
							
						 | 
						
							
							
								
								巅峰战
							
							
							
							
							
						 | 
						
							2020-07-08 20:48:43 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b3dc6d0688
								
							
								
							
						 | 
						
							
							
								
								巅峰赛
							
							
							
							
							
						 | 
						
							2020-07-08 15:02:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4630199505
								
							
								
							
						 | 
						
							
							
								
								提交试试
							
							
							
							
							
						 | 
						
							2020-07-03 19:54:34 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9c68ea0c73
								
							
								
							
						 | 
						
							
							
								
								巅峰战修改提交
							
							
							
							
							
						 | 
						
							2020-07-03 16:10:54 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d87ab3767e
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.20
							
							
							
							
							
						 | 
						
							2020-06-23 18:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								59db757cf9
								
							
								
							
						 | 
						
							
							
								
								六月三号开发提交
							
							
							
							
							
						 | 
						
							2020-06-03 19:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |