同步

lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua

@@ -389,6 +389,7 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
+        self:PlayMJSound("end_music.mp3")
         self:UnmarkSelfTuoguan()
         self._left_time = 0
         self:UpdateCardBox(0)

lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua

@@ -412,6 +412,7 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
+        self:PlayMJSound("end_music.mp3")
         MJMainView.OnResult1(self, ...)
         --[[
         self._popEvent = false

lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua

@@ -412,6 +412,7 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
+        self:PlayMJSound("end_music.mp3")
         MJMainView.OnResult1(self, ...)
         --[[
         self._popEvent = false

lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua

@@ -483,6 +483,7 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
+        self:PlayMJSound("end_music.mp3")
         self:UnmarkSelfTuoguan()
         self._left_time = 0
         self:UpdateCardBox(0)

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -455,6 +455,7 @@ function M:markOutCards(showTip, data)
 end
 
 function M:OnPlayerEnter(...)
+    self:PlayMJSound("user_enter.mp3")
     MainView.OnPlayerEnter(self, ...)
     local arg = { ... }
     local p = arg[1]
@@ -464,6 +465,8 @@ function M:OnPlayerEnter(...)
 end
 
 function M:OnPlayerReady(...)
+    self:PlayMJSound("user_ready.mp3")
+
     local arg = { ... }
     local p = arg[1]
     local _room = self._room
@@ -555,6 +558,7 @@ function M:CountCardLeftNum(card)
 end
 
 function M:OnPlayerLeave(...)
+    self:PlayMJSound("user_leave.mp3")
     MainView.OnPlayerLeave(self, ...)
     local _room = self._room
     if _room.banker_seat == _room.self_player.seat then

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjyj6yy1ft" designImageAlpha="0">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -16,12 +16,15 @@
     </component>
     <component id="n216_ogwn" name="player_card_info2" src="j6yy1fu" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml" xy="0,0">
       <gearDisplay controller="state" pages="1,3,4"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n217_ogwn" name="player_card_info3" src="inqx13x" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml" xy="0,0" controller="cStie,1">
       <gearDisplay controller="state" pages="1,3,4"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n218_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,0" controller="cStie,1">
       <gearDisplay controller="state" pages="1,3,4"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
@@ -30,7 +33,7 @@
     <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
-    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2004,77" size="153,132">
+    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1888,519|2004,77|1888,519" default="1194,274"/>
       <relation target="" sidePair="middle-middle"/>
@@ -248,7 +251,7 @@
     </component>
     <component id="n280_ogwn" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
     <component id="n281_ogwn" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
       <relation target="" sidePair="right-right"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -17,15 +17,19 @@
     </component>
     <component id="n224_ogwn" name="player_card_info2" src="j6yy1fu" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml" xy="0,0" size="2532,1170">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n225_ogwn" name="player_card_info3" src="inqx13x" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml" xy="0,0" size="2532,1170" controller="cStie,2">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n227_ogwn" name="player_card_info4" src="j6yy1fv" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml" xy="0,0" size="2532,1170">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n226_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,0" size="2532,1170" controller="cStie,2">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
     <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,909" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
@@ -246,7 +250,7 @@
     </component>
     <component id="n352_ogwn" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
     <component id="n353_ogwn" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
       <relation target="" sidePair="right-right"/>

wb_unity_pro/Assets/ART/base/common/sound/woman/chat_10.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: b245dbce11f4f5b4ab6376fb8eb6292b
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: base/common/c9fde7a5c681bd9e4c9c4b43e813d7fd
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/sound/woman/chat_7.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 2c5626d5932e9ac488687fef3dcd1eb3
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: base/common/ad16e3847f1d504ca7e2e98f17cb8db6
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/sound/woman/chat_8.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 01cbcd741fc7f514daafd4504729e70f
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: base/common/440bef7d85dff6698ab1fa9cab6a9973
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/sound/woman/chat_9.mp3.meta

@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 39f79d35cdfe56647b16d9acaff2742b
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 6
-  defaultSettings:
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 1
-    conversionMode: 0
-  platformSettingOverrides: {}
-  forceToMono: 0
-  normalize: 1
-  preloadAudioData: 1
-  loadInBackground: 0
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: base/common/407d4e3425c5cf4fbf00cd16c246fcc5
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/sound/end_music.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d8ddf77d2fe345c438f0ef55bb960541
+guid: 714fad1f942befc47a993d33c0508bfb
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/7a35d9a2cdcda19502755d66b75ed095
+  assetBundleName: base/main_majiang/53c76ac749410d6c85a3ec1742dac7ef
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: base/main_majiang/bc7d7d432fd0ecc21c2ee4f44aa7ceea
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/sound/user_enter.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8b86ea13912daaa4faa9b9f5e2e54532
+guid: e970c4eee9c1afe4e88b87430288ac26
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/99d6f9d1475fa9528ebfb23b5c5aae2c
+  assetBundleName: base/main_majiang/8835cea8debfda87033d6a703b50dc0e
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/sound/user_leave.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7e8432a2da6a6a441b64a4422d9d8e35
+guid: 04b23dd330069cd4b9c90b31bcaa76f3
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/01591d8f5600ef7664b313b2f7315cf9
+  assetBundleName: base/main_majiang/56742f86b0226e8b7e8634a384ad064a
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/sound/user_ready.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a8366000285dca94eb9ed22c4120fe67
+guid: 0c6cccbbe7ee40747a5af58d3b6130b3
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6
@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/9a7273e71c8e1f14d6bbfe9dce34a085
+  assetBundleName: base/main_majiang/412bcb3f0a4743c8750680ffbb65585e
   assetBundleVariant: 

wb_unity_pro/ProjectSettings/GraphicsSettings.asset

@@ -39,7 +39,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

wb_unity_pro/ProjectSettings/ProjectSettings.asset

@@ -179,7 +179,7 @@ PlayerSettings:
     iPhone: 1
   AndroidBundleVersionCode: 12
   AndroidMinSdkVersion: 22
-  AndroidTargetSdkVersion: 26
+  AndroidTargetSdkVersion: 32
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 0
@@ -787,7 +787,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 0
+    Android: 1
     Standalone: 1
     iPhone: 1
   il2cppCompilerConfiguration: {}