Merge branch 'zhaoyang' of http://10.108.64.190:3000/gfg/client into zhaoyang

FGUIProject/assets/Activity/package.xml

@@ -16,5 +16,5 @@
     <component id="rkrwj" name="Component1.xml" path="/SevenDayLoginComponents/"/>
     <component id="fqor0" name="FirstChargeBonusUI.xml" path="/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Activity" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Activity" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Arena/package.xml

@@ -172,5 +172,5 @@
     <image id="rv0959" name="dljm_jdq_4.png" path="/images/"/>
     <image id="rv095a" name="dljm_jdq_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Arena" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Bag/package.xml

@@ -7,5 +7,5 @@
     <image id="si5zti6" name="wpbb_xtxt.png" path="/images/"/>
     <component id="si5zti7" name="ListItem.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Bag" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Bag" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Card/package.xml

@@ -143,5 +143,5 @@
     <image id="fqortln" name="cp_yeqian_bg_shang.png" path="/images/"/>
     <image id="fqortlo" name="cp_yeqian_bg_xia.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingDecompose/package.xml

@@ -31,5 +31,5 @@
     <image id="qyr6u" name="fzfj_yijanniu_4.png" path="/images/"/>
     <component id="qyr6v" name="ComBtnTab.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingDecompose" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingDecompose" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingFoster/package.xml

@@ -84,5 +84,5 @@
     <image id="ysx92p" name="tujian_ditup.png" path="/images/"/>
     <image id="weok2q" name="fzyh_fzyh.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingFoster" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingFoster" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingShop/package.xml

@@ -72,5 +72,5 @@
     <image id="v95qel" name="fzd_xiant_2.png" path="/images/"/>
     <component id="psphem" name="ArenaShopUI.xml" path="/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingShop" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/ClothingSynthetic/package.xml

@@ -61,5 +61,5 @@
     <image id="weok2j" name="jbhc_btbandi.png" path="/images/"/>
     <image id="weok2k" name="jbhc_btban_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/ClothingSynthetic" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Common/package.xml

@@ -59,5 +59,5 @@
     <image id="a0cf2d" name="lm_an.png" path="/imagesExport/"/>
     <image id="a0cf2w" name="lm_an_2.png" path="/imagesExport/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Common" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Common" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CreateRole/package.xml

@@ -6,5 +6,5 @@
     <component id="xt5s4" name="ButtonDice.xml" path="/components/"/>
     <image id="hpgr5" name="mc_jlkuang_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\CreateRole" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/CreateRole" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DailyWelfare/package.xml

@@ -13,5 +13,5 @@
     <image id="fqorb" name="lm_bq_dcm.png" path="/imagesTest/" exported="true"/>
     <image id="fqorc" name="lm_bq_xcm.png" path="/imagesTest/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\DailyWelfare" packageCount="2" genCode="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/package.xml

@@ -198,5 +198,5 @@
     <image id="v461f5" name="jjcdi_jjxian.png" path="/images/"/>
     <image id="rv09f6" name="jjsy_xx_1(1).png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Field/package.xml

@@ -44,5 +44,5 @@
     <image id="mzf819" name="tydc_zizi_4.png" path="/images/" exported="true"/>
     <image id="nasr1a" name="tydc_djdj_4.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Field" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Field" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/FieldGuide/package.xml

@@ -106,5 +106,5 @@
     <image id="mzf842" name="tujian_sjdu.png" path="/imagesExport/"/>
     <image id="mzf843" name="tujian_taoz_3.png" path="/imagesExport/" exported="true"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Friend/package.xml

@@ -48,5 +48,5 @@
     <image id="z73e1c" name="dz_hz_rwdh_1.png" path="/images/"/>
     <image id="gmjo1d" name="hy_dikuang_4.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Friend" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Friend" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Guide/package.xml

@@ -15,7 +15,7 @@
     <image id="v95qj" name="yd_tyafu.png" path="/images/"/>
     <image id="v95qk" name="yd_tykuang_4.png" path="/images/"/>
   </resources>
-  <publish name="Guide" path="..\GameClient\Assets\ResIn\UI\Guide" packageCount="2" genCode="true" extractAlpha="true">
+  <publish name="Guide" path="../GameClient/Assets/ResIn/UI/Guide" packageCount="2" genCode="true" extractAlpha="true">
     <atlas name="默认" index="0"/>
   </publish>
 </packageDescription>

FGUIProject/assets/Launcher/package.xml

@@ -36,5 +36,5 @@
     <image id="pac9tjo" name="dljm_jdq_4.png" path="/images/"/>
     <image id="pac9tjp" name="dljm_jdq_5.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Loading/package.xml

@@ -11,5 +11,5 @@
     <image id="pac99" name="dljm_jdq_4.png" path="/images/"/>
     <image id="pac9a" name="dljm_jdq_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Loading" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Loading" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Login/package.xml

@@ -50,5 +50,5 @@
     <component id="nasr5m" name="Button13.xml" path="/components/"/>
     <image id="nasr5n" name="cj_xhua.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Login" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Login" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/LuckyBox/package.xml

@@ -63,5 +63,5 @@
     <image id="dhoatab" name="cj_bj_2.png" path="/images/"/>
     <image id="mzf8tac" name="cj_zizi_3.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Mail/package.xml

@@ -22,5 +22,5 @@
     <image id="oq7ro" name="yx_btzs.png" path="/images/"/>
     <image id="oq7rp" name="yx_xiant_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Mail" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Mail" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/package.xml

@@ -617,5 +617,5 @@
     <image id="9jv6o2" name="3Second.png" path="/imagesNew/"/>
     <component id="fqoro3" name="ComResultProMask.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Notice/package.xml

@@ -30,5 +30,5 @@
     <component id="kjq3t" name="NoticeSystemShowUI.xml" path="/" exported="true"/>
     <component id="kjq3u" name="ComContent.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Notice" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Notice" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleInfo/package.xml

@@ -76,5 +76,5 @@
     <component id="v95qg3" name="ListHeadBorderItem.xml" path="/components/"/>
     <image id="ysx9gg" name="zjm_dj_1.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/RoleInfo" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/RoleLvUp/package.xml

@@ -8,5 +8,5 @@
     <component id="mueb4" name="Component1.xml" path="/components/"/>
     <component id="mueb5" name="Component2.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\RoleLvUp" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/RoleLvUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Studio/package.xml

@@ -92,5 +92,5 @@
     <image id="psph3c" name="cwxf_zidi_3.png" path="/imgExpot/" exported="true"/>
     <image id="psph3d" name="ejzjm_5.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Studio" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Travel/package.xml

@@ -50,5 +50,5 @@
     <component id="wono1d" name="ComPostcard.xml" path="/components/"/>
     <image id="pac910f" name="xqfs_ylxfdi.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Travel" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Travel" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/XiuFang/package.xml

@@ -16,5 +16,5 @@
     <image id="v95qd" name="tzhc_fzsj_an.png" path="/images/"/>
     <component id="v95qe" name="Component1.xml" path="/components/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\XiuFang" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/XiuFang" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/poem/package.xml

@@ -143,5 +143,5 @@
     <image id="pac9tjx" name="hl_cjkuangdiban.png" path="/imagesGallery/" scale="9grid" scale9grid="123,177,246,354"/>
     <image id="pac9tjy" name="tz_bolangg.png" path="/images/"/>
   </resources>
-  <publish name="" path="..\GameClient\Assets\ResIn\UI\Poem" packageCount="2" genCode="true" extractAlpha="true"/>
+  <publish name="" path="../GameClient/Assets/ResIn/UI/Poem" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/plugins/my-plugin/GenCode_CSharp.js

@@ -6,7 +6,8 @@ const CodeWriter_1 = require("./CodeWriter");
 function genCode(handler) {
     let settings = handler.project.GetSettings("Publish").codeGeneration;
     let codePkgName = handler.ToFilename(handler.pkg.name); //convert chinese to pinyin, remove special chars etc.
-    let exportCodePath = handler.exportCodePath + '/' + codePkgName;
+    handler.exportCodePath = handler.exportCodePath.replace(/\\/g, "/") + '/' + codePkgName;
+    let exportCodePath = handler.exportCodePath
     let namespaceName = codePkgName;
     let isMonoGame = handler.project.type == csharp_1.FairyEditor.ProjectType.MonoGame;
     if (settings.packageName)

FGUIProject/plugins/my-plugin/GenCode_CSharp.ts

@@ -4,7 +4,8 @@ import CodeWriter from './CodeWriter';
 function genCode(handler: FairyEditor.PublishHandler) {
     let settings = (<FairyEditor.GlobalPublishSettings>handler.project.GetSettings("Publish")).codeGeneration;
     let codePkgName = handler.ToFilename(handler.pkg.name); //convert chinese to pinyin, remove special chars etc.
-    let exportCodePath = handler.exportCodePath + '/' + codePkgName;
+    handler.exportCodePath = handler.exportCodePath.replace(/\\/g, "/") + '/' + codePkgName;
+    let exportCodePath = handler.exportCodePath
     let namespaceName = codePkgName;
     let isMonoGame = handler.project.type == FairyEditor.ProjectType.MonoGame;