解决冲突

lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua

@@ -5,8 +5,8 @@ local RunBeard_ResultView = {}
 local M = RunBeard_ResultView
 
 function RunBeard_ResultView.new(blur_view, index)
-    setmetatable(M, {__index = ResultView})
+    setmetatable(M, { __index = ResultView })
-    local self = setmetatable({}, {__index = M})
+    local self = setmetatable({}, { __index = M })
     self.class = 'RunBeard_ResultView'
     self._currenIndex = 0
     if index ~= 1 then
@@ -15,7 +15,7 @@ function RunBeard_ResultView.new(blur_view, index)
     self._close_zone = false
 
     self:init('ui://Extend_Poker_HeChi/clearing')
-	self.xiPaiCtr=self._view:GetController("xipai")
+    self.xiPaiCtr = self._view:GetController("xipai")
     return self
 end
 
@@ -40,26 +40,26 @@ function M:InitData(over, room, result, total_result, callback)
     self._view:GetChild('tex_roomnum').text = room.room_id
     self._view:GetChild('tex_data').text = os.date('%Y-%m-%d         %H:%M', os.time())
 
-	local xpconfig=DataManager.CurrenRoom.room_config.config.xi_pai
+    local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai
     if xpconfig then
-		self.xiPaiCtr.selectedIndex=1
+        self.xiPaiCtr.selectedIndex = 1
     else
-		self.xiPaiCtr.selectedIndex=0
+        self.xiPaiCtr.selectedIndex = 0
     end
 
-	local xipai=self._view:GetChild("btn_xipai")
+    local xipai = self._view:GetChild("btn_xipai")
-	xipai.touchable=true
+    xipai.touchable = true
     xipai.onClick:Add(function()
-				local xiPaiCallBack=function ()
+        local xiPaiCallBack = function()
-					xipai.touchable=false
+            xipai.touchable = false
-					self.xiPaiCtr.selectedIndex=0
+            self.xiPaiCtr.selectedIndex = 0
-					ViewUtil.ErrorTip(1000000,"申请洗牌成功")
+            ViewUtil.ErrorTip(1000000, "申请洗牌成功")
         end
         local _gamectr = ControllerManager.GetController(GameController)
         _gamectr:SendXiPaiAction(xiPaiCallBack)
     end)
     if result and result.xipai_score then
-		xipai.text="洗牌 积分x"..result.xipai_score
+        xipai.text = "洗牌 积分x" .. result.xipai_score
     end
 
     if result ~= nil and result.liuju == true then
@@ -83,7 +83,7 @@ function M:InitData(over, room, result, total_result, callback)
             self:AddClearItem(room, result, nil, over)
             return
         else
-			self.xiPaiCtr.selectedIndex=0
+            self.xiPaiCtr.selectedIndex = 0
             _btnCtr.selectedIndex = 1
             _sdkCtr.selectedIndex = 1
             btn_result.onClick:Add(
@@ -153,7 +153,7 @@ function M:InitData(over, room, result, total_result, callback)
             _icon.icon = 'ui://Main_RunBeard/jiesuan'
             over = 2
             _overCtr.selectedIndex = 3
-			self.xiPaiCtr.selectedIndex=0
+            self.xiPaiCtr.selectedIndex = 0
             btn_close.onClick:Add(
                 function()
                     ViewManager.ChangeView(ViewManager.View_Lobby)
@@ -189,6 +189,7 @@ end
 function M:GetPos(room, seat)
     return ViewUtil.GetPos(room.self_player.seat, seat, room.room_config.people_num)
 end
+
 function M:FillLiuJuItemData(room, data)
     local qipai_list = self._view:GetChild('qipai_listl')
     local _dipaiC = self._view:GetController('qipai')
@@ -268,12 +269,14 @@ function M:FillItemData(room, data, item)
     local info_list = data.info_list
     local Yes_win = false
     local win_data = {}
+
     for i = 1, #info_list do
         if info_list[i].is_win == true then
             Yes_win = true
             win_data = info_list[i]
         end
     end
+
     if win_data.seat == room.self_player.seat then
         self._view:GetChild('show_win').visible = true
         self._view:GetChild('show_low').visible = false
@@ -282,6 +285,14 @@ function M:FillItemData(room, data, item)
         self._view:GetChild('show_low').visible = true
     end
 
+    if data.fanxing_card and #data.fanxing_card > 0 then
+        self._view:GetChild('text_fangxing').text = '翻醒:' .. data.fanxing_score
+        for i = 1, #data.fanxing_card do
+            local fangc = self._view:GetChild('list_fangxing'):AddItemFromPool()
+            print("lingmeng 817",self:getCardItem('ui://Main_RunBeard/201_', data.fanxing_card[i]))
+            fangc:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', data.fanxing_card[i])
+        end
+    end
     if Yes_win == true then
         local isWin_Card = true
         local p = room:GetPlayerBySeat(win_data.seat)
@@ -740,6 +751,7 @@ function M:LoadHead(p, room)
         end
     end
 end
+
 function M:getCardItem(card_1, card_2)
     local _room = DataManager.CurrenRoom
     if _room ~= nil and _room.change_card_display ~= nil then

wb_new_ui/.objs/metas/7ij0e6i2/sv5gk.info

@@ -1,6 +1,11 @@
 {
   "objectStatus": {
-    "n146_udgc": {
+    "n166_ozsy": {
+      "hidden": true,
+      "collapsed": true
+    },
+    "n149_udgc": {
+      "hidden": true,
       "collapsed": true
     },
     "n153_udgc": {
@@ -8,20 +13,6 @@
     },
     "n152_udgc": {
       "hidden": true
-    },
-    "n149_udgc": {
-      "hidden": true,
-      "collapsed": true
-    },
-    "n143_udgc": {
-      "collapsed": true
-    },
-    "n140_udgc": {
-      "collapsed": true
-    },
-    "n166_ozsy": {
-      "hidden": true,
-      "collapsed": true
     }
   }
 }

wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info

@@ -1,5 +1,6 @@
 {
   "objectStatus": {
+<<<<<<< HEAD
     "n16_pt1r": {
       "hidden": true
     },
@@ -46,6 +47,18 @@
       "hidden": true
     },
     "n12_nrno": {
+=======
+    "n67_w06x": {
+      "hidden": true
+    },
+    "n48_j5c2": {
+      "hidden": true
+    },
+    "n40_n1ry": {
+      "hidden": true
+    },
+    "n47_lsou": {
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
       "hidden": true
     }
   }

wb_new_ui/.objs/workspace.json

@@ -30,6 +30,7 @@
     "mzvoz9ud",
     "/component/clearing/",
     "8wph7p8n",
+<<<<<<< HEAD
     "/",
     "lkq9ne9s",
     "/",
@@ -49,6 +50,13 @@
     "/image/MRBMui/",
     "lkq9ne9s",
     "/image/main_2/"
+=======
+    "/component/head/",
+    "8wph7p8n",
+    "/images/",
+    "lkq9ne9s",
+    "/images/cards/"
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Extend_Poker_HeChi/component/cards/FangXingCard.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="49,49">
+  <displayList>
+    <loader id="n0_lr5d" name="icon" xy="0,0" size="49,49" url="ui://v6yvqp7wos7u4z" fill="scale"/>
+  </displayList>
+</component>

wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml

@@ -24,6 +24,7 @@
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://mzvoz9udm1i339"/>
     </component>
+<<<<<<< HEAD
     <text id="n14_pt1r" name="n14" xy="85,87" size="92,32" group="n19_pt1r" visible="false" fontSize="22" color="#ffffff" align="center" vAlign="middle" text="房间号："/>
     <text id="n15_pt1r" name="tex_roomnum" xy="169,87" size="76,62" group="n19_pt1r" visible="false" fontSize="22" color="#ffffff" vAlign="middle" text="123456&#xA;"/>
     <text id="n16_pt1r" name="tex_game" xy="267,87" size="70,32" group="n19_pt1r" visible="false" fontSize="22" color="#ffffff" vAlign="middle" text="跑胡子"/>
@@ -36,6 +37,20 @@
     <image id="n77_p9qe" name="n77" src="m1i32d" fileName="component/head/image/touxiang_di_img.png" xy="187,277" size="78,78" group="n44_n1ry" visible="false"/>
     <component id="n78_p9qe" name="btn_head" src="m1i32e" fileName="component/head/Head2.xml" xy="105,264" size="137,137" group="n44_n1ry"/>
     <image id="n35_n1ry" name="n35" pkg="27vd145b" src="e54q3w" fileName="images/head/bank.png" xy="85,582" size="100,100" group="n44_n1ry" scale="0.8,0.8" visible="false">
+=======
+    <text id="n14_pt1r" name="n14" xy="87,87" size="92,31" group="n19_pt1r" visible="false" fontSize="22" color="#ffffff" align="center" vAlign="middle" text="房间号："/>
+    <text id="n15_pt1r" name="tex_roomnum" xy="171,87" size="76,61" group="n19_pt1r" visible="false" fontSize="22" color="#ffffff" vAlign="middle" text="123456&#xA;"/>
+    <text id="n16_pt1r" name="tex_game" xy="269,87" size="70,31" group="n19_pt1r" visible="false" fontSize="22" color="#ffffff" vAlign="middle" text="跑胡子"/>
+    <text id="n17_pt1r" name="tex_data" xy="111,123" size="145,39" group="n19_pt1r" visible="false" fontSize="28" color="#b25116" align="center" vAlign="middle" text="2017-02-12"/>
+    <group id="n19_pt1r" name="room_info" xy="87,87" size="252,75" group="n70_dunj"/>
+    <image id="n85_pgl7" name="n85" src="m1i33a" fileName="component/EPCDWHZMui/Rectangle 333.png" xy="63,199" size="2226,392" group="n45_n1ry"/>
+    <image id="n86_pgl7" name="n86" src="m1i33a" fileName="component/EPCDWHZMui/Rectangle 333.png" xy="63,596" size="2226,392" group="n45_n1ry"/>
+    <image id="n33_n1ry" name="n33" src="m1i33b" fileName="component/clearing/di.png" xy="59,631" size="1173,289" group="n45_n1ry" visible="false"/>
+    <image id="n43_n1ry" name="n43" src="m1i32c" fileName="font/images/head/index_bg_01.png" xy="114,610" size="90,88" group="n44_n1ry" aspect="true" visible="false"/>
+    <image id="n77_p9qe" name="n77" src="m1i32d" fileName="component/head/image/touxiang_di_img.png" xy="189,277" size="78,78" group="n44_n1ry" visible="false"/>
+    <component id="n78_p9qe" name="btn_head" src="m1i32e" fileName="component/head/Head2.xml" xy="103,231" size="115,115" group="n44_n1ry"/>
+    <image id="n35_n1ry" name="n35" pkg="27vd145b" src="e54q3w" fileName="images/head/bank.png" xy="87,582" size="100,100" group="n44_n1ry" scale="0.8,0.8" visible="false">
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
       <gearDisplay controller="bank" pages="1"/>
     </image>
     <text id="n38_n1ry" name="WinerName" xy="107,408" size="409,64" group="n44_n1ry" font="ui://27vd145bik9v7imf" fontSize="48" color="#317038" vAlign="middle" autoSize="shrink" singleLine="true" text="玩家的名字則麽長~~"/>
@@ -47,12 +62,21 @@
     <list id="n30_n1ry" name="player_list" xy="56,669" size="1059,392" group="n45_n1ry" layout="row" selectionMode="none" scroll="horizontal" colGap="221" defaultItem="ui://mzvoz9udm1i32b" autoClearItems="true">
       <item/>
     </list>
+<<<<<<< HEAD
     <list id="n32_n1ry" name="dipai_list" xy="213,872" size="1005,64" group="n45_n1ry" visible="false" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://mzvoz9udm1i3m" vAlign="middle"/>
     <text id="n39_n1ry" name="huxi" xy="1659,494" size="435,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="胡息：+133&#xA;"/>
     <text id="n40_n1ry" name="tunshu" xy="1167,314" size="439,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="基础囤数:+133"/>
     <text id="n47_lsou" name="zongtunshu" xy="1167,408" size="445,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="总囤数:+133"/>
     <list id="n46_n1ry" name="fullname_list" xy="55,1088" size="283,245" group="n45_n1ry" visible="false" layout="flow_hz" selectionMode="none" lineGap="5" colGap="-10" lineItemCount="2" defaultItem="ui://mzvoz9udm1i33c" align="center"/>
     <list id="n41_n1ry" name="card_list" xy="530,216" size="593,368" group="n45_n1ry" layout="row" selectionMode="none" colGap="33" defaultItem="ui://mzvoz9udm1i33d" vAlign="middle" autoClearItems="true">
+=======
+    <list id="n32_n1ry" name="dipai_list" xy="215,872" size="1005,64" group="n45_n1ry" visible="false" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://mzvoz9udm1i3m" vAlign="middle"/>
+    <text id="n39_n1ry" name="huxi" xy="1957,246" size="205,49" group="n45_n1ry" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" singleLine="true" text="胡息：+133&#xA;"/>
+    <text id="n40_n1ry" name="tunshu" xy="1450,331" size="439,49" group="n45_n1ry" visible="false" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" singleLine="true" text="基础囤数:+133"/>
+    <text id="n47_lsou" name="zongtunshu" xy="1450,384" size="445,49" group="n45_n1ry" visible="false" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" singleLine="true" text="基础囤数:+133"/>
+    <list id="n46_n1ry" name="fullname_list" xy="57,1088" size="283,245" group="n45_n1ry" visible="false" layout="flow_hz" selectionMode="none" lineGap="5" colGap="-10" lineItemCount="2" defaultItem="ui://mzvoz9udm1i33c" align="center"/>
+    <list id="n41_n1ry" name="card_list" xy="657,216" size="593,368" group="n45_n1ry" layout="row" selectionMode="none" colGap="33" defaultItem="ui://mzvoz9udm1i33d" vAlign="middle" autoClearItems="true">
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
       <item/>
       <item/>
       <item/>
@@ -61,10 +85,17 @@
       <item/>
       <item/>
     </list>
+<<<<<<< HEAD
     <text id="n42_n1ry" name="score" xy="1659,558" size="429,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="游戏分：+2333&#xA;"/>
     <text id="n48_j5c2" name="chongtunshu" xy="1167,223" size="349,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="充囤:4囤"/>
     <text id="n56_fnpw" name="222" xy="713,950" size="82,36" group="n58_fnpw" visible="false" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
     <list id="n62_fnpw" name="qipai_list" xy="791,946" size="298,157" group="n58_fnpw" visible="false" layout="row" colGap="1" defaultItem="ui://mzvoz9udm1i32i" vAlign="middle">
+=======
+    <text id="n42_n1ry" name="score" xy="1956,300" size="205,49" group="n45_n1ry" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" singleLine="true" text="总分：+2333&#xA;"/>
+    <text id="n48_j5c2" name="chongtunshu" xy="1450,223" size="349,49" group="n45_n1ry" visible="false" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" singleLine="true" text="充囤:4囤"/>
+    <text id="n56_fnpw" name="222" xy="715,950" size="82,37" group="n58_fnpw" visible="false" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
+    <list id="n62_fnpw" name="qipai_list" xy="793,946" size="298,157" group="n58_fnpw" visible="false" layout="row" colGap="1" defaultItem="ui://mzvoz9udm1i32i" vAlign="middle">
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
       <item/>
       <item/>
       <item/>
@@ -76,11 +107,23 @@
     <group id="n58_fnpw" name="n58" xy="713,946" size="376,157" group="n45_n1ry" visible="false" advanced="true">
       <gearDisplay controller="qipai" pages="1"/>
     </group>
+<<<<<<< HEAD
     <text id="n67_w06x" name="tili_score" xy="1167,497" size="460,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="积分+2333&#xA;"/>
     <text id="n68_w06x" name="tili_title" xy="1630,208" size="287,49" group="n45_n1ry" visible="false" alpha="0" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" text=""/>
     <text id="n69_w06x" name="yidashangxian" xy="1167,497" size="428,54" group="n45_n1ry" font="ui://27vd145bik9v7imf" fontSize="40" color="#317038" vAlign="middle" autoSize="shrink" bold="true" text=""/>
     <image id="n73_p9qe" name="n73" src="m1i32a" fileName="component/clearing/images/fengexian_js.png" xy="191,934" size="1050,5" group="n45_n1ry" visible="false"/>
     <group id="n45_n1ry" name="n45" xy="55,183" size="2039,1150" group="n70_dunj" advanced="true">
+=======
+    <text id="n67_w06x" name="tili_score" xy="1950,396" size="460,49" group="n45_n1ry" visible="false" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" singleLine="true" text="+2333&#xA;"/>
+    <text id="n68_w06x" name="tili_title" xy="1416,221" size="287,49" group="n45_n1ry" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" text=""/>
+    <text id="n69_w06x" name="yidashangxian" xy="1422,495" size="428,49" group="n45_n1ry" font="ui://mzvoz9udm1i32g" fontSize="36" color="#0a1628" vAlign="middle" autoSize="shrink" text=""/>
+    <image id="n73_p9qe" name="n73" src="m1i32a" fileName="component/clearing/images/fengexian_js.png" xy="193,934" size="1050,5" group="n45_n1ry" visible="false"/>
+    <text id="n87_mm8f" name="text_fangxing" xy="1420,443" size="114,50" group="n45_n1ry" fontSize="37" autoClearText="true" text="翻醒："/>
+    <list id="n89_mm8f" name="list_fangxing" xy="1421,486" size="200,69" group="n45_n1ry" overflow="scroll" defaultItem="ui://mzvoz9udmm8f9j">
+      <item/>
+    </list>
+    <group id="n45_n1ry" name="n45" xy="57,199" size="2353,1134" group="n70_dunj" advanced="true">
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
       <gearDisplay controller="over" pages="0"/>
     </group>
     <text id="n49_g8y2" name="n49" xy="485,72" size="457,74" group="n70_dunj" fontSize="18" color="#999999" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
@@ -179,7 +222,11 @@
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://mzvoz9udmrlr9q"/>
     </component>
+<<<<<<< HEAD
     <group id="n70_dunj" name="n70" xy="-2,0" size="2159,3491" advanced="true">
+=======
+    <group id="n70_dunj" name="n70" xy="0,-21" size="2410,3512" advanced="true">
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
       <gearDisplay controller="over" pages="0,1,2"/>
     </group>
     <component id="n71_dunj" name="big_result" src="m1i33m" fileName="component/clearing/result_zipai_main.xml" xy="0,0" size="2348,1126">

wb_new_ui/assets/Extend_Poker_HeChi/package.xml

@@ -344,6 +344,7 @@
     <component id="m1i39g" name="RoomInfoPanel.xml" path="/"/>
     <component id="m1i39h" name="RoomInfoPanel1.xml" path="/"/>
     <component id="m1i39i" name="gamerule.xml" path="/" exported="true"/>
+<<<<<<< HEAD
     <image id="mrlr9j" name="Frame 1255.png" path="/component/EPCDWHZMui/" atlas="alone_npot"/>
     <image id="mrlr9k" name="Frame 1254.png" path="/component/EPCDWHZMui/" atlas="alone_npot"/>
     <image id="mrlr9l" name="Frame 1148.png" path="/component/EPCDWHZMui/"/>
@@ -361,6 +362,9 @@
     <image id="mrlr9x" name="Frame 1275.png" path="/component/EPCDWHZMui/"/>
     <image id="mrlr9y" name="Rectangle 2784.png" path="/component/EPCDWHZMui/"/>
     <image id="mrlr9z" name="Frame 787(1).png" path="/component/EPCDWHZMui/"/>
+=======
+    <component id="mm8f9j" name="FangXingCard.xml" path="/component/cards/" exported="true"/>
+>>>>>>> 9a099ad3ac2bf61830eda583d75eff4f2b061b5f
   </resources>
   <publish name="Extend_Poker_HeChi" path="..\wb_unity_pro\Assets\ART\extend\zipai\hechi\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnygz.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 6f284700c5bbdf04a89aa41462c47a49
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 1
+  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: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_fwnyh0.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 4f6381c17b7f28344b17be87bb9bbb4a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 1
+  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: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_m9jahw.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 59a3cc2b02a1cf94a82d2c1cc1fa29c1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 1
+  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: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: