diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt
index e74497aec2..b0980ccc83 100644
--- a/app/src/main/java/com/gh/common/util/DirectUtils.kt
+++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt
@@ -217,8 +217,8 @@ object DirectUtils {
     /**
      * 跳转至专题合集
      */
-    fun directToColumnCollection(context: Context, id: String, position: Int = -1, entrance: String) {
-        context.startActivity(ColumnCollectionDetailActivity.getIntent(context, id, position, entrance))
+    fun directToColumnCollection(context: Context, id: String, position: Int = -1, entrance: String, columnName: String = "") {
+        context.startActivity(ColumnCollectionDetailActivity.getIntent(context, id, position, entrance, columnName))
     }
 
     /**
diff --git a/app/src/main/java/com/gh/common/util/EntranceUtils.java b/app/src/main/java/com/gh/common/util/EntranceUtils.java
index bf1de3083f..7203f6f11a 100644
--- a/app/src/main/java/com/gh/common/util/EntranceUtils.java
+++ b/app/src/main/java/com/gh/common/util/EntranceUtils.java
@@ -151,6 +151,7 @@ public class EntranceUtils {
     public static final String KEY_WEB_SHARE = "webShare";
     public static final String KEY_ACTIVITY_NAME = "activityName";//活动名称
     public static final String KEY_REQUIRE_REDIRECT = "require_redirect"; // 标记需要再跳转
+    public static final String KEY_COLUMNNAME = "columnName";
 
     public static void jumpActivity(Context context, Bundle bundle) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
index a4ef74739a..5d478dd7ed 100644
--- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt
@@ -112,11 +112,12 @@ class ColumnCollectionDetailActivity : ListActivity<LinkEntity, ColumnCollection
         /**
          * [position] 当专题合集是排行榜(多专题)类型时的起始位置
          */
-        fun getIntent(context: Context, collectionId: String, position: Int = -1, entrance: String = ""): Intent {
+        fun getIntent(context: Context, collectionId: String, position: Int = -1, entrance: String = "", columnName: String = ""): Intent {
             val intent = Intent(context, ColumnCollectionDetailActivity::class.java)
             intent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance)
             intent.putExtra(EntranceUtils.KEY_COLLECTION_ID, collectionId)
             intent.putExtra(EntranceUtils.KEY_POSITION, position)
+            intent.putExtra(EntranceUtils.KEY_COLUMNNAME, columnName)
             return intent
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
index 983dde6717..91988753ac 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
@@ -136,7 +136,6 @@ class GameDetailFragment : NormalFragment() {
 
     private var mGameEntity: GameEntity? = null
     private var mDownloadEntity: DownloadEntity? = null
-    //    private var mGameDetailEntity: GameDetailEntity? = null
     private var mNewGameDetailEntity: NewGameDetailEntity? = null
     private var mTraceEvent: ExposureEvent? = null
     private var mOrientationUtils: OrientationUtils? = null
@@ -628,13 +627,13 @@ class GameDetailFragment : NormalFragment() {
 
         updateConcernMenuIcon(mNewGameDetailEntity!!.me.isGameConcerned)
         mBaseHandler.postDelayed({
-            mGameTagView.setTags(mGameEntity?.tagStyle!!)
+            mGameTagView.setTags(mNewGameDetailEntity?.tagStyle!!)
         }, 5)
         mGameTagView.onClickListener = object : FlexLinearLayout.OnItemClickListener {
             override fun onMoreClickListener() {
                 if (!isVisible) return
                 MtaHelper.onEvent("游戏详情_新", "标签展开", mViewModel.game?.name ?: "")
-                GameTagsDialog.showGameTagsDialog(requireActivity(), mGameEntity?.tagStyle!!, mGameEntity?.name
+                GameTagsDialog.showGameTagsDialog(requireActivity(), mNewGameDetailEntity?.tagStyle!!, mGameEntity?.name
                         ?: "")
             }
 
@@ -645,9 +644,9 @@ class GameDetailFragment : NormalFragment() {
             }
         }
         ratingScoreContainer.goneIf(!mNewGameDetailEntity!!.showComment)
-        if (mNewGameDetailEntity!!.star > 3) {
+        if (mNewGameDetailEntity!!.newStar > 3) {
             ratingScoreAverage.textSize = 18f
-            ratingScoreAverage.text = if (mNewGameDetailEntity!!.star == 10F) "10" else mNewGameDetailEntity!!.star.toString()
+            ratingScoreAverage.text = if (mNewGameDetailEntity!!.newStar == 10F) "10" else mNewGameDetailEntity!!.newStar.toString()
         } else {
             ratingScoreAverage.textSize = 9f
             ratingScoreAverage.text = "评分过少"
@@ -662,7 +661,7 @@ class GameDetailFragment : NormalFragment() {
             gameDetailRankTv.isSelected = true
             gameDetailRankLl.setOnClickListener {
                 MtaHelper.onEvent("游戏详情_新", "点击榜单", "${mViewModel.game?.name}+${ranking.columnName}")
-                SubjectActivity.startSubjectActivity(requireContext(), ranking.columnId, ranking.columnName, true, mEntrance)
+                DirectUtils.directToColumnCollection(requireContext(), ranking.collectionId, entrance = mEntrance, columnName = ranking.columnName)
             }
         }
         ImageUtils.display(mGameIcon, mGameEntity!!.icon)
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt
index 146f245508..2e5e4aee8d 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt
@@ -4,6 +4,7 @@ import androidx.annotation.Keep
 import com.gh.gamecenter.entity.GameDetailEntity
 import com.gh.gamecenter.entity.LinkEntity
 import com.gh.gamecenter.entity.MeEntity
+import com.gh.gamecenter.entity.TagStyleEntity
 import com.google.gson.annotations.SerializedName
 
 @Keep
@@ -13,6 +14,8 @@ data class NewGameDetailEntity(
         @SerializedName("direct_comment")
         var directComment: Boolean = false,//安装游戏才能评论
         var star: Float = 0f,
+        @SerializedName("new_star")
+        var newStar: Float = 0f,
         @SerializedName("share_code")
         var shareCode: String = "",// 分享码
         var ranking: Ranking? = null,// 游戏榜单排名，无排名时，字段不存在
@@ -21,6 +24,8 @@ data class NewGameDetailEntity(
         @SerializedName("me")
         var me: MeEntity = MeEntity(),
         var event: BigEvent? = null,//游戏大事件
+        @SerializedName("tag_style")
+        var tagStyle: ArrayList<TagStyleEntity> = ArrayList(),
         @SerializedName("detail_tab")
         var detailEntity: ArrayList<DetailEntity> = ArrayList(),
         @SerializedName("zone_tab")
@@ -29,6 +34,10 @@ data class NewGameDetailEntity(
 
 @Keep
 data class Ranking(
+        @SerializedName("collection_id")
+        var collectionId: String = "",//合集id
+        @SerializedName("collection_name")
+        var collectionName: String = "",//合集名称
         @SerializedName("column_id")
         var columnId: String = "",//专题id
         @SerializedName("column_name")
diff --git a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt
index 1b9b988fc4..261e67e8e4 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt
@@ -71,7 +71,11 @@ class SubjectTabFragment : BaseFragment<Any>() {
             }
 
             mViewPager.post {
-                val position = arguments?.getInt(EntranceUtils.KEY_POSITION, 0) ?: 0
+                var position = arguments?.getInt(EntranceUtils.KEY_POSITION, 0) ?: 0
+                val columnName = arguments?.getString(EntranceUtils.KEY_COLUMNNAME) ?: ""
+                if (columnName.isNotEmpty()) {
+                    position = mSubjectList.indexOfFirst { it.subjectName == columnName }
+                }
                 if (position < mSubjectList.size) {
                     mViewPager.setCurrentItem(position, false)
                     if (position == 0) {
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4514a31729..9bd51c9cbf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -93,9 +93,14 @@
         <item name="titleTextAppearance">@style/CustomTitleTextAppearance</item>
         <item name="subtitleTextAppearance">@style/CustomSubTitleTextAppearance</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_bar_back</item>
+        <item name="toolbarNavigationButtonStyle">@style/ToolbarNavigationButtonStyle</item>
         <!--<item name = "titleMarginStart" >-10dp</item >-->
     </style>
 
+    <style name="ToolbarNavigationButtonStyle" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="android:minWidth">45dp</item>
+    </style>
+
     <style name="Base_ToolbarTheme">
         <!-- Color used for the title of the Toolbar - as long as not overridden -->
         <!--<item name="android:textColorPrimary">@color/pink_500_primary</item>-->