dzduole před 1 měsícem
rodič
revize
c155ff637c
42 změnil soubory, kde provedl 61 přidání a 224 odebrání
  1. 2 1
      art/fgui/.objs/metas/isxx5ak7/kt443qc.info
  2. 2 2
      art/fgui/assets/game/UIGame/component/D2Ball.xml
  3. binární
      art/fgui/assets/game/UIInvitation/asset/tc_hd1_1.png
  4. binární
      art/fgui/assets/game/UIInvitation/asset/tc_hd1_2_1.png
  5. binární
      art/fgui/assets/game/UIInvitation/asset/tc_hd1_6.png
  6. binární
      art/fgui/assets/game/UIInvitation/asset/tc_hd1_7.png
  7. binární
      art/fgui/assets/game/UIInvitation/asset/tc_hd1_8.png
  8. 9 9
      art/fgui/assets/game/UIMain/UIMain.xml
  9. 1 1
      art/fgui/assets/game/package.xml
  10. binární
      client/laya/bin/asset/fgui/game.obj
  11. binární
      client/laya/bin/asset/fgui/game_atlas0.png
  12. binární
      client/laya/bin/asset/fgui/game_atlas0_1.png
  13. binární
      client/laya/bin/asset/fgui/game_atlas0_2.png
  14. binární
      client/laya/bin/asset/fgui/game_atlas0_3.png
  15. binární
      client/laya/bin/asset/sound/mp3/ganfa01.mp3
  16. binární
      client/laya/bin/asset/sound/mp3/ganfa02.mp3
  17. binární
      client/laya/bin/asset/sound/mp3/ganfa03.mp3
  18. binární
      client/laya/bin/asset/sound/mp3/ganfa04.mp3
  19. binární
      client/laya/bin/asset/sound/mp3/ganfa05.mp3
  20. binární
      client/laya/bin/asset/sound/mp3/ganfa06.mp3
  21. binární
      client/laya/bin/asset/sound/mp3/s_bag.mp3
  22. binární
      client/laya/bin/asset/sound/mp3/s_daliy01.mp3
  23. binární
      client/laya/bin/asset/sound/mp3/s_daliy02.mp3
  24. binární
      client/laya/bin/asset/sound/mp3/s_guide.mp3
  25. binární
      client/laya/bin/asset/sound/mp3/s_lose.mp3
  26. binární
      client/laya/bin/asset/sound/mp3/s_main01.mp3
  27. binární
      client/laya/bin/asset/sound/mp3/s_main02.mp3
  28. binární
      client/laya/bin/asset/sound/mp3/s_main03.mp3
  29. binární
      client/laya/bin/asset/sound/mp3/s_main04.mp3
  30. binární
      client/laya/bin/asset/sound/mp3/s_main05.mp3
  31. binární
      client/laya/bin/asset/sound/mp3/s_main06.mp3
  32. binární
      client/laya/bin/asset/sound/mp3/s_main07.mp3
  33. binární
      client/laya/bin/asset/sound/mp3/s_rolate.mp3
  34. binární
      client/laya/bin/asset/sound/mp3/s_shop.mp3
  35. binární
      client/laya/bin/asset/sound/mp3/s_skill.mp3
  36. binární
      client/laya/bin/asset/sound/mp3/s_start.mp3
  37. binární
      client/laya/bin/asset/sound/mp3/s_win.mp3
  38. 2 2
      client/laya/bin/js/bundle.js
  39. 0 0
      client/laya/bin/js/bundle.js.map
  40. 2 2
      client/laya/bin/libs/moyu.js
  41. 42 206
      client/laya/bin/res/json/levelCfg.json
  42. 1 1
      client/laya/src/ui/item/SkillDisplay.ts

+ 2 - 1
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -18,5 +18,6 @@
       "hidden": true
     }
   },
-  "fitScreen": "FitSize"
+  "fitScreen": "FitSize",
+  "adaptiveTest": true
 }

+ 2 - 2
art/fgui/assets/game/UIGame/component/D2Ball.xml

@@ -4,8 +4,8 @@
     <graph id="n1_kt44" name="myIcon" xy="0,0" pivot="0.5,0.5" size="34,34" visible="false" type="eclipse"/>
     <graph id="n2_hkrz" name="inner" xy="14,14" pivot="0.5,0.5" size="6,6" visible="false" type="eclipse"/>
     <image id="n8_jduv" name="n8" src="i4k243q" fileName="UIGame/asset/yy_zs3(1).png" xy="1,1" group="n5_hkrz"/>
-    <text id="n4_hkrz" name="n4" xy="-24,-29" size="84,29" group="n5_hkrz" fontSize="20" color="#ffffff" align="center" vAlign="middle" text="不可击打"/>
-    <group id="n5_hkrz" name="wrongTips" xy="-24,-29" size="84,61" visible="false" advanced="true"/>
+    <text id="n4_hkrz" name="n4" xy="-50,-29" size="134,29" group="n5_hkrz" fontSize="20" color="#ffffff" align="center" vAlign="middle" text="Invalid Target"/>
+    <group id="n5_hkrz" name="wrongTips" xy="-50,-29" size="134,61" visible="false" advanced="true"/>
     <image id="n7_hkrz" name="rightTips" src="hkrz3sm" fileName="UIGame/asset/zt1.png" xy="17,17" pivot="0.5,0.5" anchor="true" size="36,36" visible="false"/>
   </displayList>
   <transition name="breathAni" autoPlayRepeat="-1">

binární
art/fgui/assets/game/UIInvitation/asset/tc_hd1_1.png


binární
art/fgui/assets/game/UIInvitation/asset/tc_hd1_2_1.png


binární
art/fgui/assets/game/UIInvitation/asset/tc_hd1_6.png


binární
art/fgui/assets/game/UIInvitation/asset/tc_hd1_7.png


binární
art/fgui/assets/game/UIInvitation/asset/tc_hd1_8.png


+ 9 - 9
art/fgui/assets/game/UIMain/UIMain.xml

@@ -18,7 +18,9 @@
       <relation target="" sidePair="right-right"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
     </component>
-    <component id="n23_ixm4" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="416,39" size="767,37" controller="c1,1"/>
+    <component id="n23_ixm4" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="567,39" size="767,37" controller="c1,1">
+      <relation target="n10_ixm4" sidePair="right-right%"/>
+    </component>
     <component id="n26_ixm4" name="headNode" src="ixm43xh" fileName="UIMain/component/Component3.xml" xy="97,19"/>
     <component id="n16_ixm4" name="bigMoveBtn" src="n43d3vp" fileName="UIMain/component/dh_zy_wanfa.xml" xy="-184,476" pivot="0.5,0.386" size="340,138" group="n44_ixm4"/>
     <component id="n14_ixm4" name="placeBallBtn" src="n43d3vl" fileName="UIMain/component/dh_zy_ganfa.xml" xy="157,476" size="338,138" group="n44_ixm4"/>
@@ -28,13 +30,11 @@
     <group id="n44_ixm4" name="n44" xy="-184,476" size="1702,138" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1079,106" size="107,96" group="n45_ixm4"/>
-    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="942,106" size="107,96" group="n45_ixm4"/>
-    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="729,121" size="223,96" group="n45_ixm4" controller="c1,0"/>
-    <group id="n45_ixm4" name="n45" xy="729,106" size="457,111" advanced="true">
-      <relation target="" sidePair="left-left%"/>
-      <relation target="n10_ixm4" sidePair=""/>
-      <relation target="n23_ixm4" sidePair=""/>
+    <component id="n34_ixm4" name="signBtn" src="ixm43xu" fileName="UIMain/component/Component11.xml" xy="1227,106" size="107,96" group="n45_ixm4"/>
+    <component id="n35_ixm4" name="drawBtn" src="ixm43xv" fileName="UIMain/component/Component12.xml" xy="1090,106" size="107,96" group="n45_ixm4"/>
+    <component id="n56_mnrs" name="settingNode" src="mnrs42t" fileName="UIMain/component/UISetting.xml" xy="929,121" size="166,96" group="n45_ixm4" controller="c1,0"/>
+    <group id="n45_ixm4" name="n45" xy="929,106" size="405,111" advanced="true">
+      <relation target="n10_ixm4" sidePair="left-right%"/>
     </group>
     <component id="n27_ixm4" name="secretaryBtn" src="ixm43xw" fileName="UIMain/component/Component13.xml" xy="1071,657" size="110,85" group="n46_ixm4"/>
     <component id="n28_ixm4" name="rankBtn" src="ixm43xz" fileName="UIMain/component/Component16.xml" xy="1147,704" size="1,1" group="n46_ixm4"/>
@@ -66,7 +66,7 @@
       <relation target="n13_ixm4" sidePair="left-left,top-top"/>
     </component>
     <component id="n83_jpsz" name="n83" src="jpszv4n9" fileName="_sharecomponent/dh_zuanshi.xml" xy="457,12"/>
-    <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="759,125" scale="0.8,0.8" visible="false">
+    <component id="n84_jpsz" name="n84" src="jpszv4ni" fileName="_sharecomponent/Component141.xml" xy="959,125" scale="0.8,0.8" visible="false">
       <relation target="n45_ixm4" sidePair="middle-middle,left-left"/>
     </component>
   </displayList>

+ 1 - 1
art/fgui/assets/game/package.xml

@@ -5,7 +5,7 @@
     <component id="kt443qd" name="startBtn.xml" path="/UIMain/component/"/>
     <component id="kt443qg" name="UIGame.xml" path="/UIGame/" exported="true"/>
     <component id="kt443qh" name="powerNode.xml" path="/UIGame/component/"/>
-    <component id="kt443qi" name="D2Ball.xml" path="/UIGame/component/" exported="true"/>
+    <component id="kt443qi" name="D2Ball.xml" path="/UIGame/component/" exported="true" favorite="true"/>
     <component id="sdh33ql" name="d3Root.xml" path="/UIGame/component/"/>
     <component id="sdh33qm" name="d2Root.xml" path="/UIGame/component/"/>
     <component id="sdh33qn" name="ballNode.xml" path="/UIGame/component/"/>

binární
client/laya/bin/asset/fgui/game.obj


binární
client/laya/bin/asset/fgui/game_atlas0.png


binární
client/laya/bin/asset/fgui/game_atlas0_1.png


binární
client/laya/bin/asset/fgui/game_atlas0_2.png


binární
client/laya/bin/asset/fgui/game_atlas0_3.png


binární
client/laya/bin/asset/sound/mp3/ganfa01.mp3


binární
client/laya/bin/asset/sound/mp3/ganfa02.mp3


binární
client/laya/bin/asset/sound/mp3/ganfa03.mp3


binární
client/laya/bin/asset/sound/mp3/ganfa04.mp3


binární
client/laya/bin/asset/sound/mp3/ganfa05.mp3


binární
client/laya/bin/asset/sound/mp3/ganfa06.mp3


binární
client/laya/bin/asset/sound/mp3/s_bag.mp3


binární
client/laya/bin/asset/sound/mp3/s_daliy01.mp3


binární
client/laya/bin/asset/sound/mp3/s_daliy02.mp3


binární
client/laya/bin/asset/sound/mp3/s_guide.mp3


binární
client/laya/bin/asset/sound/mp3/s_lose.mp3


binární
client/laya/bin/asset/sound/mp3/s_main01.mp3


binární
client/laya/bin/asset/sound/mp3/s_main02.mp3


binární
client/laya/bin/asset/sound/mp3/s_main03.mp3


binární
client/laya/bin/asset/sound/mp3/s_main04.mp3


binární
client/laya/bin/asset/sound/mp3/s_main05.mp3


binární
client/laya/bin/asset/sound/mp3/s_main06.mp3


binární
client/laya/bin/asset/sound/mp3/s_main07.mp3


binární
client/laya/bin/asset/sound/mp3/s_rolate.mp3


binární
client/laya/bin/asset/sound/mp3/s_shop.mp3


binární
client/laya/bin/asset/sound/mp3/s_skill.mp3


binární
client/laya/bin/asset/sound/mp3/s_start.mp3


binární
client/laya/bin/asset/sound/mp3/s_win.mp3


+ 2 - 2
client/laya/bin/js/bundle.js

@@ -5781,7 +5781,7 @@
         }
         startGame() {
             if (this.data.index == 3) {
-                alert('期待吧');
+                alert('Coming soon!');
                 return;
             }
             xGame.soundMgr.playSound(xGame.common.btnClickStr);
@@ -19057,7 +19057,7 @@
         }
         startGame() {
             if (this.data.index == 3) {
-                alert('期待吧');
+                alert('Coming soon!');
                 return;
             }
             xGame.soundMgr.playSound(xGame.common.btnClickStr);

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 2 - 2
client/laya/bin/libs/moyu.js

@@ -344,8 +344,8 @@
 		}
 		init(e) {
 			if (t.debug = e, this.moyuUser = new a, this.data = new l, this.nativeInfo = new r, this.data.getData(this.myId), this.data.userId.length < 2) {
-				let e = this.getRandStr(15);
-				this.data.headIcon = t.getTagro("headimg/0.jpg"), this.data.userId = "my" + this.myId + e, this.data.nickName = "Player_" + e, this.data.loginCount = 1, this.data.createTime = this.getTime()
+				let e = this.getRandStr(5);
+				this.data.headIcon = t.getTagro("headimg/0.jpg"), this.data.userId = "my" + this.myId + e, this.data.nickName = "player_" + e, this.data.loginCount = 1, this.data.createTime = this.getTime()
 			} else this.data.loginCount++;
 			this.moyuUser.loginCount = this.data.loginCount, this.moyuUser.userId = this.data.userId, this.moyuUser.nickName = this.data.nickName, this.moyuUser.headIcon = this.data.headIcon, this.moyuUser.openId = this.data.openId, this.moyuUser.createTime = this.data.createTime, this.moyuUser.videoCount = [this.data.adScusNum, this.data.adFailNum], this.moyuUser.realName = this.data.realName, this.moyuUser.realCode = this.data.realCode, this.moyuUser.age = this.data.age, this.setGameTime(), this.data.saveData(this.myId)
 		}

+ 42 - 206
client/laya/bin/res/json/levelCfg.json

@@ -1,211 +1,47 @@
 {
 	"1": {
-		"0": {
-			"x": 573,
-			"y": 301,
-			"value": 8
-		},
-		"1": {
-			"x": 607,
-			"y": 301,
-			"value": 8
-		},
-		"2": {
-			"x": 675,
-			"y": 301,
-			"value": 8
-		},
-		"3": {
-			"x": 616,
-			"y": 438,
-			"value": 8
-		},
-		"4": {
-			"x": 607,
-			"y": 471,
-			"value": 8
-		},
-		"5": {
-			"x": 663,
-			"y": 369,
-			"value": 8
-		},
-		"6": {
-			"x": 698,
-			"y": 369,
-			"value": 8
-		},
-		"7": {
-			"x": 732,
-			"y": 368,
-			"value": 8
-		},
-		"8": {
-			"x": 732,
-			"y": 402,
-			"value": 8
-		},
-		"9": {
-			"x": 732,
-			"y": 437,
-			"value": 8
-		},
-		"10": {
-			"x": 732,
-			"y": 472,
-			"value": 8
-		},
-		"11": {
-			"x": 698,
-			"y": 473,
-			"value": 8
-		},
-		"12": {
-			"x": 878,
-			"y": 300,
-			"value": 8
-		},
-		"13": {
-			"x": 844,
-			"y": 300,
-			"value": 8
-		},
-		"14": {
-			"x": 622,
-			"y": 404,
-			"value": 8
-		},
-		"15": {
-			"x": 641,
-			"y": 301,
-			"value": 8
-		},
-		"16": {
-			"x": 709,
-			"y": 301,
-			"value": 8
-		},
-		"17": {
-			"x": 743,
-			"y": 301,
-			"value": 8
-		},
-		"18": {
-			"x": 635,
-			"y": 335,
-			"value": 8
-		},
-		"19": {
-			"x": 629,
-			"y": 369,
-			"value": 8
-		},
-		"20": {
-			"x": 829,
-			"y": 333,
-			"value": 8
-		},
-		"21": {
-			"x": 1009,
-			"y": 336,
-			"value": 8
-		},
-		"22": {
-			"x": 958,
-			"y": 340,
-			"value": 8
-		},
-		"23": {
-			"x": 889,
-			"y": 341,
-			"value": 8
-		},
-		"24": {
-			"x": 923,
-			"y": 340,
-			"value": 8
-		},
-		"25": {
-			"x": 921,
-			"y": 377,
-			"value": 8
-		},
-		"26": {
-			"x": 917,
-			"y": 412,
-			"value": 8
-		},
-		"27": {
-			"x": 913,
-			"y": 446,
-			"value": 8
-		},
-		"28": {
-			"x": 1040,
-			"y": 484,
-			"value": 8
-		},
-		"29": {
-			"x": 872,
-			"y": 480,
-			"value": 8
-		},
-		"30": {
-			"x": 1074,
-			"y": 485,
-			"value": 8
-		},
-		"31": {
-			"x": 906,
-			"y": 480,
-			"value": 8
-		},
-		"32": {
-			"x": 1044,
-			"y": 449,
-			"value": 8
-		},
-		"33": {
-			"x": 1078,
-			"y": 449,
-			"value": 8
-		},
-		"34": {
-			"x": 1089,
-			"y": 410,
-			"value": 8
-		},
-		"35": {
-			"x": 930,
-			"y": 270,
-			"value": 8
-		},
-		"36": {
-			"x": 1014,
-			"y": 299,
-			"value": 8
-		},
-		"37": {
-			"x": 980,
-			"y": 300,
-			"value": 8
-		},
-		"38": {
-			"x": 946,
-			"y": 300,
-			"value": 8
-		},
-		"39": {
-			"x": 912,
-			"y": 300,
-			"value": 8
-		},
-		"40": {
-			"x": 313,
-			"y": 424,
-			"value": 0
-		}
-	},
+  "0": { "x": 573, "y": 301, "value": 8 },
+  "1": { "x": 613, "y": 301, "value": 8 },
+  "2": { "x": 653, "y": 301, "value": 8 },
+  "3": { "x": 693, "y": 301, "value": 8 },
+  "4": { "x": 733, "y": 301, "value": 8 },
+  "5": { "x": 653, "y": 341, "value": 8 },
+  "6": { "x": 653, "y": 381, "value": 8 },
+  "7": { "x": 653, "y": 421, "value": 8 },
+  "8": { "x": 653, "y": 461, "value": 8 },
+  "9": { "x": 573, "y": 501, "value": 8 },
+  "10": { "x": 613, "y": 501, "value": 8 },
+  "11": { "x": 653, "y": 501, "value": 8 },
+  "12": { "x": 693, "y": 501, "value": 8 },
+  "13": { "x": 733, "y": 501, "value": 8 },
+  "14": { "x": 613, "y": 461, "value": 8 },
+  "15": { "x": 693, "y": 461, "value": 8 },
+  "16": { "x": 613, "y": 341, "value": 8 },
+  "17": { "x": 693, "y": 341, "value": 8 },
+  "18": { "x": 593, "y": 341, "value": 8 },
+  "19": { "x": 713, "y": 341, "value": 8 },
+  "20": { "x": 593, "y": 461, "value": 8 },
+  "21": { "x": 713, "y": 461, "value": 8 },
+  "22": { "x": 573, "y": 381, "value": 8 },
+  "23": { "x": 733, "y": 381, "value": 8 },
+  "24": { "x": 613, "y": 381, "value": 8 },
+  "25": { "x": 693, "y": 381, "value": 8 },
+  "26": { "x": 653, "y": 361, "value": 8 },
+  "27": { "x": 653, "y": 401, "value": 8 },
+  "28": { "x": 653, "y": 441, "value": 8 },
+  "29": { "x": 653, "y": 481, "value": 8 },
+  "30": { "x": 633, "y": 301, "value": 8 },
+  "31": { "x": 673, "y": 301, "value": 8 },
+  "32": { "x": 633, "y": 501, "value": 8 },
+  "33": { "x": 673, "y": 501, "value": 8 },
+  "34": { "x": 573, "y": 461, "value": 8 },
+  "35": { "x": 733, "y": 461, "value": 8 },
+  "36": { "x": 573, "y": 341, "value": 8 },
+  "37": { "x": 733, "y": 341, "value": 8 },
+  "38": { "x": 593, "y": 381, "value": 8 },
+  "39": { "x": 713, "y": 381, "value": 8 },
+  "40": { "x": 313, "y": 424, "value": 0 }
+},
 	"2": {
 		"0": {
 			"x": 733,

+ 1 - 1
client/laya/src/ui/item/SkillDisplay.ts

@@ -76,7 +76,7 @@ export default class SkillDisplay {
     startGame() {
         //如果是关公刀法就提示返回
         if (this.data.index == 3) {
-            alert('期待吧')
+            alert('Coming soon!')
             return;
         }
 

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů