Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/CommonGame/ApproachOfItemUI.xml

@@ -7,7 +7,7 @@
     <text id="n3_lwri" name="txtName" xy="253,124" size="167,41" fontSize="30" color="#9c8872" vars="true" text="* {v1=物品名称 }*">
       <relation target="" sidePair="center-center"/>
     </text>
-    <list id="n4_lwri" name="listApproach" xy="184,200" size="310,237" overflow="scroll" lineGap="25" defaultItem="ui://eg2y0ldplwri5y" align="center" autoClearItems="true">
+    <list id="n4_lwri" name="listApproach" xy="114,200" size="450,237" overflow="scroll" lineGap="25" defaultItem="ui://eg2y0ldplwri5y" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/CommonGame/components/ButtonApproach.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="302,70" extention="Button">
+<component size="450,70" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_lwri" name="bg" src="lwri5v" fileName="images/hc_anniu_2.png" xy="0,0">
+    <image id="n0_lwri" name="bg" src="lwri5v" fileName="imagesExport/hc_anniu_2.png" xy="0,0" size="450,70">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_lwri" name="title" xy="36,0" size="266,70" fontSize="32" color="#926651" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="示例">
-      <relation target="" sidePair="width-width,height-height"/>
+    <text id="n1_lwri" name="title" xy="191,13" pivot="0.5,0" size="68,44" fontSize="32" color="#926651" align="center" vAlign="middle" singleLine="true" autoClearText="true" text="示例">
+      <relation target="" sidePair="center-center"/>
     </text>
   </displayList>
   <Button/>

FGUIProject/assets/Main/StoryChapterUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n13_xuzk" name="chapter" src="xuzk2e" fileName="componentsLevel/CompChapter.xml" xy="-1,0" size="1080,1920">
+    <component id="n13_xuzk" name="chapter" src="xuzk2e" fileName="componentsLevel/CompChapter.xml" xy="0,0" size="1080,1920">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n2_v354" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -85,7 +85,14 @@ namespace GFGGame
                     var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
                     string chapter = NumberUtil.GetChiniseNumberText(chapterCfg.order);
                     string level = NumberUtil.GetChiniseNumberText(levelCfg.order);
-                    listItem.target.text = string.Format(gameFunctionCfg.name, chapter, level);
+                    if (levelCfg.subType == ConstInstanceZonesSubType.Normal)
+                    {
+                        listItem.target.text = string.Format(gameFunctionCfg.name, chapter, level);
+                    }
+                    else if (levelCfg.subType == ConstInstanceZonesSubType.Hard)
+                    {
+                        listItem.target.text = string.Format("精英" + gameFunctionCfg.name, chapter, level);
+                    }
                 }
                 else if (levelCfg.type == ConstInstanceZonesType.Studio)
                 {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -45,7 +45,11 @@ namespace GFGGame
             base.OnShown();
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gxhd_bjbj");
 
-            subType = MainStoryDataManager.GetChapterSubType(MainStoryDataManager.currentChapterCfgId);
+            subType = 0;//MainStoryDataManager.GetChapterSubType(MainStoryDataManager.currentChapterCfgId);
+            if (this.viewData != null)
+            {
+                subType = (int)this.viewData;
+            }
             _ui.m_listType.selectedIndex = subType;
             UpdateList();
         }
@@ -85,7 +89,7 @@ namespace GFGGame
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
             {
                 this.Hide();
-                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
+                ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, _ui.m_listType.selectedIndex });
             }
             else
             {