diff --git a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
index 504017b9..8aaf92a0 100644
--- a/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
+++ b/fk101/lua_probject/extend_project/extend/majiang/changsha/EXMainView.lua
@@ -428,7 +428,7 @@ function M:EventInit()
end)
self._view:AddChild(tip_qishou)
tip_qishou:Center()
- self._com_qishou = tip_qishou
+ self._com_qishou = tip_qishou
end)
_gamectr:AddEventListener(CS_GameEvent.EvnetQSAction, function(...)
@@ -766,17 +766,54 @@ function M:__QsHu(data)
local pNode = info._mask_liangpai
self.QSHList={}
coroutine.start(function()
+ -- 获取父节点的中心坐标,作为基准点
+ local centerX = pNode.width * 0.5
+ local centerY = pNode.height * 0.5
+
+ -- 计算所有提示框的总宽度,以便整体居中显示
+ local totalWidth = 0
+ local tipsTemp = {} -- 临时存储创建的对象,用于第二次遍历设置位置
+
+ -- 第一次遍历:创建对象并计算总宽度
for i, v in pairs(types) do
local show_tip = UIPackage.CreateObject("Extend_MJ_ChangSha", "Tip_qishou")
show_tip:GetChild("icon").url = "ui://Extend_MJ_ChangSha/qs" .. i
show_tip:GetChild("num").text = v
+
+ -- 先添加到父节点,确保 width/height 可用(如果UI包中已定义大小则可直接用,否则需添加后获取)
pNode:AddChild(show_tip)
- show_tip:Center()
- table.insert(self.QSHList,show_tip)
- --coroutine.wait(4)
- --show_tip:Dispose()
+
+ table.insert(tipsTemp, {obj = show_tip, type = i, value = v})
+ totalWidth = totalWidth + show_tip.width
end
- end)
+
+ -- 定义间距
+ local spacing = 10 -- 两个提示框之间的间隙
+
+ -- 计算起始 X 坐标,使整排提示框在父节点中水平居中
+ -- 起始X = 中心X - (总宽度 + 总间距) / 2
+ local totalSpacing = spacing * (#tipsTemp - 1)
+ local startX = centerX - (totalWidth + totalSpacing) * 0.5
+
+ local currentX = startX
+
+ -- 第二次遍历:设置每个提示框的具体位置
+ for k, data in ipairs(tipsTemp) do
+ local show_tip = data.obj
+
+ -- 设置 Y 轴位置:保持在父节点垂直居中 (或者你可以固定一个值,如 centerY - show_tip.height * 0.5)
+ show_tip.y = centerY - show_tip.height * 0.5
+
+ -- 设置 X 轴位置:从 startX 开始,依次累加宽度和间距
+ show_tip.x = currentX
+
+ -- 更新下一个对象的 X 坐标
+ currentX = currentX + show_tip.width + spacing
+
+ -- 加入销毁列表
+ table.insert(self.QSHList, show_tip)
+ end
+ end)
table.sort(allShowCards, ViewUtil.HandCardSort)
info:UpdateHandCard(false, false, allShowCards)
coroutine.start(function()
diff --git a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info
index 71b90956..2a3d234c 100644
--- a/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info
+++ b/fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmky.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n34_hp0b": {
+ "hidden": true
+ },
"n104_ni5n": {
"hidden": true
},
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index 1e0e119c..96649bff 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/fk101/wb_new_ui/.objs/workspace.json
@@ -8,6 +8,100 @@
"ui://egnzysm7ffp36o",
"ui://egnzysm7ffp370",
"ui://442j0uepygxga",
+ "ui://2zlli80mr6cyce9",
+ "ui://3z9lj55vjokmky",
+ "ui://v0j9abjygq7mgo",
+ "ui://4skil1l6by4o1i2",
+ "ui://27vd145bpgy941",
+ "ui://27vd145bko559b",
+ "ui://27vd145beeqmcgu",
+ "ui://27vd145beeqmcgv",
+ "ui://27vd145bhxjc1ub",
+ "ui://l0ds4ys6h1uu2p",
+ "ui://l0ds4ys6h1uu26",
+ "ui://l0ds4ys6e54q2t",
+ "ui://z1qthxavlrfi0",
+ "ui://0khx14are0py2",
+ "ui://3z9lj55vjokm7l",
+ "ui://3n2top74kpmgp5",
+ "ui://c7j2rnvqtpf08x",
+ "ui://fnuxqeflkllg1x",
+ "ui://egnzysm7ffp3b2",
+ "ui://v2hilfzbgq7me6",
+ "ui://ypulwxjhl9mn37",
+ "ui://k15boclkl9mn37",
+ "ui://oubpz2r2ofil8x",
+ "ui://442j0uepdafga8",
+ "ui://3n2top74kpmgmh",
+ "ui://9n9stu2eprgzf0",
+ "ui://awernf6xbazq90",
+ "ui://qpsoxvaiprgzf0",
+ "ui://b8jloj2qprgzf0",
+ "ui://3op8sm5eu86s3p",
+ "ui://niy3ldiwl9mn37",
+ "ui://niy3ldiwl9mn34",
+ "ui://niy3ldiwl9mn31",
+ "ui://27vd145be54q3v",
+ "ui://niy3ldiwl9mn2s",
+ "ui://3z9lj55vjokmwr",
+ "ui://v0j9abjygq7ms2",
+ "ui://v6yvqp7wf55qwa",
+ "ui://35sf1c1fr05e8u",
+ "ui://35sf1c1fr05e9m",
+ "ui://35sf1c1fr05eae",
+ "ui://yzaioi79f55qwa",
+ "ui://c7j2rnvqtpf093",
+ "ui://c7j2rnvqtpf0w",
+ "ui://3n2top74kpmgbc",
+ "ui://3z9lj55vjokm8k",
+ "ui://3z9lj55vjokm8x",
+ "ui://3z9lj55vjokm8q",
+ "ui://3z9lj55vjokm8p",
+ "ui://c7j2rnvqtpf06k",
+ "ui://c7j2rnvqtpf08t",
+ "ui://c7j2rnvqtpf06p",
+ "ui://c7j2rnvqtpf08q",
+ "ui://3z9lj55vjokm8j",
+ "ui://v2hilfzbgq7mh7",
+ "ui://oubpz2r2i2djgl",
+ "ui://3n2top74kpmgp4",
+ "ui://m7iejg46tqi8hwa",
+ "ui://27vd145bp2bz6s",
+ "ui://27vd145bhxjc7i4q",
+ "ui://27vd145b7jqkcdl",
+ "ui://27vd145blwcl28",
+ "ui://27vd145bimywcd5",
+ "ui://27vd145bofsx1e",
+ "ui://27vd145bep9w7ik3",
+ "ui://27vd145bcvc87i5t",
+ "ui://27vd145bzwbu1a",
+ "ui://27vd145bhznkce2",
+ "ui://27vd145blprqce1",
+ "ui://27vd145bh1uu30",
+ "ui://27vd145bnosez",
+ "ui://27vd145bcjli6",
+ "ui://m7iejg46kwi0hlb",
+ "ui://m7iejg46jr1l7i3c",
+ "ui://3n2top74kpmgoa",
+ "ui://3n2top74kpmgog",
+ "ui://9n9stu2eprgzgj",
+ "ui://awernf6xbazqbp",
+ "ui://b8jloj2qprgzgj",
+ "ui://2d9xdj6zl0lzb",
+ "ui://2d9xdj6zl0lzo",
+ "ui://lx6k641gajzhoe",
+ "ui://5cdldr01qaqfdr",
+ "ui://yzaioi79wyal8n",
+ "ui://v6yvqp7wwyal8n",
+ "ui://35sf1c1fr05ed8",
+ "ui://qpsoxvaiprgzgj",
+ "ui://3z9lj55vjokm8c",
+ "ui://v0j9abjygq7m8f",
+ "ui://4skil1l6ms5spy",
+ "ui://4skil1l6r6qo1kc",
+ "ui://5cdldr01qaqf9c",
+ "ui://5cdldr01qaqfa4",
+ "ui://5cdldr01qaqfaw",
"ui://5cdldr01qaqf2c",
"ui://niy3ldiwl9mn14",
"ui://niy3ldiwl9mn18",
@@ -19,35 +113,11 @@
"auxline1": true,
"canvasColor": 10066329,
"auxline2": true,
- "doc.activeDoc": "ui://442j0uepygxga",
+ "doc.activeDoc": "ui://3z9lj55vjokm7l",
"libview.twoColumn": false,
"libview.expandedNodes": [
- "egnzysm7",
+ "0khx14ar",
"/",
- "egnzysm7",
- "/component/",
- "egnzysm7",
- "/component/EPCDWHZMui/",
- "egnzysm7",
- "/component/clearing/",
- "egnzysm7",
- "/component/clearing/image/",
- "442j0uep",
- "/",
- "442j0uep",
- "/component/",
- "442j0uep",
- "/component/EPRHZMui/",
- "442j0uep",
- "/component/clearing/",
- "niy3ldiw",
- "/",
- "niy3ldiw",
- "/component/",
- "niy3ldiw",
- "/component/EPYYWHZMui/",
- "niy3ldiw",
- "/component/clearing/",
"3z9lj55v",
"/",
"3z9lj55v",
diff --git a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml
index 2634d09f..4f9c2d35 100644
--- a/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml
+++ b/fk101/wb_new_ui/assets/Common/Win_ConnectTip.xml
@@ -1,16 +1,16 @@
-
+
-
-
+
+
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml b/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml
index 64b8bb27..e95c10d3 100644
--- a/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml
+++ b/fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml
@@ -22,13 +22,15 @@
-
+
+
-
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/component/head/HeadNameBG.xml b/fk101/wb_new_ui/assets/Common/component/head/HeadNameBG.xml
index 5d48e1a2..0cbd8443 100644
--- a/fk101/wb_new_ui/assets/Common/component/head/HeadNameBG.xml
+++ b/fk101/wb_new_ui/assets/Common/component/head/HeadNameBG.xml
@@ -1,9 +1,9 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/qishou_hu/pop_tip_qishou.xml b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/qishou_hu/pop_tip_qishou.xml
index f0e0820d..704f741c 100644
--- a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/qishou_hu/pop_tip_qishou.xml
+++ b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/qishou_hu/pop_tip_qishou.xml
@@ -4,11 +4,7 @@
-
-
-
-
-
+
diff --git a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
index e4bf07c2..0483a7c7 100644
--- a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
+++ b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml
@@ -877,7 +877,7 @@
-
+
@@ -1041,6 +1041,7 @@
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml
index ca9d32dc..74f89c16 100644
--- a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml
+++ b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml
@@ -1,16 +1,16 @@
-
+
-
-
-
-
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider1.xml b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider1.xml
index 5dfdd71f..8e67bfa9 100644
--- a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider1.xml
+++ b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider1.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider2.xml b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider2.xml
index b80d2932..e390c2c0 100644
--- a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider2.xml
+++ b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/component/Slider2.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/images/setting/Rectangle 2886.png b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/images/setting/Rectangle 2886.png
new file mode 100644
index 00000000..4a971b70
Binary files /dev/null and b/fk101/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/images/setting/Rectangle 2886.png differ
diff --git a/fk101/wb_new_ui/assets/Hotupdate/Version.xml b/fk101/wb_new_ui/assets/Hotupdate/Version.xml
index d3a50aa7..6516bd51 100644
--- a/fk101/wb_new_ui/assets/Hotupdate/Version.xml
+++ b/fk101/wb_new_ui/assets/Hotupdate/Version.xml
@@ -1,30 +1,30 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml b/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
index 8fdf49db..99e43efa 100644
--- a/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
+++ b/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
@@ -22,7 +22,7 @@
-
+
@@ -39,7 +39,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml b/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml
index 102903d9..fbc9779d 100644
--- a/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml
+++ b/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/HeadNameBG(1).xml
@@ -3,14 +3,14 @@
-
+
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml b/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml
index 1c9939f5..902f9e3c 100644
--- a/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml
+++ b/fk101/wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml
@@ -1,32 +1,32 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml b/fk101/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml
index 91940398..6d363b0e 100644
--- a/fk101/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml
+++ b/fk101/wb_new_ui/assets/Main_Majiang/component/setting_new/SettingWindow2.xml
@@ -1,6 +1,6 @@
-
+
@@ -14,21 +14,21 @@
-
-
-
+
+
+
-
+
-
+
-
+
diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
index 8d13a75c..e1f52181 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes
index 94cca1b8..5b2db200 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/login/ui/Login_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png
index c4265fae..392b26f3 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png.meta
index efe0e89c..4465b404 100644
--- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png.meta
+++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
-guid: 9689342f0f765c746ab86cb294e0a558
+guid: 843cb52ec8d85f242abbf005475f66f7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 0
+ enableMipMap: 1
+ sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -34,10 +34,10 @@ TextureImporter:
filterMode: -1
aniso: -1
mipBias: -100
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
@@ -48,7 +48,7 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 0
+ alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
@@ -57,56 +57,20 @@ TextureImporter:
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
- applyGammaDecoding: 1
+ applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 0
+ textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: iPhone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -124,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_majiang/de3462a6bae19a6c7308e43e0192028f
+ assetBundleName:
assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png
new file mode 100644
index 00000000..c4265fae
Binary files /dev/null and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png.meta
new file mode 100644
index 00000000..efe0e89c
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/bg/bg4.png.meta
@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 9689342f0f765c746ab86cb294e0a558
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 0
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 0
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName: base/main_majiang/de3462a6bae19a6c7308e43e0192028f
+ assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index 1ad21315..aeb6e759 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png
index d931a891..c310e232 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png and b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png.meta
index 93061baa..990135a1 100644
--- a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png.meta
+++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_1.png.meta
@@ -1,12 +1,12 @@
fileFormatVersion: 2
-guid: ed35a1fc40bc56a4c87656ebad9206cb
+guid: 2f90aae48f410214b8a76ff3c11c5abb
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,7 +37,7 @@ TextureImporter:
wrapU: -1
wrapV: -1
wrapW: -1
- nPOTScale: 0
+ nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
@@ -57,56 +57,20 @@ TextureImporter:
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
- applyGammaDecoding: 1
+ applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 0
+ textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: iPhone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -124,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_zipai/dc2eb56e61dc14aa00c23ba6cd49c4f6
+ assetBundleName:
assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_4.png b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_4.png
new file mode 100644
index 00000000..d931a891
Binary files /dev/null and b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_4.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_4.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_4.png.meta
new file mode 100644
index 00000000..93061baa
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/bg/bg_4.png.meta
@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: ed35a1fc40bc56a4c87656ebad9206cb
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName: base/main_zipai/dc2eb56e61dc14aa00c23ba6cd49c4f6
+ assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png
index a3b892f1..f4470bfe 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png and b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png.meta
index 00c29773..93fb29f0 100644
--- a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png.meta
+++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png.meta
@@ -1,12 +1,12 @@
fileFormatVersion: 2
-guid: a6e64fb6cf4a704469654bd782f02234
+guid: da94c875c69da0b48b40bad8097aff65
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -37,7 +37,7 @@ TextureImporter:
wrapU: -1
wrapV: -1
wrapW: -1
- nPOTScale: 0
+ nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
@@ -57,56 +57,20 @@ TextureImporter:
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
- applyGammaDecoding: 1
+ applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 0
+ textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: iPhone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -124,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: base/main_zipaimajiang/5e7576133a2faa8ebd62dcf50daf15d5
+ assetBundleName:
assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_4.png b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_4.png
new file mode 100644
index 00000000..a3b892f1
Binary files /dev/null and b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_4.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_4.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_4.png.meta
new file mode 100644
index 00000000..00c29773
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_4.png.meta
@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: a6e64fb6cf4a704469654bd782f02234
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName: base/main_zipaimajiang/5e7576133a2faa8ebd62dcf50daf15d5
+ assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png
index bb25b5ef..f4470bfe 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png.meta
index ba9d1e16..9cb851a4 100644
--- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png.meta
+++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg1.png.meta
@@ -1,13 +1,13 @@
fileFormatVersion: 2
-guid: ca1023f22b55ce74eb95a7010d716600
+guid: 1b5ce34acc3ba5b4cbc7d9eed067f869
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 0
+ enableMipMap: 1
+ sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -34,10 +34,10 @@ TextureImporter:
filterMode: -1
aniso: -1
mipBias: -100
- wrapU: 1
- wrapV: 1
- wrapW: 1
- nPOTScale: 0
+ wrapU: -1
+ wrapV: -1
+ wrapW: -1
+ nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
@@ -48,7 +48,7 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 0
+ alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
@@ -57,56 +57,20 @@ TextureImporter:
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
- applyGammaDecoding: 1
+ applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
- textureCompression: 0
+ textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: iPhone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 0
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 1
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@@ -124,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
- assetBundleName: extend/poker/runfast/c1a3cd841518fe15b4bf8fc5591293e0
+ assetBundleName:
assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg4.png b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg4.png
new file mode 100644
index 00000000..bb25b5ef
Binary files /dev/null and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg4.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg4.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg4.png.meta
new file mode 100644
index 00000000..ba9d1e16
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/bg/bg4.png.meta
@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: ca1023f22b55ce74eb95a7010d716600
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 0
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 0
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 1
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName: extend/poker/runfast/c1a3cd841518fe15b4bf8fc5591293e0
+ assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
index bd13f29f..8bde7674 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
index 913be94c..2a9134d5 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png
index 95a97cb9..fda6dabb 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png
index 663191ec..73c61e2f 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png differ
diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
index 1cf5db8a..40e175ad 100644
Binary files a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes
index 75b95150..ca6c7bd1 100644
Binary files a/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes and b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Hotupdate_fui.bytes differ
diff --git a/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials.meta b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials.meta
new file mode 100644
index 00000000..62542881
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e2bb7dd07f4e51143b377e679ad6ed12
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials/Hotupdate_atlas_lwclq.mat b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials/Hotupdate_atlas_lwclq.mat
new file mode 100644
index 00000000..510832e4
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials/Hotupdate_atlas_lwclq.mat
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Hotupdate_atlas_lwclq
+ m_Shader: {fileID: 4800000, guid: 263c97191482b3649ac7bf0810cc4f77, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: 541a5627030fb4145aa1497073c4b30e, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BlendDstFactor: 10
+ - _BlendSrcFactor: 5
+ - _ColorMask: 15
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ m_Colors: []
diff --git a/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials/Hotupdate_atlas_lwclq.mat.meta b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials/Hotupdate_atlas_lwclq.mat.meta
new file mode 100644
index 00000000..9030df9c
--- /dev/null
+++ b/fk101/wb_unity_pro/Assets/Resources/base/embed/ui/Materials/Hotupdate_atlas_lwclq.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed8b42b08e698c14388647a5cb12dba7
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant: