Merge branch 'master' of http://120.92.132.192:23541/StarRacing10005/StarRacingClient

assets/script/ui/Egg/UI_Egg.ts

@@ -20,6 +20,7 @@ export default class UI_Egg extends fgui.GComponent {
 	public m_txtAttribute:fgui.GTextField;
 	public m_t0:fgui.Transition;
 	public m_t1:fgui.Transition;
+	public m_t2:fgui.Transition;
 
 	public static URL:string = "ui://mjmru4i2bh9z0";
 
@@ -47,5 +48,6 @@ export default class UI_Egg extends fgui.GComponent {
 		this.m_txtAttribute = <fgui.GTextField>(this.getChildAt(12));
 		this.m_t0 = this.getTransitionAt(0);
 		this.m_t1 = this.getTransitionAt(1);
+		this.m_t2 = this.getTransitionAt(2);
 	}
 }

assets/script/ui/Hall/UI_Hall.ts

@@ -20,7 +20,6 @@ export default class UI_Hall extends fgui.GComponent {
 	public m_n29:fgui.GImage;
 	public m_n30:fgui.GImage;
 	public m_levelLabel:fgui.GTextField;
-	public m_n31:fgui.GGroup;
 	public m_t0:fgui.Transition;
 	public m_t2:fgui.Transition;
 
@@ -49,7 +48,6 @@ export default class UI_Hall extends fgui.GComponent {
 		this.m_n29 = <fgui.GImage>(this.getChildAt(11));
 		this.m_n30 = <fgui.GImage>(this.getChildAt(12));
 		this.m_levelLabel = <fgui.GTextField>(this.getChildAt(13));
-		this.m_n31 = <fgui.GGroup>(this.getChildAt(14));
 		this.m_t0 = this.getTransitionAt(0);
 		this.m_t2 = this.getTransitionAt(1);
 	}

assets/script/ui/WXSExport/UI_Export002.ts

@@ -5,10 +5,10 @@
 export default class UI_Export002 extends fgui.GComponent {
 
 	public m_c1:fgui.Controller;
-	public m_n9:fgui.GGraph;
-	public m_n10:fgui.GGraph;
-	public m_n11:fgui.GGraph;
-	public m_n12:fgui.GGraph;
+	public m_n5:fgui.GGraph;
+	public m_n1:fgui.GGraph;
+	public m_n3:fgui.GGraph;
+	public m_n2:fgui.GGraph;
 	public m_txtName:fgui.GTextField;
 	public m_groupIcon:fgui.GLoader;
 	public m_n7:fgui.GImage;
@@ -27,10 +27,10 @@ export default class UI_Export002 extends fgui.GComponent {
 
 	protected onConstruct(): void {
 		this.m_c1 = this.getControllerAt(0);
-		this.m_n9 = <fgui.GGraph>(this.getChildAt(0));
-		this.m_n10 = <fgui.GGraph>(this.getChildAt(1));
-		this.m_n11 = <fgui.GGraph>(this.getChildAt(2));
-		this.m_n12 = <fgui.GGraph>(this.getChildAt(3));
+		this.m_n5 = <fgui.GGraph>(this.getChildAt(0));
+		this.m_n1 = <fgui.GGraph>(this.getChildAt(1));
+		this.m_n3 = <fgui.GGraph>(this.getChildAt(2));
+		this.m_n2 = <fgui.GGraph>(this.getChildAt(3));
 		this.m_txtName = <fgui.GTextField>(this.getChildAt(4));
 		this.m_groupIcon = <fgui.GLoader>(this.getChildAt(5));
 		this.m_n7 = <fgui.GImage>(this.getChildAt(6));

assets/script/ui/WXSExport/UI_WX_S_02.ts

@@ -1,19 +1,19 @@
 /** This is an automatically generated class by FairyGUI. Please do not modify it. **/
 
 import UI_ExportBg from "./UI_ExportBg";
-import UI_btnRe from "./UI_btnRe";
 import UI_btnComeOn from "./UI_btnComeOn";
+import UI_btnRe from "./UI_btnRe";
 
 export default class UI_WX_S_02 extends fgui.GComponent {
 
 	public m_n8:UI_ExportBg;
 	public m_n9:fgui.GGraph;
+	public m_listIcon:fgui.GList;
 	public m_n13:fgui.GTextField;
+	public m_btnContinue:UI_btnComeOn;
 	public m_n17:fgui.GGraph;
 	public m_listA01:fgui.GList;
-	public m_listB:fgui.GList;
 	public m_btnBack:UI_btnRe;
-	public m_btnContinue:UI_btnComeOn;
 
 	public static URL:string = "ui://hse3vywnpgpub";
 
@@ -28,11 +28,11 @@ export default class UI_WX_S_02 extends fgui.GComponent {
 	protected onConstruct(): void {
 		this.m_n8 = <UI_ExportBg>(this.getChildAt(0));
 		this.m_n9 = <fgui.GGraph>(this.getChildAt(1));
-		this.m_n13 = <fgui.GTextField>(this.getChildAt(2));
-		this.m_n17 = <fgui.GGraph>(this.getChildAt(3));
-		this.m_listA01 = <fgui.GList>(this.getChildAt(4));
-		this.m_listB = <fgui.GList>(this.getChildAt(5));
-		this.m_btnBack = <UI_btnRe>(this.getChildAt(6));
-		this.m_btnContinue = <UI_btnComeOn>(this.getChildAt(7));
+		this.m_listIcon = <fgui.GList>(this.getChildAt(2));
+		this.m_n13 = <fgui.GTextField>(this.getChildAt(3));
+		this.m_btnContinue = <UI_btnComeOn>(this.getChildAt(4));
+		this.m_n17 = <fgui.GGraph>(this.getChildAt(5));
+		this.m_listA01 = <fgui.GList>(this.getChildAt(6));
+		this.m_btnBack = <UI_btnRe>(this.getChildAt(7));
 	}
 }