Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/ClothingSynthetic/ClothingSyntheticUI.xml

@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <component id="n1_j539" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
+    <component id="n43_g3nf" name="btnHome" src="qp4l60" fileName="components/BtnHome.xml" pkg="eg2y0ldp" xy="170,80"/>
     <component id="n2_j539" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,85" pivot="1,0" controller="c1,6"/>
     <component id="n40_ja9w" name="compHolder" src="ja9w1c" fileName="components/Component1.xml" xy="0,229" touchable="false">
       <relation target="" sidePair="middle-middle"/>

FGUIProject/assets/CommonGame/package.xml

@@ -47,7 +47,7 @@
     <image id="lwri5v" name="hc_anniu_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="75,0,150,70"/>
     <image id="lwri5x" name="hc_btkuang_1.png" path="/images/" exported="true"/>
     <component id="r9gf5z" name="ButtonInValueBar.xml" path="/components/"/>
-    <component id="qp4l60" name="ButtonHome.xml" path="/components/" exported="true"/>
+    <component id="qp4l60" name="BtnHome.xml" path="/components/" exported="true"/>
     <image id="pq5x64" name="kp_xingx.png" path="/imagesExport/" exported="true"/>
     <image id="pq5x5z" name="kp_bejing_di.png" path="/images/" exported="true" scale="9grid" scale9grid="18,18,36,36"/>
     <image id="pq5x67" name="kp_anniu_1.png" path="/imagesExport/" exported="true"/>

FGUIProject/assets/League/components/ListSkillTypeItem.xml

@@ -2,7 +2,7 @@
 <component size="928,323">
   <displayList>
     <image id="n9_miy3" name="n9" src="miy37j" fileName="images/lm_ch_mcdb.png" xy="0,0"/>
-    <loader id="n7_pvb4" name="loaBg" xy="181,24" size="706,273" url="ui://tw70qm9djx6z8l" fill="scaleFree" autoSize="true"/>
+    <loader id="n7_pvb4" name="loaBg" xy="181,24" size="706,273" url="ui://tw70qm9do4m78w" fill="scaleFree" autoSize="true"/>
     <image id="n10_miy3" name="n10" src="miy37s" fileName="images/lm_ch_jdk.png" xy="181,24"/>
     <text id="n6_pvb4" name="txtTitle" xy="94,71" pivot="0.5,0.5" size="41,180" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#b18235" align="center" vAlign="middle" leading="-5" autoSize="height" autoClearText="true" text="茶艺·选茶"/>
     <text id="n8_pvb4" name="txtProgress" xy="687,244" pivot="0.5,0" size="119,49" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#896011" align="center" ubb="true" vars="true" text="进度[color=#B55A23]{value=0}%[/color]"/>

FGUIProject/assets/League/package.xml

@@ -222,6 +222,12 @@
     <image id="jx6z8n" name="tb_xiaojiuguan.png" path="/images/"/>
     <image id="jx6z8o" name="tb_yanketing.png" path="/images/"/>
     <image id="jx6z8p" name="yjjs_tb_db.png" path="/images/"/>
+    <image id="o4m78u" name="skill_6.png" path="/images/" exported="true"/>
+    <image id="o4m78v" name="skill_2.png" path="/images/" exported="true"/>
+    <image id="o4m78w" name="skill_1.png" path="/images/" exported="true"/>
+    <image id="o4m78x" name="skill_5.png" path="/images/" exported="true"/>
+    <image id="o4m78y" name="skill_4.png" path="/images/" exported="true"/>
+    <image id="o4m78z" name="skill_3.png" path="/images/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/League" packageCount="2" genCode="true" maxAtlasSize="2048" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/Component8.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1700" overflow="scroll">
-  <displayList>
-    <component id="n5_o4m7" name="compChapterScroll" src="o4m7fr7" fileName="componentsLevel/CompChapterScroll.xml" xy="0,0"/>
-  </displayList>
-</component>

FGUIProject/assets/Main/StoryCardChooseUI.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1468">
+<component size="1080,1920">
   <displayList>
-    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="0,-530" size="1080,2228"/>
-    <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,178"/>
-    <loader id="n4_cn27" name="loaScore" xy="658,114" size="58,58" aspect="true" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
+    <image id="n7_sx2v" name="n7" src="sx2v9r" fileName="imagesStory/zd_tctcdi_1.png" xy="0,-308" size="1080,2228" group="n22_o4m7"/>
+    <image id="n9_wzce" name="n9" src="sx2v9u" fileName="imagesStory/zd_tctcxian_1.png" xy="320,400" group="n22_o4m7"/>
+    <loader id="n4_cn27" name="loaScore" xy="658,336" size="58,58" group="n22_o4m7" aspect="true" visible="false" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth">
       <relation target="n5_cn27" sidePair="left-right"/>
     </loader>
-    <text id="n5_cn27" name="txtName" xy="439,107" pivot="0.5,0" size="202,66" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
-    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,245">
+    <text id="n5_cn27" name="txtName" xy="439,329" pivot="0.5,0" size="202,66" group="n22_o4m7" font="ui://eg2y0ldpa0cftkz" fontSize="50" color="#9b7853" autoClearText="true" text="技能名字"/>
+    <component id="n13_ofwu" name="btnUpCard" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="768,467" group="n22_o4m7">
       <Button title="提升词牌"/>
     </component>
-    <text id="n11_wzce" name="txtTips" xy="719,342" size="267,51" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
-    <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,360" group="n16_ofwu"/>
-    <group id="n16_ofwu" name="n16" xy="680,342" size="306,52"/>
-    <list id="n15_ofwu" name="listSkill" xy="99,207" size="365,113" layout="row" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
+    <text id="n11_wzce" name="txtTips" xy="719,564" size="267,51" group="n16_ofwu" font="ui://eg2y0ldpa0cftkz" fontSize="38" color="#c67c6b" text="选择适合的词牌"/>
+    <image id="n10_wzce" name="n10" src="sx2v9q" fileName="imagesStory/zd_tctcxian_2.png" xy="680,582" group="n16_ofwu"/>
+    <group id="n16_ofwu" name="n16" xy="680,564" size="306,52" group="n22_o4m7"/>
+    <list id="n15_ofwu" name="listSkill" xy="99,429" size="365,113" group="n22_o4m7" layout="row" colGap="16" defaultItem="ui://mfvz4q8kofwup0">
       <item/>
       <item/>
       <item/>
     </list>
-    <list id="n0_r1a9" name="listCard" xy="41,415" size="998,813" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
+    <list id="n0_r1a9" name="listCard" xy="41,637" size="998,813" group="n22_o4m7" layout="flow_hz" overflow="scroll" lineGap="15" colGap="10" defaultItem="ui://mfvz4q8kr1a99f" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -37,14 +37,15 @@
       <item/>
       <item/>
     </list>
-    <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="components/ComArenaSkillTips.xml" xy="99,316" visible="false"/>
-    <image id="n18_ebfi" name="n18" src="ebfipr" fileName="imagesStory/zd_tctcdi_1_zz.png" xy="51,1119"/>
-    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1294" group="n12_ofwu">
+    <component id="n17_ofwu" name="comSkillTips" src="ofwup2" fileName="components/ComArenaSkillTips.xml" xy="99,538" group="n22_o4m7" visible="false"/>
+    <image id="n18_ebfi" name="n18" src="ebfipr" fileName="imagesStory/zd_tctcdi_1_zz.png" xy="51,1341" group="n22_o4m7"/>
+    <component id="n2_r1a9" name="btnCancel" src="ih7595" fileName="components/Button11.xml" pkg="mk0fwx0x" xy="129,1516" group="n12_ofwu">
       <Button title="取消"/>
     </component>
-    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1294" group="n12_ofwu">
+    <component id="n3_r1a9" name="btnConfirm" src="ih7594" fileName="components/Button10.xml" pkg="mk0fwx0x" xy="571,1516" group="n12_ofwu">
       <Button title="确认"/>
     </component>
-    <group id="n12_ofwu" name="n12" xy="129,1294" size="822,105"/>
+    <group id="n12_ofwu" name="n12" xy="129,1516" size="822,105" group="n22_o4m7"/>
+    <group id="n22_o4m7" name="n22" xy="0,-308" size="1080,2228"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComCardSelect.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="242,492" mask="n28_o4m7">
+  <displayList>
+    <graph id="n26_o4m7" name="holder" xy="122,218" size="10,10" touchable="false"/>
+    <graph id="n28_o4m7" name="n28" xy="4,10" size="234,432" type="rect" lineSize="0"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/package.xml

@@ -193,7 +193,7 @@
     <component id="py009o" name="ComSkillCard.xml" path="/components/"/>
     <component id="sx2v9p" name="ComSkillName.xml" path="/components/"/>
     <image id="sx2v9q" name="zd_tctcxian_2.png" path="/imagesStory/"/>
-    <image id="sx2v9r" name="zd_tctcdi_1.png" path="/imagesStory/" scale="9grid" scale9grid="270,0,540,66"/>
+    <image id="sx2v9r" name="zd_tctcdi_1.png" path="/imagesStory/" scale="9grid" scale9grid="270,0,540,138"/>
     <image id="sx2v9s" name="zd_tctcdikugn_1.png" path="/imagesStory/"/>
     <image id="sx2v9t" name="zd_tctcdikugn_2.png" path="/imagesStory/" scale="9grid" scale9grid="54,58,108,116"/>
     <image id="sx2v9u" name="zd_tctcxian_1.png" path="/imagesStory/"/>
@@ -685,7 +685,6 @@
     <image id="o4m7frd" name="zxgq_zddb.png" path="/imagesNew/"/>
     <image id="o4m7fre" name="zxgq_zdtb.png" path="/imagesNew/"/>
     <image id="o4m7frf" name="zxian_bg3_cover.png" path="/imagesNew/"/>
-    <component id="o4m7frg" name="Component8.xml" path="/"/>
     <image id="o4m7frl" name="zjm_tb_fuben.png" path="/images/"/>
     <image id="o4m7frm" name="sn_img_verzz.png" path="/imagesNew/"/>
     <image id="o4m7frn" name="sn_img_circle_zz.png" path="/imagesNew/"/>
@@ -722,6 +721,7 @@
     <image id="o4m7fsm" name="zxian_chapter_7.png" path="/imagesExport/" exported="true"/>
     <image id="o4m7fsn" name="zxian_chapter_8.png" path="/imagesExport/" exported="true"/>
     <image id="o4m7fso" name="zxian_chapter_lock_bg_l.png" path="/imagesNew/"/>
+    <component id="o4m7fsp" name="ComCardSelect.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Studio/StudioUI.xml

@@ -4,10 +4,10 @@
     <loader id="n8_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,center-center,middle-middle"/>
     </loader>
-    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/BtnBack0.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_rbxq" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://xz8kxrecysx92u"/>
     </component>
-    <component id="n10_t6j1" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
+    <component id="n10_t6j1" name="btnHome" src="qp4l60" fileName="components/BtnHome.xml" pkg="eg2y0ldp" xy="170,80"/>
     <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="128,1003">
       <relation target="" sidePair="left-left,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>

FGUIProject/assets/Studio/package.xml

@@ -87,14 +87,14 @@
     <image id="psph3b" name="cwxf_zidi_2.png" path="/imgExpot/" exported="true"/>
     <image id="psph3c" name="cwxf_zidi_3.png" path="/imgExpot/" exported="true"/>
     <image id="psph3d" name="ejzjm_5.png" path="/images/"/>
-    <image id="o4m73e" name="cyjd_tx_1.png" path="/imgExpot/" exported="true"/>
-    <image id="o4m73f" name="cyjd_tx_2.png" path="/imgExpot/" exported="true"/>
-    <image id="o4m73g" name="cyjd_tx_3.png" path="/imgExpot/" exported="true"/>
-    <image id="o4m73h" name="cyjd_tx_4.png" path="/imgExpot/" exported="true"/>
-    <image id="o4m73i" name="cyjd_tx_5.png" path="/imgExpot/" exported="true"/>
-    <image id="o4m73j" name="cyjd_tx_6.png" path="/imgExpot/" exported="true"/>
-    <image id="o4m73k" name="cyjd_tx_7.png" path="/imgExpot/" exported="true"/>
-    <image id="o4m73l" name="cyjd_tx_8.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73m" name="hanwudi.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73n" name="mingxizong.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73o" name="songhuizong.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73p" name="xingcijing.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73q" name="yangguifei.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73r" name="yizugongzhu.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73s" name="zhangzhongjing.png" path="/imgExpot/" exported="true"/>
+    <image id="o4m73t" name="zhukerou.png" path="/imgExpot/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Studio" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComCardSelect.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComCardSelect
+    {
+        public GComponent target;
+        public GGraph m_holder;
+        public const string URL = "ui://mfvz4q8ko4m7fsp";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComCardSelect";
+        private static UI_ComCardSelect _proxy;
+
+        public static UI_ComCardSelect Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCardSelect();
+            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_ComCardSelect Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCardSelect();
+            }
+            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_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComCardSelect.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -77,7 +77,8 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("保存至本地需要使用存储权限，请同意！");
                 //请求用户授权访问需要授权的设备资源或信息.
                 PermissionCallbacks permissionCallbacks = new PermissionCallbacks();
-                permissionCallbacks.PermissionGranted += (string a) => {
+                permissionCallbacks.PermissionGranted += (string a) =>
+                {
                     TrySavePicturoToLocal();
                 };
                 permissionCallbacks.PermissionDenied += (string a) =>
@@ -162,8 +163,9 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 9, "");
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryGuide(_ui.m_btnSavePhoto, ConstGuideId.FREEDOM_DRESS, 9, "");
+            GuideController.TryGuide(_ui.m_btnClose, ConstGuideId.FREEDOM_DRESS, 10, "");
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
 
         }
         protected override void TryCompleteGuide()
@@ -171,8 +173,8 @@ namespace GFGGame
             base.TryCompleteGuide();
 
             // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.FREEDOM_DRESS, 9);
-            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 9);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.FREEDOM_DRESS, 10);
+            GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 10);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillView.cs

@@ -93,15 +93,10 @@ namespace GFGGame
             LeagueSkillCountCfg skillCountCfg = LeagueSkillCountCfgArray.Instance.dataArray[index];
             UI_ListSkillTypeItem item = UI_ListSkillTypeItem.Proxy(obj);
             int maxFinishType = LeagueDataManager.Instance.MaxFinishType;
-            // if (skillCountCfg.type <= maxFinishType + 1)
-            // {
+
             item.m_txtTitle.text = string.Format("茶艺·{0}", skillCountCfg.name);
-            // }
-            // else
-            // {
-            //     LeagueSkillCountCfg lastSkillCountCfg = LeagueSkillCountCfgArray.Instance.dataArray[index - 1];
-            //     item.m_txtTitle.text = string.Format("学习完茶艺-{0}后开启", lastSkillCountCfg.name);
-            // }
+
+            item.m_loaBg.url = string.Format("ui://League/skill_{0}", index + 1);
             item.m_grpLock.visible = skillCountCfg.type > maxFinishType + 1;
             double progress = LeagueDataManager.Instance.GetSkillProgressByType(skillCountCfg.type);
             // item.m_txtProgress.text = string.Format("进度{0}%", progress);

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -89,7 +89,10 @@ namespace GFGGame
             _oldRewardList.Clear();
             for (int i = 0; i < _rewardList.Count; i++)
             {
-                if (GetThisCount(_rewardList[i].id, _rewardList) == ItemDataManager.GetItemNum(_rewardList[i].id) && !IsAddToNewRewardList(_rewardList[i].id))
+                long hasCount = ItemDataManager.GetItemNum(_rewardList[i].id);
+                int thisCount = GetThisCount(_rewardList[i].id, _rewardList);
+                bool isAddToNew = !IsAddToNewRewardList(_rewardList[i].id);
+                if (thisCount == hasCount && !isAddToNew)
                 {
                     _newRewardList.Add(_rewardList[i]);
                 }

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

@@ -19,9 +19,17 @@ namespace GFGGame
 
         private List<GameObject> _effects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
+        private GameObject gameObject0;
+        private GoWrapper wrapper0;
+        private GComponent _comSelected;
         public override void Dispose()
         {
             base.Dispose();
+            if (_comSelected != null)
+            {
+                _comSelected.RemoveFromParent();
+                _comSelected.Dispose();
+            }
             for (int i = 0; i < _effects.Count; i++)
             {
                 SceneController.DestroyObjectFromView(_effects[i], _wrappers[i]);
@@ -53,6 +61,11 @@ namespace GFGGame
             _ui.m_btnCancel.onClick.Add(OnBtnCancelClick);
             _ui.m_btnConfirm.onClick.Add(OnBtnComfirmClick);
             _ui.m_btnUpCard.onClick.Add(OnBtnUpCardClikc);
+
+            _comSelected = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComCardSelect").asCom;
+            string resPath = ResPathUtil.GetViewEffectPath("ui_fight_new", "kp_Select");
+
+            // SceneController.AddObjectToView(gameObject0, null, _comSelected.GetChild("holder").asGraph, resPath, out gameObject0, out wrapper0);
         }
         protected override void OnShown()
         {
@@ -91,6 +104,7 @@ namespace GFGGame
             _ui.m_listSkill.numItems = skillCfgs.Count;
             _ui.m_comSkillTips.target.visible = false;
             _selectedIndex = index;
+            _ui.m_listCard.GetChildAt(index).asCom.AddChild(_comSelected);
         }
         private void RenderListSkillItem(int index, GObject obj)
         {
@@ -143,10 +157,10 @@ namespace GFGGame
             // comStar.m_c1.selectedIndex = cardData.star;
             if (_effects.Count <= index)
             {
-                string resPath = ResPathUtil.GetViewEffectPath("ui_xz", "ui_xz_zd_kq");
+                string resPath = ResPathUtil.GetViewEffectPath("ui_fight_new", "kp_Select");
                 GameObject gameObject0;
                 GoWrapper wrapper0;
-                // SceneController.AddObjectToView(null, null, item.m_holder, resPath, out gameObject0, out wrapper0);
+                // SceneController.AddObjectToView(null, null, item.m_comEff.m_holder, resPath, out gameObject0, out wrapper0);
                 // _effects.Add(gameObject0);
                 // _wrappers.Add(wrapper0);
             }

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

@@ -134,7 +134,7 @@ namespace GFGGame
             }
             listItem.target.data = chapterCfg.id;
             listItem.m_content.target.data = chapterCfg.id;
-            RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", 0, (int)listItem.m_content.m_txtCurProgress.y - 20);
+            RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", -100, (int)listItem.m_content.m_txtCurProgress.y - 20);
             UI_ListChapterItem.ProxyEnd();
         }
 

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

@@ -114,7 +114,9 @@ namespace GFGGame
 
         private IEnumerator InitChapter()
         {
+            ET.Log.Debug("zoya000");
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+            ET.Log.Debug("zoya111");
             _ui.m_txtChapterName0.text = chapterCfg.name.Length > 0 ? chapterCfg.name[0].ToString() : "";
             _ui.m_txtChapterName1.text = chapterCfg.name.Length > 1 ? chapterCfg.name[1].ToString() : "";
             _ui.m_txtChapterName2.text = chapterCfg.name.Length > 2 ? chapterCfg.name[2].ToString() : "";
@@ -128,7 +130,7 @@ namespace GFGGame
             UpdateBonusBoxName(_ui.m_bonusBox2, "" + chapterCfg.bonusStar2);
             UpdateBonusBoxName(_ui.m_bonusBox3, "" + chapterCfg.bonusStar3);
             UpdateBonusBox();
-
+            ET.Log.Debug("zoya222");
             var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id);
             int endLevel = 0;
             int UnlockCount = 0;
@@ -203,8 +205,9 @@ namespace GFGGame
                 }
                 UI_CompStoryLevelItem.ProxyEnd();
             }
+            ET.Log.Debug("zoya333");
             yield return new WaitForEndOfFrame();
-
+            ET.Log.Debug("zoya444");
             _ui.m_chapter.m_compChapterScroll.target.y = Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height);
 
         }

GameClient/Assets/ResIn/Prefab/SceneArenaDressUpFight.prefab

@@ -103,7 +103,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: 03cdae2317655b24e9b791c43f151e7a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0f9669578b0d7da4693d55db6bc2344d, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0

GameClient/Assets/ResIn/Prefab/SceneFightResult.prefab

@@ -71,7 +71,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -999
-  m_Sprite: {fileID: 21300000, guid: 03cdae2317655b24e9b791c43f151e7a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0f9669578b0d7da4693d55db6bc2344d, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0