Browse Source

物品tips

zhaoyang 3 years ago
parent
commit
e91fc73bf1
32 changed files with 934 additions and 52 deletions
  1. 15 0
      FGUIProject/assets/CommonGame/ComTipsApproach.xml
  2. 10 7
      FGUIProject/assets/CommonGame/GoodsItemTips.xml
  3. 1 1
      FGUIProject/assets/CommonGame/components/ComItem.xml
  4. 9 0
      FGUIProject/assets/CommonGame/components/ComTipsBase.xml
  5. 7 0
      FGUIProject/assets/CommonGame/components/ComTipsDesc.xml
  6. 15 0
      FGUIProject/assets/CommonGame/components/ComTipsScores.xml
  7. 9 0
      FGUIProject/assets/CommonGame/components/ListSourceItem.xml
  8. 5 0
      FGUIProject/assets/CommonGame/package.xml
  9. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs
  10. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs.meta
  11. 81 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs
  12. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs.meta
  13. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsDesc.cs
  14. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsDesc.cs.meta
  15. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsScores.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsScores.cs.meta
  17. 19 13
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs
  18. 75 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs
  19. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs.meta
  20. 6 3
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  21. 3 2
      GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs
  22. 3 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs
  23. 3 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  24. 4 2
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  25. 7 6
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GoodsItemTipsController.cs
  26. 279 0
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs
  27. 11 0
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs.meta
  28. 73 12
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs
  29. 12 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs
  30. 4 2
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  31. 3 1
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs
  32. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes

+ 15 - 0
FGUIProject/assets/CommonGame/ComTipsApproach.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="886,394">
+  <displayList>
+    <image id="n19_ohbx" name="n19" src="lwri5x" fileName="images/hc_btkuang_1.png" xy="185,1" group="n21_ohbx"/>
+    <text id="n20_ohbx" name="n20" xy="369,0" size="148,49" group="n21_ohbx" fontSize="36" color="#f9e4c2" text="获取途径"/>
+    <group id="n21_ohbx" name="n21" xy="185,0" size="516,56"/>
+    <list id="n18_ohbx" name="list" xy="0,107" size="886,287" overflow="scroll" lineGap="15" defaultItem="ui://eg2y0ldpohbxti7">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <text id="n24_ohbx" name="txtNone" xy="333,156" size="220,49" fontSize="36" color="#f9e4c2" text="暂无获取途径"/>
+  </displayList>
+</component>

+ 10 - 7
FGUIProject/assets/CommonGame/GoodsItemTips.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="936,668">
+<component size="936,1054">
   <displayList>
-    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,668"/>
-    <text id="n1_s2cc" name="txtName" xy="332,74" size="186,61" fontSize="46" color="#8d754e" autoClearText="true" text="物品名字"/>
-    <component id="n2_s2cc" name="goodsItem" src="j48o98" fileName="components/ComItem.xml" xy="58,58" size="216,199"/>
-    <text id="n3_s2cc" name="txtOwned" xy="338,168" size="136,46" fontSize="34" color="#a38e66" vars="true" text="已拥有:{count=0}"/>
-    <image id="n4_s2cc" name="n4" src="s2cc4h" fileName="imagesExport/zx_tsk_xian.png" xy="44,309"/>
-    <text id="n5_s2cc" name="txtDesc" xy="60,352" size="815,133" fontSize="34" color="#9f8e70" ubb="true" autoSize="height" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+    <image id="n0_s2cc" name="n0" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,1054">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <component id="n2_s2cc" name="comTipsBase" src="ohbxti3" fileName="components/ComTipsBase.xml" xy="60,15" group="n17_ohbx"/>
+    <component id="n16_ohbx" name="comTipsScores" src="ohbxti4" fileName="components/ComTipsScores.xml" xy="29,287" group="n17_ohbx"/>
+    <component id="n5_s2cc" name="comTipsDesc" src="ohbxti5" fileName="components/ComTipsDesc.xml" xy="43,382" group="n17_ohbx"/>
+    <component id="n19_ohbx" name="comTipsApproach" src="ohbxti6" fileName="ComTipsApproach.xml" xy="25,593" group="n17_ohbx"/>
+    <group id="n17_ohbx" name="grpTips" xy="25,15" size="886,940" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
   </displayList>
+  <relation target="n17_ohbx" sidePair="height-height"/>
 </component>

+ 1 - 1
FGUIProject/assets/CommonGame/components/ComItem.xml

@@ -2,7 +2,7 @@
 <component size="221,280" overflow="hidden">
   <displayList>
     <image id="n11_ehs9" name="n11" src="j48o99" fileName="images/kp_sjsj_di_3.png" xy="16,0" group="n21_qr4e"/>
-    <loader id="n12_ehs9" name="loaIcon" xy="110,96" pivot="0.5,0.5" anchor="true" size="116,116" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
+    <loader id="n12_ehs9" name="loaIcon" xy="112,97" pivot="0.5,0.5" anchor="true" size="116,116" group="n21_qr4e" aspect="true" url="ui://eg2y0ldpm9wm8v" fill="scale"/>
     <text id="n14_ehs9" name="txtName" xy="111,194" pivot="0.5,0" anchor="true" size="228,44" group="n21_qr4e" fontSize="32" color="#9b7f61" text="赵钱孙李·巴拉"/>
     <image id="n16_j8b3" name="imgGot" src="j48o9b" fileName="images/yx_yilq.png" xy="23,80" group="n21_qr4e"/>
     <image id="n23_slyz" name="imgHas" src="slyzthy" fileName="images/yx_yihd.png" xy="21,80" group="n21_qr4e"/>

+ 9 - 0
FGUIProject/assets/CommonGame/components/ComTipsBase.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="846,242">
+  <displayList>
+    <component id="n2_s2cc" name="goodsItem" src="j48o98" fileName="components/ComItem.xml" xy="0,43" size="216,199"/>
+    <text id="n1_s2cc" name="txtName" xy="274,59" size="186,61" fontSize="46" color="#8d754e" autoClearText="true" text="物品名字"/>
+    <text id="n3_s2cc" name="txtOwned" xy="280,153" size="136,46" fontSize="34" color="#a38e66" vars="true" text="已拥有:{count=0}"/>
+    <loader id="n6_ohbx" name="rarity" xy="802,0" size="44,94" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+  </displayList>
+</component>

+ 7 - 0
FGUIProject/assets/CommonGame/components/ComTipsDesc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="850,181" overflow="scroll">
+  <displayList>
+    <image id="n6_ohbx" name="n6" src="s2cc4h" fileName="imagesExport/zx_tsk_xian.png" xy="1,0"/>
+    <text id="n5_s2cc" name="txtDesc" xy="17,25" size="815,133" fontSize="34" color="#9f8e70" ubb="true" autoSize="height" autoClearText="true" text="手机课程很快就要开课咯!!同学们有没有很期待哇过 几天课上见昂!!28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
+  </displayList>
+</component>

+ 15 - 0
FGUIProject/assets/CommonGame/components/ComTipsScores.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="878,65">
+  <displayList>
+    <graph id="n16_ohbx" name="n16" xy="0,0" size="878,65" type="rect" lineSize="0" fillColor="#ffe9dcce"/>
+    <image id="n7_ohbx" name="n7" src="842s6h" fileName="imagesExport/kp_sx_1.png" xy="54,7" size="50,50" group="n15_ohbx"/>
+    <image id="n8_ohbx" name="n8" src="842s6i" fileName="imagesExport/kp_sx_2.png" xy="258,7" size="50,50" group="n15_ohbx"/>
+    <image id="n9_ohbx" name="n9" src="842s6j" fileName="imagesExport/kp_sx_3.png" xy="462,7" size="50,50" group="n15_ohbx"/>
+    <image id="n10_ohbx" name="n10" src="842s6k" fileName="imagesExport/kp_sx_4.png" xy="666,7" size="50,50" group="n15_ohbx"/>
+    <text id="n11_ohbx" name="txtGong" xy="125,7" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n12_ohbx" name="txtShang" xy="329,7" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n13_ohbx" name="txtJue" xy="533,7" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <text id="n14_ohbx" name="txtZhi" xy="737,8" size="87,46" group="n15_ohbx" fontSize="34" color="#aa865f" autoClearText="true" text="5000"/>
+    <group id="n15_ohbx" name="n15" xy="54,7" size="770,50"/>
+  </displayList>
+</component>

+ 9 - 0
FGUIProject/assets/CommonGame/components/ListSourceItem.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="860,70">
+  <displayList>
+    <text id="n22_ohbx" name="txtSourceName" xy="40,12" size="196,44" fontSize="32" color="#926651" vAlign="middle" singleLine="true" autoClearText="true" text="示例巴拉巴拉"/>
+    <component id="n23_ohbx" name="btnGo" src="lwri5y" fileName="components/ButtonApproach.xml" xy="662,0" size="198,70">
+      <Button title="前往"/>
+    </component>
+  </displayList>
+</component>

+ 5 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -193,6 +193,11 @@
     <font id="rkrwti1" name="SHUANGYUJUTI.TTF" path="/" exported="true" renderMode="" samplePointSize="16"/>
     <image id="q08xs" name="hz_xzkuang.png" path="/imagesExport/" exported="true"/>
     <component id="lh8v7" name="RewardPreviewUI.xml" path="/" exported="true"/>
+    <component id="ohbxti3" name="ComTipsBase.xml" path="/components/"/>
+    <component id="ohbxti4" name="ComTipsScores.xml" path="/components/"/>
+    <component id="ohbxti5" name="ComTipsDesc.xml" path="/components/"/>
+    <component id="ohbxti6" name="ComTipsApproach.xml" path="/"/>
+    <component id="ohbxti7" name="ListSourceItem.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComTipsApproach
+    {
+        public GComponent target;
+        public GList m_list;
+        public GTextField m_txtNone;
+        public const string URL = "ui://eg2y0ldpohbxti6";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComTipsApproach";
+        private static UI_ComTipsApproach _proxy;
+
+        public static UI_ComTipsApproach Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTipsApproach();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComTipsApproach Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTipsApproach();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_list = (GList)comp.GetChild("list");
+            m_txtNone = (GTextField)comp.GetChild("txtNone");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_list = null;
+            m_txtNone = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsApproach.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3c4142d7fe9f1734e9fdf853406be5bf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 81 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs

@@ -0,0 +1,81 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComTipsBase
+    {
+        public GComponent target;
+        public UI_ComItem m_goodsItem;
+        public GTextField m_txtName;
+        public GTextField m_txtOwned;
+        public GLoader m_rarity;
+        public const string URL = "ui://eg2y0ldpohbxti3";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComTipsBase";
+        private static UI_ComTipsBase _proxy;
+
+        public static UI_ComTipsBase Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTipsBase();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComTipsBase Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTipsBase();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_goodsItem = (UI_ComItem)UI_ComItem.Create(comp.GetChild("goodsItem"));
+            m_txtName = (GTextField)comp.GetChild("txtName");
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_rarity = (GLoader)comp.GetChild("rarity");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_goodsItem.Dispose();
+            m_goodsItem = null;
+            m_txtName = null;
+            m_txtOwned = null;
+            m_rarity = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8b1a891c58ac2e746bab60e672942dc9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsDesc.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComTipsDesc
+    {
+        public GComponent target;
+        public GTextField m_txtDesc;
+        public const string URL = "ui://eg2y0ldpohbxti5";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComTipsDesc";
+        private static UI_ComTipsDesc _proxy;
+
+        public static UI_ComTipsDesc Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTipsDesc();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComTipsDesc Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTipsDesc();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtDesc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsDesc.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c5e44eae58bab3e419c8f526492e4efc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsScores.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ComTipsScores
+    {
+        public GComponent target;
+        public GTextField m_txtGong;
+        public GTextField m_txtShang;
+        public GTextField m_txtJue;
+        public GTextField m_txtZhi;
+        public const string URL = "ui://eg2y0ldpohbxti4";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ComTipsScores";
+        private static UI_ComTipsScores _proxy;
+
+        public static UI_ComTipsScores Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTipsScores();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComTipsScores Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTipsScores();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtGong = (GTextField)comp.GetChild("txtGong");
+            m_txtShang = (GTextField)comp.GetChild("txtShang");
+            m_txtJue = (GTextField)comp.GetChild("txtJue");
+            m_txtZhi = (GTextField)comp.GetChild("txtZhi");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtGong = null;
+            m_txtShang = null;
+            m_txtJue = null;
+            m_txtZhi = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTipsScores.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 394fba6aaa1f04241b063793cfc3539f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 19 - 13
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_GoodsItemTips.cs

@@ -7,10 +7,11 @@ namespace UI.CommonGame
     public partial class UI_GoodsItemTips
     {
         public GComponent target;
-        public GTextField m_txtName;
-        public UI_ComItem m_goodsItem;
-        public GTextField m_txtOwned;
-        public GTextField m_txtDesc;
+        public UI_ComTipsBase m_comTipsBase;
+        public UI_ComTipsScores m_comTipsScores;
+        public UI_ComTipsDesc m_comTipsDesc;
+        public UI_ComTipsApproach m_comTipsApproach;
+        public GGroup m_grpTips;
         public const string URL = "ui://eg2y0ldps2cc4g";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "GoodsItemTips";
@@ -58,18 +59,23 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_goodsItem = (UI_ComItem)UI_ComItem.Create(comp.GetChild("goodsItem"));
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_comTipsBase = (UI_ComTipsBase)UI_ComTipsBase.Create(comp.GetChild("comTipsBase"));
+            m_comTipsScores = (UI_ComTipsScores)UI_ComTipsScores.Create(comp.GetChild("comTipsScores"));
+            m_comTipsDesc = (UI_ComTipsDesc)UI_ComTipsDesc.Create(comp.GetChild("comTipsDesc"));
+            m_comTipsApproach = (UI_ComTipsApproach)UI_ComTipsApproach.Create(comp.GetChild("comTipsApproach"));
+            m_grpTips = (GGroup)comp.GetChild("grpTips");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtName = null;
-            m_goodsItem.Dispose();
-            m_goodsItem = null;
-            m_txtOwned = null;
-            m_txtDesc = null;
+            m_comTipsBase.Dispose();
+            m_comTipsBase = null;
+            m_comTipsScores.Dispose();
+            m_comTipsScores = null;
+            m_comTipsDesc.Dispose();
+            m_comTipsDesc = null;
+            m_comTipsApproach.Dispose();
+            m_comTipsApproach = null;
+            m_grpTips = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 75 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_ListSourceItem
+    {
+        public GComponent target;
+        public GTextField m_txtSourceName;
+        public UI_ButtonApproach m_btnGo;
+        public const string URL = "ui://eg2y0ldpohbxti7";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "ListSourceItem";
+        private static UI_ListSourceItem _proxy;
+
+        public static UI_ListSourceItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ListSourceItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ListSourceItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ListSourceItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_txtSourceName = (GTextField)comp.GetChild("txtSourceName");
+            m_btnGo = (UI_ButtonApproach)UI_ButtonApproach.Create(comp.GetChild("btnGo"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtSourceName = null;
+            m_btnGo.Dispose();
+            m_btnGo = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ListSourceItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 44c6348454a96a9499d8e38c448ecc9a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 3
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -281,7 +281,9 @@ namespace GFGGame
             {
                 if (ItemDataManager.GetItemNum(itemId) == 0)
                 {
-                    ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
+                    // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
+                    object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
+                    GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
                 }
             }
             //_timer.Start();
@@ -574,8 +576,9 @@ namespace GFGGame
         {
             int itemId = int.Parse(UI_ComStarConsume.Proxy(_comFosterBottom.m_listStarConsume.GetChildAt(index)).target.data.ToString());
 
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
-
+            // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
+            object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
+            GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
         }
         private void OnClickBtnUpStar()
         {

+ 3 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -129,8 +129,9 @@ namespace GFGGame
             int itemId = int.Parse(comStarConsume.target.data.ToString());
             UI_ComStarConsume.ProxyEnd();
             CardData cardData = CardDataManager.GetCardDataById(_cardId);
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } });
-
+            // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } });
+            object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } };
+            GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
         }
         private async void OnClickBtnUp()
         {

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -96,7 +96,9 @@ namespace GFGGame
         private void OnListMaterialsItem(EventContext context)
         {
             int[] itemData = (int[])(context.data as GComponent).data;
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[4] }, itemData[1] });
+            // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[4] }, itemData[1] });
+            object[] sourceDatas = new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[4] }, itemData[1] };
+            GoodsItemTipsController.ShowItemTips(itemData[0], sourceDatas);
         }
 
         private void ListPropertyItemRender(int index, GObject obj)

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -377,7 +377,9 @@ namespace GFGGame
         {
             int[] itemData = (int[])(context.data as GComponent).data;
             // GoodsItemTipsController.ShowItemTips(itemId);
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, this.viewData }, itemData[1] });
+            // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, this.viewData }, itemData[1] });
+            object[] sourceDatas = new object[] { itemData[0], new object[] { typeof(ClothingView).FullName, this.viewData }, itemData[1] };
+            GoodsItemTipsController.ShowItemTips(itemData[0], sourceDatas);
         }
 
         private async void OnClickBtnRenew()

+ 4 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -386,8 +386,10 @@ namespace GFGGame
             UI_MateriasListItem listItem = UI_MateriasListItem.Proxy(context.sender as GObject);
             ItemData itemData = listItem.target.data as ItemData;
             int num = ItemDataManager.GetItemNum(itemData.id);
-            // int needCount = (itemData.num - num) > 0 ? itemData.num - num : 1;
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num });
+            int needCount = (itemData.num - num) > 0 ? itemData.num - num : 1;
+            // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, itemData.num });
+            object[] sourceDatas = new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, needCount };
+            GoodsItemTipsController.ShowItemTips(itemData.id, sourceDatas);
             UI_Component3.ProxyEnd();
             UI_MateriasListItem.ProxyEnd();
         }

+ 7 - 6
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/GoodsItemTipsController.cs

@@ -2,20 +2,21 @@ namespace GFGGame
 {
     public class GoodsItemTipsController
     {
-        public static void ShowItemTips(int id)
+        public static void ShowItemTips(int id, object[] sourceDatas = null)
         {
             if (SuitCfgArray.Instance.GetCfg(id) != null)
             {
                 ViewManager.Show<SuitPartsDetailView>(id);
 
             }
-            else if (ItemUtilCS.IsDressUpItem(id))
-            {
-                ViewManager.Show(ViewName.DRESS_UP_ITEM_TIPS_VIEW, id);
-            }
+            // else if (ItemUtilCS.IsDressUpItem(id))
+            // {
+            //     ViewManager.Show(ViewName.DRESS_UP_ITEM_TIPS_VIEW, id);
+            // }
             else
             {
-                ViewManager.Show(ViewName.GOODS_ITEM_TIPS_VIEW, id);
+                // ViewManager.Show(ViewName.GOODS_ITEM_TIPS_VIEW, new object[] { id, sourceDatas });
+                ViewManager.Show<GoodsItemTipsView>(new object[] { id, sourceDatas });
             }
         }
     }

+ 279 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -0,0 +1,279 @@
+using System.Collections.Generic;
+using FairyGUI;
+using UI.CommonGame;
+namespace GFGGame
+{
+    public class ApproachView
+    {
+        private UI_ComTipsApproach _ui;
+        private object[] _viewData;
+
+        private int _itemId;
+        private object[] _fromeViewDatas;
+        private int _needCount;
+        private List<string[]> _approachDatas = new List<string[]>();
+
+        public void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+        public void OnHide()
+        {
+            _ui.m_list.onClickItem.Remove(OnClickListApproachItem);
+            if (_ui.m_list.numItems > 0)
+            {
+                _ui.m_list.ScrollToView(0);
+                _ui.m_list.numItems = 0;
+            }
+            _approachDatas.Clear();
+            _fromeViewDatas = null;
+            UI_ComTipsApproach.ProxyEnd();
+        }
+        public void OnShow(GComponent component, object[] viewData)
+        {
+            _ui = UI_ComTipsApproach.Proxy(component);
+            _viewData = viewData;
+            _itemId = (int)viewData[0];
+            _fromeViewDatas = viewData[1] as object[];
+            _needCount = viewData.Length > 2 ? (int)viewData[2] : 0;
+            _ui.m_list.itemRenderer = ListApproachItemRenderer;
+            _ui.m_list.onClickItem.Add(OnClickListApproachItem);
+
+            SetData();
+            UpdateView();
+        }
+
+        private void SetData()
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_itemId);
+            if (string.IsNullOrEmpty(itemCfg.approach)) return;
+
+            string[] approachStrs = itemCfg.approach.Split(';');
+            foreach (string approachStr in approachStrs)
+            {
+                if (string.IsNullOrEmpty(approachStr)) continue;
+                string[] infos = approachStr.Split('=');
+                _approachDatas.Add(infos);
+            }
+        }
+        private void UpdateView()
+        {
+            _ui.m_txtNone.visible = _approachDatas.Count == 0;
+            _ui.m_list.numItems = _approachDatas.Count;
+        }
+
+        private void ListApproachItemRenderer(int index, GObject item)
+        {
+            UI_ListSourceItem listItem = UI_ListSourceItem.Proxy(item);
+            string[] infos = _approachDatas[index];
+            string functionId = infos[0];
+            GameFunctionCfg gameFunctionCfg = GameFunctionCfgArray.Instance.GetCfg(functionId);
+
+            if (functionId == ConstFunctionId.JU_QING_GUAN_QIA)
+            {
+                var levelCfgId = int.Parse(infos[1]);
+                var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+                if (levelCfg.type == ConstInstanceZonesType.Story)
+                {
+                    var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                    string chapter = NumberUtil.GetChiniseNumberText(chapterCfg.order);
+                    string level = NumberUtil.GetChiniseNumberText(levelCfg.order);
+                    if (levelCfg.subType == ConstInstanceZonesSubType.Normal)
+                    {
+                        listItem.m_txtSourceName.text = string.Format(gameFunctionCfg.name, chapter, level);
+                    }
+                    else if (levelCfg.subType == ConstInstanceZonesSubType.Hard)
+                    {
+                        listItem.m_txtSourceName.text = string.Format("精英" + gameFunctionCfg.name, chapter, level);
+                    }
+                }
+                else if (levelCfg.type == ConstInstanceZonesType.Studio)
+                {
+                    var studioCfg = StudioCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                    listItem.m_txtSourceName.text = levelCfg.name;
+                }
+            }
+            else if (functionId == ConstFunctionId.FU_ZHUANG_DIAN)
+            {
+                int shopId = int.Parse(infos[1]);
+                if (shopId == ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID)
+                {
+                    listItem.m_txtSourceName.text = "活动商店";
+                }
+                else if (shopId == ConstStoreId.LUCKY_BOX_STORE_ID)
+                {
+                    listItem.m_txtSourceName.text = "落星商店";
+                }
+                else
+                {
+                    listItem.m_txtSourceName.text = "服装店";
+                }
+            }
+            else
+            {
+                listItem.m_txtSourceName.text = gameFunctionCfg.name;
+            }
+
+            listItem.target.data = infos;
+            UI_ListSourceItem.ProxyEnd();
+        }
+        private void OnClickListApproachItem(EventContext context)
+        {
+            GObject listItem = context.data as GObject;
+            string[] infos = listItem.data as string[];
+            string functionId = infos[0];
+
+            int hasNum = ItemDataManager.GetItemNum(_itemId);
+            int needCount = 0;
+            bool isJump = true;
+            switch (functionId)
+            {
+                case ConstFunctionId.FU_ZHUANG_DIAN:
+                    // this.Hide();
+
+                    needCount = _needCount == 0 ? 1 : _needCount;
+                    int shopId = int.Parse(infos[1]);
+                    if (shopId == ConstStoreId.LUCKY_BOX_ACTIVITY_STORE_ID)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("活动暂未开启");
+                        break;
+                    }
+                    isJump = ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, new object[] { shopId, null, _itemId, needCount }, _fromeViewDatas, true, true);
+                    break;
+                case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
+                    // this.Hide();
+                    isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromeViewDatas);
+                    break;
+                case ConstFunctionId.SHOP_GIFT_BAG:
+                    // this.Hide();
+                    int giftBagValue = int.Parse(infos[1]);
+                    isJump = ViewManager.Show<RechargeStoreView>(giftBagValue, _fromeViewDatas);
+                    break;
+                case ConstFunctionId.SHOP_EXCHANGE:
+                    // this.Hide();
+                    int exchangeValue = int.Parse(infos[1]);
+                    isJump = ViewManager.Show<RechargeStoreView>(exchangeValue, _fromeViewDatas);
+                    break;
+                case ConstFunctionId.JU_QING_GUAN_QIA:
+
+                    string value = infos[1];
+                    var levelCfgId = int.Parse(value);
+                    var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+                    isJump = false;
+                    if (levelCfg.type == ConstInstanceZonesType.Story)
+                    {
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ViewName.STORY_CHAPTER_VIEW))
+                        {
+                            break;
+                        }
+                        if (!MainStoryDataManager.CheckLevelUnlock(levelCfgId))
+                        {
+                            PromptController.Instance.ShowFloatTextPrompt("关卡未开启");
+                            break;
+                        }
+
+                        if ((string)_fromeViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
+                        {
+                            //从战斗换装必需品来源跳转到剧情界面,在剧情界面点返回后直接返回章节界面,无需返回换装界面
+                            _fromeViewDatas = null;
+                        }
+                        isJump = ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, levelCfg.chapterId, _fromeViewDatas, true);
+                        InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel, _itemId, _needCount);
+                        break;
+                    }
+                    else if (levelCfg.type == ConstInstanceZonesType.Studio)
+                    {
+                        StudioCfg studioCfg = StudioCfgArray.Instance.GetCfg(levelCfg.chapterId);
+
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(studioCfg.funId))
+                        {
+                            break;
+                        }
+                        //TO DO
+                        List<StoryLevelCfg> storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(studioCfg.type, studioCfg.subType, studioCfg.id);
+                        StudioDataManager.Instance.IsCanFight(levelCfg.id, out bool canFight, out string content);
+                        if (!canFight)
+                        {
+                            PromptController.Instance.ShowFloatTextPrompt("关卡未开启");
+                            break;
+                        }
+                        // this.Hide();
+                        if (!TimeUtil.CheckDayOfWeek(studioCfg.timeArr))
+                        {
+                            PromptController.Instance.ShowFloatTextPrompt("不在活动周期内");
+                            break;
+                        }
+
+                        int type = studioCfg.funId == typeof(StudioPropertyView).Name ? 1 : 0;
+                        StudioDataManager.Instance.TYPE_SELECT_INDEX = type;
+                        StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
+                        if (studioCfg.funId == typeof(StudioPropertyView).Name)
+                        {
+                            List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgsByfunId(typeof(StudioPropertyView).Name);
+                            for (int i = 0; i < studioCfgs.Count; i++)
+                            {
+                                if (studioCfgs[i].id == studioCfg.id)
+                                {
+                                    StudioDataManager.Instance.PROPERTY_SELECT_INDEX = i;
+                                    break;
+                                }
+                            }
+                        }
+                        string viewName = "GFGGame." + studioCfg.funId;
+
+                        ViewManager.Show(viewName, new object[] { type, 0 }, _fromeViewDatas);
+                        StudioDataManager.Instance.VIEW_NAME = viewName;
+                        InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel, _itemId, _needCount);
+                        isJump = true;
+                        break;
+                    }
+
+                    break;
+                case ConstFunctionId.FU_ZHUANG_HE_CHENG:
+
+                    isJump = false;
+                    int suitId = SuitCfgManager.Instance.GetItemSuitId(_itemId);
+                    if (suitId > 0)
+                    {
+                        // this.Hide();
+                        isJump = ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId, _itemId }, _fromeViewDatas);
+
+                    }
+                    break;
+                case ConstFunctionId.ZHAI_XING:
+                    // this.Hide();
+                    isJump = ViewManager.Show(ViewName.LUCKY_BOX_VIEW, null, _fromeViewDatas, true);
+                    break;
+                case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
+                    isJump = false;
+                    if (ViewManager.isViewOpen(ViewName.SUIT_GUIDE_VIEW))
+                    {
+
+                        // this.Hide();
+                        return;
+                    }
+                    // this.Hide();
+                    isJump = ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, _fromeViewDatas);
+
+                    break;
+                case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
+                    // this.Hide();
+                    isJump = ViewManager.Show(ViewName.SUIT_SYNTHETIC_LIST_VIEW);
+                    break;
+                case ConstFunctionId.SUIT_FOSTER:
+                    // this.Hide();
+                    isJump = ViewManager.Show<ClothingListView>(null, _fromeViewDatas);
+                    break;
+            }
+            if (isJump)
+            {
+                EventAgent.DispatchEvent(ConstMessage.JUMP_TO_SOURCE);
+            }
+        }
+
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c8c24effc478c6b419297762c1ee2ba2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 73 - 12
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -7,6 +7,23 @@ namespace GFGGame
     {
         private UI_GoodsItemTips _ui;
         private ItemView itemView;
+        private ApproachView approachView;
+        private ItemCfg itemCfg;
+        public override void Dispose()
+        {
+            base.Dispose();
+            itemView.Dispose();
+            if (approachView != null)
+            {
+                approachView.Dispose();
+                approachView = null;
+            }
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
         protected override void OnInit()
         {
             base.OnInit();
@@ -15,32 +32,76 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
         }
-
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
+        }
         protected override void OnShown()
         {
             base.OnShown();
-            int itemID = (int)viewData;
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
-            _ui.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemID)).FlushVars();
-            _ui.m_txtName.text = itemCfg.name;
-            // _ui.m_goodsItem.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
+            int itemID = (int)(viewData as object[])[0];
+            object[] sourceDatas = (viewData as object[])[1] as object[];
+            itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
+
+            UpdateBase();
+            UpdateScore();
+            _ui.m_comTipsDesc.m_txtDesc.text = string.IsNullOrEmpty(itemCfg.desc) ? "暂无描述" : itemCfg.desc;
+            UpdateSourec(sourceDatas);
+        }
+        protected override void OnHide()
+        {
+            if (approachView != null)
+            {
+                approachView.OnHide();
+            }
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.JUMP_TO_SOURCE, this.Hide);
+        }
+
+        private void UpdateBase()
+        {
+            _ui.m_comTipsBase.m_txtOwned.SetVar("count", "" + ItemDataManager.GetItemNum(itemCfg.id)).FlushVars();
+            _ui.m_comTipsBase.m_txtName.text = itemCfg.name;
+
             if (itemView == null)
             {
-                itemView = new ItemView(_ui.m_goodsItem.target);
+                itemView = new ItemView(_ui.m_comTipsBase.m_goodsItem.target);
             }
             ItemData itemData = ItemUtil.createItemData(new int[] { itemCfg.id, 1 });
             itemView.SetData(itemData);
             itemView.ShowCount = false;
             itemView.ShowTips = false;
+            itemView.ShowRarity = false;
 
-            _ui.m_txtDesc.text = itemCfg.desc;
-            // RarityIconController.UpdateRarityIcon(_ui.m_goodsItem.m_rarity, itemID, true);
         }
-
-        protected override void OnHide()
+        private void UpdateScore()
         {
-            base.OnHide();
+            bool isDressUp = itemCfg.itemType == ConstItemType.DRESS_UP;
+            _ui.m_comTipsBase.m_rarity.visible = isDressUp;
+            _ui.m_comTipsScores.target.visible = isDressUp;
+            if (!isDressUp) return;
+            _ui.m_comTipsScores.m_txtGong.text = "" + itemCfg.score1;
+            _ui.m_comTipsScores.m_txtShang.text = "" + itemCfg.score2;
+            _ui.m_comTipsScores.m_txtJue.text = "" + itemCfg.score3;
+            _ui.m_comTipsScores.m_txtZhi.text = "" + itemCfg.score4;
         }
+        private void UpdateSourec(object[] sourceDatas)
+        {
+            _ui.m_comTipsApproach.target.visible = sourceDatas != null;
+            if (sourceDatas == null) return;
+            if (approachView == null)
+            {
+                approachView = new ApproachView();
+            }
+            approachView.OnShow(_ui.m_comTipsApproach.target, sourceDatas);
+        }
+
+
 
     }
 }

+ 12 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -156,7 +156,7 @@ namespace GFGGame
             }
         }
         /// <summary>
-        /// 显示mingz
+        /// 显示名字
         /// </summary>
         /// <value></value>
         public bool ShowName
@@ -167,6 +167,17 @@ namespace GFGGame
             }
         }
         /// <summary>
+        /// 显示稀有度
+        /// </summary>
+        /// <value></value>
+        public bool ShowRarity
+        {
+            set
+            {
+                _loaRarity.visible = value;
+            }
+        }
+        /// <summary>
         /// 显示数量
         /// </summary>
         /// <value></value>

+ 4 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -911,8 +911,10 @@ namespace GFGGame
             else
             {
 
-                ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { _ui.m_compNeed.target.data, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData }, 1 });
-
+                // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { _ui.m_compNeed.target.data, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData }, 1 });
+                int itemId = (int)_ui.m_compNeed.target.data;
+                object[] sourceDatas = new object[] { itemId, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData }, 1 };
+                GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
             }
         }
         private void RenderListTagItem(int index, GObject obj)

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs

@@ -95,8 +95,10 @@ namespace GFGGame
             else
             {
                 // this.Hide();
+                // ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData } });
                 object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(SuitPartsDetailView).Name);
-                ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData } });
+                object[] sourceDatas = new object[] { itemId, goBackDatas, 1 };
+                GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
             }
         }
     }

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes