lingmeng
/
jx_client_neibu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fariygui冲突

master
罗家炜 2025-06-26 00:52:49 +08:00
parent e480064fa2
commit 0686db8061
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wb_new_ui/assets/Family/package.xml
View File

@ -320,11 +320,7 @@
<image id="yk1o7d41" name="Group 556.png" path="/MyFamily/Image/"/> <image id="yk1o7d41" name="Group 556.png" path="/MyFamily/Image/"/>
<component id="yk1o7d42" name="btn_myFamilylist.xml" path="/MyFamily/Component/"/> <component id="yk1o7d42" name="btn_myFamilylist.xml" path="/MyFamily/Component/"/>
<component id="yk1o7d43" name="com_numberRemark.xml" path="/NumberRemark/" exported="true"/> <component id="yk1o7d43" name="com_numberRemark.xml" path="/NumberRemark/" exported="true"/>
<<<<<<< HEAD
<component id="95rc7d4d" name="com_familyRoomCardRecord.xml" path="/FamilyRoomCardRecord/"/>
=======
<component id="95rc7d4d" name="com_familyRoomCardRecord.xml" path="/FamilyRoomCardRecord/" exported="true"/> <component id="95rc7d4d" name="com_familyRoomCardRecord.xml" path="/FamilyRoomCardRecord/" exported="true"/>
>>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
<image id="95rc7d4e" name="Group 557.png" path="/Main/Image/" scale="9grid" scale9grid="59,36,39,0"/> <image id="95rc7d4e" name="Group 557.png" path="/Main/Image/" scale="9grid" scale9grid="59,36,39,0"/>
<image id="95rc7d4f" name="Group 365.png" path="/Main/Image/" scale="9grid" scale9grid="33,32,96,95"/> <image id="95rc7d4f" name="Group 365.png" path="/Main/Image/" scale="9grid" scale9grid="33,32,96,95"/>
<component id="95rc7d4g" name="item_record.xml" path="/FamilyRoomCardRecord/Component/"/> <component id="95rc7d4g" name="item_record.xml" path="/FamilyRoomCardRecord/Component/"/>