diff --git a/lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua index a262132d..7359c4b6 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua @@ -1,7 +1,8 @@ local HuCardImg = {} -HuCardImg[15] = {"tile_cs_tianhu"} -HuCardImg[16] = {"tile_cs_dihu"} -HuCardImg[17] = {"tile_cs_pinghu"} +HuCardImg[14] = { "tile_cs_deguo", "tile_cs_shisanlan" } +HuCardImg[15] = { "tile_cs_qxshisanlan", "tile_cs_deguo" } +HuCardImg[16] = { "tile_cs_dihu" } +HuCardImg[17] = { "tile_cs_pinghu" } -return HuCardImg \ No newline at end of file +return HuCardImg diff --git a/lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua index d46d1513..e9a4daa1 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua @@ -1,13 +1,15 @@ local HuCardImg = {} -HuCardImg[6] = {"tile_cs_qidui"} -HuCardImg[7] = {"tile_cs_tianhu"} -HuCardImg[8] = {"tile_cs_dihu"} -HuCardImg[9] = {"tile_cs_pinghu"} -HuCardImg[10] = {"tile_cs_deguo"} -HuCardImg[11] = {"tile_cs_qiangganghu"} -HuCardImg[12] = {"tile_cs_gangshanghua"} -HuCardImg[13] = {"tile_cs_quanqiuren"} +HuCardImg[6] = { "tile_cs_qidui" } +HuCardImg[7] = { "tile_cs_tianhu" } +HuCardImg[8] = { "tile_cs_dihu" } +HuCardImg[9] = { "tile_cs_pinghu" } +HuCardImg[10] = { "tile_cs_deguo" } +HuCardImg[11] = { "tile_cs_qiangganghu" } +HuCardImg[12] = { "tile_cs_gangshanghua" } +HuCardImg[13] = { "tile_cs_quanqiuren" } +HuCardImg[14] = { "tile_cs_deguo", "tile_cs_shisanlan" } +HuCardImg[15] = { "tile_cs_qxshisanlan", "tile_cs_deguo" } -return HuCardImg \ No newline at end of file +return HuCardImg diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3 b/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3 new file mode 100644 index 00000000..6c02582c Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3 differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta new file mode 100644 index 00000000..fec06ee3 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/main_majiang/sound/gameover.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0a6197aef1ea57047b4b145a80ecde0a +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: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he14.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he14.mp3 index c8848d6f..dfa4595a 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he14.mp3 and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he14.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he15.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he15.mp3 index b05698b7..aa74fe27 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he15.mp3 and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/he15.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he14.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he14.mp3 index 19173fe4..ec20f8ed 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he14.mp3 and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he14.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he15.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he15.mp3 index e55882c1..e5825a58 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he15.mp3 and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/man/he15.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he14.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he14.mp3 index c8848d6f..dfa4595a 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he14.mp3 and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he14.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he15.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he15.mp3 index b05698b7..aa74fe27 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he15.mp3 and b/wb_unity_pro/Assets/ART/extend/majiang/jinxi/sound/woman/he15.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he14.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he14.mp3 new file mode 100644 index 00000000..dfa4595a Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he14.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he14.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he14.mp3.meta new file mode 100644 index 00000000..de957958 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he14.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b0c5696edf111594ca934df82900a4e4 +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: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he15.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he15.mp3 new file mode 100644 index 00000000..aa74fe27 Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he15.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he15.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he15.mp3.meta new file mode 100644 index 00000000..4c17fc35 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/he15.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 029e52c3cd9154041aa22161f42c24ce +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: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he14.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he14.mp3 new file mode 100644 index 00000000..ec20f8ed Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he14.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he14.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he14.mp3.meta new file mode 100644 index 00000000..a1c1c194 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he14.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 55772039a6359fe40a171221c7e25435 +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: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he15.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he15.mp3 new file mode 100644 index 00000000..e5825a58 Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he15.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he15.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he15.mp3.meta new file mode 100644 index 00000000..35235b7f --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/man/he15.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4580d0a3ef29a954fbe51ef59b97ff06 +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: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he14.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he14.mp3 new file mode 100644 index 00000000..dfa4595a Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he14.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he14.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he14.mp3.meta new file mode 100644 index 00000000..4bd815c2 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he14.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a3fb778ffbd52c4409bcae51e37e688e +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: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he15.mp3 b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he15.mp3 new file mode 100644 index 00000000..aa74fe27 Binary files /dev/null and b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he15.mp3 differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he15.mp3.meta b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he15.mp3.meta new file mode 100644 index 00000000..78f41832 --- /dev/null +++ b/wb_unity_pro/Assets/ART/extend/majiang/lichuan/sound/woman/he15.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 335654ee20dc06b40b100d8eb436ab27 +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: + assetBundleVariant: