zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a2528a3ded
								
							
								
							
						 | 
						
							
							
								
								【去掉无用打印】
							
							
							
							
							
						 | 
						
							2021-07-01 21:07:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								667e53769a
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】8强界面不显示玩家名字
							
							
							
							
							
						 | 
						
							2021-06-17 20:53:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1b873eb38d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into china/ios
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua 
							
						 | 
						
							2021-05-19 14:12:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2df3ac159c
								
							
								
							
						 | 
						
							
							
								
								【限时活动】完成?删除loggreen
							
							
							
							
							
						 | 
						
							2021-04-21 16:36:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30b329a837
								
							
								
							
						 | 
						
							
							
								
								【ios】图片回收
							
							
							
							
							
						 | 
						
							2021-04-21 13:12:04 +08:00 | 
						
					
				
					
						
							
							
								 
								JLIOSM1
							
						 | 
						
							
							
							
							
								
							
								c31a82ef7f
								
							
								
							
						 | 
						
							
							
								
								【ios】lua文件格式修改
							
							
							
							
							
						 | 
						
							2021-04-20 13:58:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								071a91773a
								
							
								
							
						 | 
						
							
							
								
								导出 文本提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:26:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0ab7c3177a
								
							
								
							
						 | 
						
							
							
								
								还原文字提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:06:17 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9033d47109
								
							
								
							
						 | 
						
							
							
								
								【本地化】文本导出
							
							
							
							
							
						 | 
						
							2021-04-06 22:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cf5a2a46fa
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文本到代码种
							
							
							
							
							
						 | 
						
							2021-04-06 15:23:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								855c7159b8
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】尝试修改去掉注释
							
							
							
							
							
						 | 
						
							2021-04-02 16:01:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c45d20f9da
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】尝试修改
							
							
							
							
							
						 | 
						
							2021-04-02 15:47:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7bea1cf11a
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】尝试修改
							
							
							
							
							
						 | 
						
							2021-04-02 15:42:36 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								881cc1717b
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛 bug】 三局两胜 第三场不刷新bug +2
							
							
							
							
							
						 | 
						
							2021-04-02 09:55:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b3af8709ae
								
							
								
							
						 | 
						
							
							
								
								巅峰赛帮助文本修改
							
							
							
							
							
						 | 
						
							2021-03-04 14:28:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ff70c8d635
								
							
								
							
						 | 
						
							
							
								
								【本地化】竞技场 积天豪礼
							
							
							
							
							
						 | 
						
							2021-03-03 10:07:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d81075da7a
								
							
								
							
						 | 
						
							
							
								
								还原lua
							
							
							
							
							
						 | 
						
							2021-03-02 16:53:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								88e59e0c7c
								
							
								
							
						 | 
						
							
							
								
								lua 提交
							
							
							
							
							
						 | 
						
							2021-03-02 15:49:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								571591eb81
								
							
								
							
						 | 
						
							
							
								
								竞技场修改提交
							
							
							
							
							
						 | 
						
							2021-03-02 11:59:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								54cfbac8fa
								
							
								
							
						 | 
						
							
							
								
								【本地化】巅峰赛白片
							
							
							
							
							
						 | 
						
							2021-03-02 10:57:07 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d7f3fc25dd
								
							
								
							
						 | 
						
							
							
								
								语法错误
							
							
							
							
							
						 | 
						
							2021-03-01 16:56:52 +08:00 | 
						
					
				
					
						
							
							
								 
								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 |