Browse Source

功能检测兼容全名

zhaoyang 3 years ago
parent
commit
d5cfe92fa9

+ 18 - 6
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -8,8 +8,12 @@
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,80">
       <ProgressBar max="100"/>
     </component>
-    <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
-    <component id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="700,1428" pivot="0.5,0.5" anchor="true" visible="false"/>
+    <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="380,1428" pivot="0.5,0.5" anchor="true" visible="false">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
+    <component id="n15_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="700,1428" pivot="0.5,0.5" anchor="true" visible="false">
+      <relation target="" sidePair="bottom-bottom"/>
+    </component>
     <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,700">
       <ProgressBar value="100" max="100"/>
     </component>
@@ -57,10 +61,18 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
-    <graph id="n44_t6aj" name="holderPartScore" xy="380,1428" size="1,1" group="n46_t6aj" visible="false"/>
-    <graph id="n45_t6aj" name="holderPartScoreNpc" xy="700,1426" size="1,1" group="n46_t6aj" visible="false"/>
-    <graph id="n47_wgy9" name="holderAddScore" xy="320,1132" size="1,1" group="n46_t6aj" visible="false"/>
-    <graph id="n48_wgy9" name="holderAddScoreNpc" xy="750,1132" size="1,1" group="n46_t6aj" visible="false"/>
+    <graph id="n44_t6aj" name="holderPartScore" xy="380,1428" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n17_mza1" sidePair="bottom-bottom"/>
+    </graph>
+    <graph id="n45_t6aj" name="holderPartScoreNpc" xy="700,1426" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n15_mza1" sidePair="bottom-bottom"/>
+    </graph>
+    <graph id="n47_wgy9" name="holderAddScore" xy="320,1132" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n29_uj53" sidePair="bottom-bottom"/>
+    </graph>
+    <graph id="n48_wgy9" name="holderAddScoreNpc" xy="750,1132" size="1,1" group="n46_t6aj" visible="false">
+      <relation target="n34_pcn0" sidePair="bottom-bottom"/>
+    </graph>
     <group id="n46_t6aj" name="n46" xy="320,1132" size="431,297"/>
   </displayList>
 </component>

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Data/FunctionOpenDataManager.cs

@@ -13,7 +13,8 @@ namespace GFGGame
         /// <returns></returns>
         public bool CheckIsFunOpenById(string functionId, bool showTips = true)
         {
-            FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(functionId);
+            string name = ViewManager.GetName(functionId);
+            FunctionOpenCfg cfg = FunctionOpenCfgArray.Instance.GetCfg(name);
             if (cfg == null)
             {
                 // Debug.LogWarning("g功能.xlsx  功能开启_FunctionOpenCfg  未添加  " + viewName + "  的配置");

+ 11 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -168,8 +168,17 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-
-            GuideController.TryGuide(_ui.m_listApproach, ConstGuideId.BUY_CLOTHING, 2, "该物品可以在服装店购买,点开服装店看看");
+            if (_approachDatas == null) return;
+            int index = 0;
+            for (int i = 0; i < _approachDatas.Count; i++)
+            {
+                if (_approachDatas[i][0] == ConstFunctionId.FU_ZHUANG_DIAN)
+                {
+                    index = i;
+                    break;
+                }
+            }
+            GuideController.TryGuide(_ui.m_listApproach, ConstGuideId.BUY_CLOTHING, 2, "该物品可以在服装店购买,点开服装店看看", index, true, (int)(this.viewCom.y + this.viewCom.height + 10));
         }
     }
 }

+ 4 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -52,6 +52,7 @@ namespace GFGGame
         private GameObject _gameObject16;
         private GameObject _gameObject17;
         private GameObject _gameObject18;
+        private GameObject _gameObject19;
         private List<GameObject> _gameObjects = new List<GameObject>();
         // private GoWrapper _wrapper5;
         private Dictionary<int, RoleSkillCfg> _npcSkillDic;
@@ -83,6 +84,7 @@ namespace GFGGame
             SceneController.DestroyObjectFromView(_gameObject16);
             SceneController.DestroyObjectFromView(_gameObject17);
             SceneController.DestroyObjectFromView(_gameObject18);
+            SceneController.DestroyObjectFromView(_gameObject19);
             for (int i = 0; i < _gameObjects.Count; i++)
             {
                 SceneController.DestroyObjectFromView(_gameObjects[i]);
@@ -119,7 +121,8 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject16, null, _ui.m_holderPartScoreNpc, resPath9, out _gameObject16, out GoWrapper _wrapper16);
             SceneController.AddObjectToView(_gameObject17, null, _ui.m_holderAddScore, resPath9, out _gameObject17, out GoWrapper _wrapper17);
             SceneController.AddObjectToView(_gameObject18, null, _ui.m_holderAddScoreNpc, resPath9, out _gameObject18, out GoWrapper _wrapper18);
-
+            string resPath10 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
+            SceneController.AddObjectToView(_gameObject19, null, _ui.m_proScore.m_comBar.m_holder1, resPath10, out _gameObject19, out GoWrapper _wrapper19);
 
             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_an");
             for (int i = 0; i < _skillCount; i++)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -277,7 +277,7 @@ namespace GFGGame
             }
             return false;
         }
-        private static string GetName(string fullName)
+        public static string GetName(string fullName)
         {
             string[] names = fullName.Split('.');
             string name = names[names.Length - 1];

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes