Assets/Scripts/Business/Domain/Database/DatabaseVersion.cs

@@ -5,7 +5,7 @@ namespace XGame.Database
 {
     public static class DatabaseVersion
     {
-        // version 1731393835
+        // version 1731653650
         static long _version = -1;
 
         public static long Version
@@ -14,7 +14,7 @@ namespace XGame.Database
             {
                 if (_version == -1)
                 {
-                    _version = 1731393835;
+                    _version = 1731653650;
                 }
                 return _version;
             }

Assets/Scripts/Business/Domain/Database/Metadatas/EItemType.cs

@@ -4,7 +4,7 @@
 namespace XGame.Database
 {
     /// <summary>
-    /// 0:资源\n1:代币类\n2:常规道具\n3:宝箱\n4:礼包\n5:头衔\n6：外观\n7:特权卡\n8:红包\n9:符石\n10:装备\n11:飞剑(随从)\n12:技能\n13:坐骑
+    /// 0:资源\n1:代币类\n2:通用道具\n3:宝箱\n4:礼包\n5:头衔\n6:外观\n7:特权卡\n8:红包\n9:符石\n10:装备\n11:飞剑(随从)\n12:技能\n13.坐骑
     /// </summary>
     public enum EItemType : int
     {

Assets/Scripts/Business/Runtime/FGUI/Partner/DetailsPanel/PartnerDetailsPanelCtrl.cs

@@ -116,7 +116,7 @@ namespace FL.FGUI
         private void OnItemUpdate(int eventId, object args)
         {
             var info = PartnersData.Instance.GetPartnerAttrByTableId(_partnerId);
-            var starLv = info?.RisingStarLv ?? 0;
+            var starLv = info?.RisingStarLv ?? 1;
             ShowStarRatingCostUI(starLv);
         }
 
@@ -350,7 +350,7 @@ namespace FL.FGUI
         private void ShowStarUI()
         {
             var info = PartnersData.Instance.GetPartnerAttrByTableId(_partnerId);
-            var starLv = info?.RisingStarLv ?? 0;
+            var starLv = info?.RisingStarLv ?? 1;
             ShowPartnerStarUI(starLv);
             ShowStarRatingCostUI(starLv);
             ShowStarOwnAttr(starLv);

Assets/Scripts/Business/Runtime/FGUI/Partner/EpiBagListItem/PartnerEpiBagListItemCtrl.cs

@@ -89,7 +89,7 @@ namespace FL.FGUI
         private void OnUpdateProgress()
         {
             var info = EpigraphData.Instance.GetEpigraphAttrByTableId(_id);
-            var curlv = info != null ? info.StarLv : 0;
+            var curlv = info != null ? info.StarLv : 1;
             var table = epigraphUpTableRepo.GetEpiragphUp(_id, curlv);
             if (table == null)
             {

Assets/Scripts/Business/Runtime/FGUI/Partner/EpiDetailInfo/PartnerEpiDetailInfoCtrl.cs

@@ -328,7 +328,7 @@ namespace FL.FGUI
         private void UpProgressInfo()
         {
             var info = EpigraphData.Instance.GetEpigraphAttrByTableId(_mwId);
-            var curlv = info != null ? info.StarLv : 0;
+            var curlv = info != null ? info.StarLv : 1;
             var table = epigraphUpTableRepo.GetEpiragphUp(_mwId, curlv);
             if (table == null)
             {

Assets/Scripts/Business/Runtime/FGUI/Partner/EpiDetailListItem/PartnerEpiDetailListItemCtrl.cs

@@ -37,7 +37,7 @@ namespace FL.FGUI
         public void OnRefresh(int index, EpigraphSkillLimit data)
         {
             var info = EpigraphData.Instance.GetEpigraphAttrByTableId(data.epiId);
-            var starLv = info != null ? info.StarLv : 0;
+            var starLv = info != null ? info.StarLv : 1;
             var skillTable = SkillTableRepo.Get(data.skillId);
             if (skillTable == null)
             {

Assets/Scripts/Business/Runtime/FGUI/Partner/PartnerBaseItem/PartnerPartnerBaseItemCtrl.cs

@@ -69,7 +69,7 @@ namespace FL.FGUI
             VM.ShowOther.selectedIndex = showOther ? 0 : 1;
             if (showOther)
             {
-                var starLv = partnerData?.RisingStarLv == null ? 0 : partnerData.RisingStarLv;
+                var starLv = partnerData?.RisingStarLv == null ? 1 : partnerData.RisingStarLv;
                 VM.StarRating.Enable(null);
                 VM.StarRating.Ctrl.ShowStarUI(starLv);
                 var starTable = partnerStarUpTableRepo.GetPartnerStarTable(id, starLv);

fl-fgui-project/assets/Partner/NewEpigraph/item/MwSetBase.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="84,95">
+  <controller name="InSet" pages="1,,0," selected="0">
+    <remark page="0" value="镶嵌"/>
+    <remark page="1" value="非镶嵌"/>
+  </controller>
+  <displayList>
+    <loader id="n14_vn6w" name="EmptyDiLoader" xy="3,6" size="78,87" url="ui://2981jnh7v4ke1z" autoSize="true" clearOnPublish="true">
+      <gearDisplay controller="InSet" pages="0"/>
+    </loader>
+    <image id="n15_vn6w" name="n15" src="v4ke28" fileName="Epigraph/Images/img/add.png" xy="32,43" pivot="0.5,0.5" scale="2.3,2.3">
+      <gearDisplay controller="InSet" pages="0"/>
+    </image>
+    <component id="n16_vn6w" name="EpiIcon" src="v4ke2l" fileName="Epigraph/Item/EpiBaseItem.xml" xy="0,0" pivot="0.5,0.5" size="84,95"/>
+  </displayList>
+  <scriptData genuitypez6mw3g="1" gencodez6mw3g="1"/>
+</component>

fl-fgui-project/assets/Partner/NewPartner/SbRecommendPanel.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="756,1344" designImage="ui://2981jnh7ifoa5g" designImageAlpha="72" designImageLayer="1">
+  <controller name="Tabs" pages="0,,1,,2," selected="0">
+    <remark page="0" value="新手"/>
+    <remark page="1" value="进阶"/>
+    <remark page="2" value="元素"/>
+  </controller>
+  <displayList>
+    <component id="n9_uai3" name="MaskBg" src="c95i2g" fileName="BackGroundNested.xml" pkg="gt6q23qw" xy="-122,-328" size="1000,2000">
+      <relation target="" sidePair="middle-middle"/>
+    </component>
+    <image id="n0_iqx9" name="n0" src="iqx988" fileName="NewPartner/img/tanchuangbg.png" xy="34,215" size="685,940" group="n20_uai3"/>
+    <image id="n1_iqx9" name="n1" src="iqx987" fileName="NewPartner/img/tanchuangtitlebg.png" xy="2,159" group="n20_uai3"/>
+    <text id="n7_uai3" name="n7" xy="317,168" size="124,42" group="n20_uai3" fontSize="30" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" text="推荐阵容"/>
+    <list id="n19_uai3" name="List" xy="56,244" size="645,880" group="n20_uai3" overflow="scroll" lineGap="8" defaultItem="ui://2981jnh7uai38f" autoItemSize="false" autoClearItems="true" scrollItemToViewOnClick="false">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n4_iqx9" name="Tab1Btn" src="iqx989" fileName="NewPartner/components/SbTabBtn.xml" xy="320,1141" group="n20_uai3">
+      <Button checked="true" title="新手" controller="Tabs" page="0"/>
+    </component>
+    <component id="n5_iqx9" name="Tab2Btn" src="iqx989" fileName="NewPartner/components/SbTabBtn.xml" xy="449,1141" group="n20_uai3">
+      <Button title="进阶" controller="Tabs" page="1"/>
+    </component>
+    <component id="n6_iqx9" name="Tab3Btn" src="iqx989" fileName="NewPartner/components/SbTabBtn.xml" xy="574,1141" group="n20_uai3">
+      <Button title="元素" controller="Tabs" page="2"/>
+    </component>
+    <group id="n20_uai3" name="n20" xy="2,159" size="750,1041" advanced="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
+  </displayList>
+</component>

fl-fgui-project/assets/Partner/NewPartner/SbStrengthPanel.xml

@@ -17,6 +17,7 @@
     </component>
     <component id="n125_q0v6" name="LeftBtn" src="z7d1g" fileName="NewPartner/components/ArrowBtn.xml" xy="32,517"/>
     <component id="n126_q0v6" name="RightBtn" src="z7d1g" fileName="NewPartner/components/ArrowBtn.xml" xy="624,517" scale="-1,1"/>
+    <component id="n129_scnr" name="MwSet" src="scnr85" fileName="NewPartner/components/MwSetBtn.xml" xy="615,416"/>
   </displayList>
   <scriptData gencodevl6j0="1" gencodeq0v675="1" gencodeq0v67m="1"/>
 </component>

fl-fgui-project/assets/Partner/NewPartner/components/MwSetBtn.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="85,111" pivot="0.5,0.5" extention="Button">
+  <displayList>
+    <component id="n129_scnr" name="MwSet" src="scnr84" fileName="NewEpigraph/item/MwSetBase.xml" xy="1,0"/>
+    <text id="n130_scnr" name="n130" xy="0,82" pivot="0.5,0.5" size="84,29" fontSize="20" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" text="镶嵌铭文"/>
+  </displayList>
+  <Button downEffect="scale" downEffectValue=".9"/>
+</component>

fl-fgui-project/assets/Partner/NewPartner/components/SbTabBtn.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="111,59" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="1,up,0,down" selected="0">
+    <remark page="0" value="未选中"/>
+    <remark page="1" value="选中"/>
+  </controller>
+  <displayList>
+    <image id="n4_iqx9" name="n4" src="q0v65s" fileName="NewPartner/img/Tabs0.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n2_iqx9" name="n2" src="q0v65r" fileName="NewPartner/img/Tabs1.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <text id="n3_iqx9" name="title" xy="31,7" pivot="0.5,0.5" size="52,34" fontSize="24" color="#6a708c" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" autoClearText="true" text="新手">
+      <gearColor controller="button" pages="1" values="#6a708c,#000000" default="#ffffff,#000000"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

fl-fgui-project/assets/Partner/NewPartner/components/YellowBtn.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="172,56" pivot="0.5,0.5" extention="Button">
   <displayList>
-    <image id="n43_q0v6" name="n43" src="q0v65n" fileName="NewPartner/img/Button3.png" xy="0,0"/>
-    <text id="n44_q0v6" name="title" xy="60,10" size="52,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" autoClearText="true" text="强化"/>
+    <image id="n43_q0v6" name="n43" src="q0v65n" fileName="NewPartner/img/Button3.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n44_q0v6" name="title" xy="60,10" pivot="0.5,0.5" size="52,34" fontSize="24" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" autoClearText="true" text="强化">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
   </displayList>
   <Button downEffect="scale" downEffectValue=".9"/>
 </component>

fl-fgui-project/assets/Partner/NewPartner/item/SbRecommendListItem.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="642,253">
+  <displayList>
+    <image id="n8_uai3" name="n8" src="uai38a" fileName="NewPartner/img/tanchuangbg3.png" xy="0,0" size="642,253"/>
+    <image id="n12_uai3" name="n12" src="uai38c" fileName="NewPartner/img/tanchuangTextbg.png" xy="6,6" size="630,40"/>
+    <image id="n10_uai3" name="n10" src="uai38b" fileName="NewPartner/img/TextPoint.png" xy="17,18"/>
+    <text id="n11_uai3" name="NameLabel" xy="36,10" size="92,32" fontSize="22" color="#ffffff" align="center" strokeColor="#000000" strokeSize="2" autoClearText="true" text="基础混伤"/>
+    <text id="n13_uai3" name="DescLabel" xy="36,172" size="428,62" fontSize="22" color="#ffffff" autoSize="height" strokeColor="#000000" autoClearText="true" text="通过通过通过通过通过通过通过通过通过通&#xA;通过通过通过通过通过通过通过通过通过通"/>
+    <component id="n14_uai3" name="UseBtn" src="q0v66m" fileName="NewPartner/components/YellowBtn.xml" xy="483,175" size="134,51">
+      <Button title="使用"/>
+    </component>
+    <list id="n18_uai3" name="List" xy="28,55" size="585,100" layout="row" colGap="1" defaultItem="ui://2981jnh7uai38d" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

fl-fgui-project/assets/Partner/NewPartner/item/SbRecommendListSbItem.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="96,94" designImage="ui://2981jnh7ifoa5g" designImageOffsetX="-83" designImageOffsetY="-559" designImageLayer="1">
+  <controller name="Have" pages="0,,1," selected="0">
+    <remark page="0" value="拥有"/>
+    <remark page="1" value="未拥有"/>
+  </controller>
+  <displayList>
+    <component id="n16_uai3" name="ItemBase" src="me3q0" fileName="ItemBase.xml" pkg="gt6q23qw" xy="8,6" scale="0.6,0.6"/>
+    <loader id="n17_uai3" name="TypeIcon" xy="0,0" size="46,46" scale="0.75,0.75" url="ui://2981jnh7q0v66y" autoSize="true" clearOnPublish="true"/>
+    <text id="n19_uai3" name="n19" xy="21,61" size="64,29" fontSize="20" color="#fff7d6" strokeColor="#000000" strokeSize="2" text="未拥有">
+      <gearDisplay controller="Have" pages="1"/>
+    </text>
+  </displayList>
+</component>

fl-fgui-project/assets/Partner/NewPartner/item/SbStarUpBtn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="250,72" pivot="0.5,0.5" extention="Button">
+<component size="250,72" pivot="0.5,0.5" extention="Button" designImage="ui://2981jnh7ifoa5e" designImageOffsetX="-119" designImageOffsetY="-1112" designImageLayer="1">
   <controller name="grayed" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n120_q0v6" name="n120" src="q0v65m" fileName="NewPartner/img/Button2.png" xy="0,0">
@@ -13,6 +13,7 @@
       <ProgressBar value="50" max="100"/>
     </component>
     <image id="n118_q0v6" name="n118" src="q0v66g" fileName="NewPartner/img/suipian.png" xy="64,4" scale="1.4,1.4"/>
+    <image id="n121_scnr" name="UpArrImg" src="q0v672" fileName="NewPartner/img/Upgradable.png" xy="211,-2"/>
   </displayList>
   <Button downEffect="scale" downEffectValue=".9"/>
 </component>

fl-fgui-project/assets/Partner/package.xml

@@ -122,7 +122,7 @@
     <image id="q0v65k" name="wenhao.png" path="/NewPartner/img/"/>
     <image id="q0v65l" name="Button1.png" path="/NewPartner/img/"/>
     <image id="q0v65m" name="Button2.png" path="/NewPartner/img/"/>
-    <image id="q0v65n" name="Button3.png" path="/NewPartner/img/"/>
+    <image id="q0v65n" name="Button3.png" path="/NewPartner/img/" scale="9grid" scale9grid="43,14,86,28"/>
     <image id="q0v65o" name="Button4.png" path="/NewPartner/img/"/>
     <image id="q0v65p" name="Button5.png" path="/NewPartner/img/"/>
     <image id="q0v65q" name="jiahao.png" path="/NewPartner/img/"/>
@@ -194,6 +194,17 @@
     <component id="q0v681" name="CostLabel.xml" path="/NewPartner/item/"/>
     <component id="q0v682" name="SbLevelUpBtn.xml" path="/NewPartner/item/"/>
     <image id="q0v683" name="titlebg3.png" path="/NewPartner/img/"/>
+    <component id="scnr84" name="MwSetBase.xml" path="/NewEpigraph/item/"/>
+    <component id="scnr85" name="MwSetBtn.xml" path="/NewPartner/components/"/>
+    <component id="iqx986" name="SbRecommendPanel.xml" path="/NewPartner/" exported="true"/>
+    <image id="iqx987" name="tanchuangtitlebg.png" path="/NewPartner/img/"/>
+    <image id="iqx988" name="tanchuangbg.png" path="/NewPartner/img/" scale="9grid" scale9grid="21,40,42,4"/>
+    <component id="iqx989" name="SbTabBtn.xml" path="/NewPartner/components/"/>
+    <image id="uai38a" name="tanchuangbg3.png" path="/NewPartner/img/" scale="9grid" scale9grid="10,10,20,20"/>
+    <image id="uai38b" name="TextPoint.png" path="/NewPartner/img/"/>
+    <image id="uai38c" name="tanchuangTextbg.png" path="/NewPartner/img/" scale="9grid" scale9grid="10,10,20,20"/>
+    <component id="uai38d" name="SbRecommendListSbItem.xml" path="/NewPartner/item/"/>
+    <component id="uai38f" name="SbRecommendListItem.xml" path="/NewPartner/item/"/>
   </resources>
   <publish name="" genCode="true"/>
 </packageDescription>