WeiTao 4 jaren geleden
bovenliggende
commit
2c6e3e8979

+ 2 - 2
.objs/metas/1z72c6n3/ttjr0.info

@@ -3,10 +3,10 @@
 		"n28_z070": {
 			"locked": true
 		},
-		"n29_z070": {
+		"n30_z070": {
 			"locked": true
 		},
-		"n30_z070": {
+		"n29_z070": {
 			"locked": true
 		}
 	}

+ 10 - 7
.objs/workspace.json

@@ -3,19 +3,22 @@
 	"libview.expandedNodes": [
 		"mjmru4i2",
 		"/",
+		"1z72c6n3",
+		"/",
 		"hse3vywn",
 		"/",
 		"hse3vywn",
 		"/Component/"
 	],
-	"libview.currentGroup": "",
-	"canvasColor": 10066329,
-	"libview.twoColumn": false,
+	"doc.activeDoc": "ui://1z72c6n3ttjr0",
+	"libview.firstColumnWidth": 283,
 	"doc.openedDocs": [
-		"ui://mjmru4i2bh9z0"
+		"ui://mjmru4i2bh9z0",
+		"ui://1z72c6n3ttjr0"
 	],
 	"auxline1": true,
-	"libview.firstColumnWidth": 283,
-	"doc.activeDoc": "ui://mjmru4i2bh9z0",
-	"auxline2": true
+	"auxline2": true,
+	"libview.twoColumn": false,
+	"libview.currentGroup": "",
+	"canvasColor": 10066329
 }

+ 2 - 3
assets/Egg/Egg.xml

@@ -46,8 +46,7 @@
     <item time="48" type="Alpha" target="n42_qxop" tween="true" startValue="0.5" endValue="1" duration="48"/>
   </transition>
   <transition name="t2" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="XY" target="n44_qxop" value="351,518,0.468,0.388"/>
-    <item time="72" type="XY" target="n44_qxop" value="351,561,0.468,0.421"/>
-    <item time="144" type="XY" target="n44_qxop" value="351,518,0.468,0.388"/>
+    <item time="0" type="XY" target="n44_qxop" tween="true" startValue="-,518,0.468,0.388" endValue="-,561,0.468,0.421" duration="72"/>
+    <item time="72" type="XY" target="n44_qxop" tween="true" startValue="-,561,0.468,0.421" endValue="-,518,0.468,0.388" duration="72"/>
   </transition>
 </component>

+ 1 - 1
assets/GameBasicsUI/package.xml

@@ -13,5 +13,5 @@
     <image id="qxop20" name="FC_btn_04.png" path="/Images/" exported="true" scale="9grid" scale9grid="47,17,8,27" smoothing="false"/>
     <image id="qxopk" name="FC_UI_01.png" path="/Images/" exported="true"/>
   </resources>
-  <publish name="GameBasicsUI" path="D:\cocos\StarRacing\StarRacingClient\assets\res\mainPackage\ui" packageCount="2" genCode="true"/>
+  <publish name="GameBasicsUI" path="D:\work\StarRacingClient\assets\res\mainPackage\ui" packageCount="2" genCode="true"/>
 </packageDescription>

+ 5 - 3
assets/Hall/Hall.xml

@@ -11,10 +11,10 @@
       <relation target="" sidePair="width-width,top-top"/>
     </image>
     <component id="n3_ba30" name="btnMore" src="ba304" fileName="Component/btnMore.xml" xy="234,942" pivot="0.5,0.5">
-      <relation target="" sidePair="center-center%,bottom-bottom"/>
+      <relation target="" sidePair="height-height%,center-center%"/>
     </component>
     <component id="n8_ba30" name="n8" src="ba307" fileName="Component/btnH01.xml" xy="245,863" pivot="0.5,0.5">
-      <relation target="" sidePair="center-center%,bottom-bottom"/>
+      <relation target="" sidePair="center-center%,middle-middle%"/>
     </component>
     <image id="n24_qxop" name="n24" src="w49y1o" fileName="Images/UI_18.png" pkg="191ozicn" xy="157,-49" pivot="0.5,1" size="438,114" rotation="180" blend="add"/>
     <image id="n21_qxop" name="n21" src="qxop1x" fileName="Images/FC_UI_03.png" pkg="191ozicn" xy="19,251" size="712,563" group="n31_z070"/>
@@ -25,7 +25,9 @@
     <image id="n29_z070" name="n29" src="z070q" fileName="Images/FC_UI_06.png" xy="120,283" group="n31_z070"/>
     <image id="n30_z070" name="n30" src="z070p" fileName="Images/FC_txt_02.png" xy="284,292" group="n31_z070"/>
     <text id="n36_z070" name="levelLabel" xy="220,701" size="197,49" group="n31_z070" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#1d1e59" strokeSize="2" text="第20关"/>
-    <group id="n31_z070" name="n31" xy="19,251" size="712,563"/>
+    <group id="n31_z070" name="n31" xy="19,251" size="712,563" advanced="true">
+      <relation target="" sidePair="center-center%,middle-middle%"/>
+    </group>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Scale" target="n3_ba30" tween="true" startValue="1,1" endValue="1.1,1.1" duration="24"/>

+ 1 - 1
assets/Hall/package.xml

@@ -11,5 +11,5 @@
     <image id="z070q" name="FC_UI_06.png" path="/Images/"/>
     <image id="z070r" name="FC_txt_03.png" path="/Images/"/>
   </resources>
-  <publish name="Hall" path="D:\cocos\StarRacing\StarRacingClient\assets\res\mainPackage\ui" packageCount="2" genCode="true"/>
+  <publish name="Hall" path="D:\work\StarRacingClient\assets\res\mainPackage\ui" packageCount="2" genCode="true"/>
 </packageDescription>

+ 1 - 1
assets/LoadingView/package.xml

@@ -7,5 +7,5 @@
     <image id="ba303" name="UI_txt_10.png" path="/Images/" exported="true"/>
     <image id="qxop5" name="FC_bg_01.png" path="/Images/" exported="true" scale="9grid" scale9grid="17,12,34,38" gridTile="28" qualityOption="source" smoothing="false"/>
   </resources>
-  <publish name="LoadingView" path="D:\cocos\StarRacing\StarRacingClient\assets\resources\loadingViews" packageCount="2" genCode="true"/>
+  <publish name="LoadingView" path="D:\work\StarRacingClient\assets\resources\loadingViews" packageCount="2" genCode="true"/>
 </packageDescription>

+ 1 - 3
assets/WXSExport/WX_S_01.xml

@@ -33,8 +33,6 @@
     <component id="n14_hoy1" name="btnCll" src="pgpu4" fileName="Component/btnCll.xml" xy="651,92" group="n11_hoy1">
       <relation target="n10_hoy1" sidePair="middle-middle%,right-right%"/>
     </component>
-    <group id="n11_hoy1" name="n11" xy="47,86" size="656,1160" advanced="true">
-      <relation target="" sidePair="center-center%,middle-middle%"/>
-    </group>
+    <group id="n11_hoy1" name="n11" xy="47,86" size="656,1160" advanced="true"/>
   </displayList>
 </component>

+ 4 - 3
settings/Publish.json

@@ -1,12 +1,13 @@
 {
 	"atlasSetting":{
 		"paging":true,
-		"sizeOption":"pot"
+		"sizeOption":"pot",
+		"trimImage":true
 	},
 	"binaryFormat":true,
 	"codeGeneration":{
 		"classNamePrefix":"UI_",
-		"codePath":"D:\\cocos\\StarRacing\\StarRacingClient\\assets\\script\\ui",
+		"codePath":"D:\\work\\StarRacingClient\\assets\\script\\ui",
 		"codeType":"",
 		"getMemberByName":false,
 		"ignoreNoname":false,
@@ -16,5 +17,5 @@
 	"compressDesc":true,
 	"fileExtension":"bin",
 	"packageCount":2,
-	"path":"D:\\cocos\\StarRacing\\StarRacingClient\\assets\\res\\ui"
+	"path":"D:\\work\\StarRacingClient\\assets\\res\\ui"
 }