gitigrone修复

.gitignore

@@ -4,20 +4,9 @@
 # 上传两个文件夹
 !lua_probject/
 !wb_unity_pro/
-wb_unity_pro/*
+!wb_new_ui/
-!wb_unity_pro/Assets/
-wb_unity_pro/Assets/*
-!wb_unity_pro/Assets/ART/
 
 !lua_probject/**
-<<<<<<< HEAD
+!wb_unity_pro/**
-!wb_unity_pro/Assets/ART/**
+!wb_new_ui/**
-!.gitignore
+!.gitignore
-=======
-<<<<<<< HEAD
-!wb_unity_pro/Assets/ART/**
-!.gitignore
-=======
-!wb_unity_pro/Assets/ART/**
->>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
->>>>>>> 0686db8061b2c5c116395dd935e8cfdbaeda16b4

wb_new_ui/assets/Common/component/record/Btn_record_play(1).xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="337,134" extention="Button">
+  <controller name="state" pages="0,,1," selected="0"/>
+  <displayList>
+    <image id="n5_rayb" name="n5" src="lj2n7inw" fileName="Main_new/record/mahj_start_btn.png" xy="0,0" size="337,134">
+      <gearDisplay controller="state" pages="0"/>
+    </image>
+    <image id="n6_tjv8" name="n6" src="lj2n7inx" fileName="Main_new/record/mahj_pause_btn.png" xy="0,0" size="337,134">
+      <gearDisplay controller="state" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Radio" downEffect="dark" downEffectValue=".8"/>
+</component>

wb_new_ui/assets/Common/component/record/Btn_record_return(1).xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="334,134" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n6_lj2n" name="n6" src="lj2n7inz" fileName="Main_new/record/stop.png" xy="0,0" size="334,134"/>
+  </displayList>
+  <Button downEffect="dark" downEffectValue=".8"/>
+</component>

wb_new_ui/assets/Common/component/record/Btn_record_speed(1).xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="52,38" anchor="true" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="enable" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n4_rayb" name="bg" xy="0,0" size="52,38" align="right" vAlign="middle">
+      <gearLook controller="enable" pages="0,1" values="1,0,0,1|1,0,1,0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <loader id="n2" name="icon" xy="0,0" size="52,38" align="right" vAlign="middle" fill="scale">
+      <gearLook controller="enable" pages="0,1" values="1,0,0,1|1,0,1,0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button downEffect="dark" downEffectValue=".8"/>
+</component>

wb_new_ui/assets/Common/component/record/Component/btn_mul.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_lj2n" name="icon" xy="0,0" size="100,20" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Common/component/record/Component/font/MJ_recordSpeed.fnt

@@ -0,0 +1,11 @@
+info size=20 colored=false
+char id=48 img=lj2n181 xoffset=0 yoffset=0 xadvance=0
+char id=49 img=lj2n182 xoffset=0 yoffset=0 xadvance=0
+char id=50 img=lj2n183 xoffset=0 yoffset=0 xadvance=0
+char id=51 img=lj2n184 xoffset=0 yoffset=0 xadvance=0
+char id=52 img=lj2n185 xoffset=0 yoffset=0 xadvance=0
+char id=53 img=lj2n186 xoffset=0 yoffset=0 xadvance=0
+char id=54 img=lj2n187 xoffset=0 yoffset=0 xadvance=0
+char id=55 img=lj2n188 xoffset=0 yoffset=0 xadvance=0
+char id=56 img=lj2n189 xoffset=0 yoffset=0 xadvance=0
+char id=57 img=lj2n18a xoffset=0 yoffset=0 xadvance=0

wb_new_ui/assets/Common/component/record/Record_New.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,165">
+  <controller name="type" pages="0,麻将,1,牛牛,2," selected="0"/>
+  <displayList>
+    <component id="n3_rayb" name="btn_LastStep" src="lj2n7inq" fileName="component/record/Btn_record_speed(1).xml" xy="-96,-400" size="58,54" visible="false">
+      <gearDisplay controller="type" pages="0"/>
+      <Button icon="ui://27vd145blj2n7inr"/>
+    </component>
+    <component id="n5_rayb" name="btn_LastRound" src="lj2n7inq" fileName="component/record/Btn_record_speed(1).xml" xy="2073,15" size="334,134">
+      <relation target="" sidePair="height-height%,left-left%"/>
+      <Button icon="ui://27vd145blj2n7ins"/>
+    </component>
+    <component id="n6_rayb" name="btn_NextStep" src="lj2n7inq" fileName="component/record/Btn_record_speed(1).xml" xy="142,15" size="334,134">
+      <relation target="" sidePair="height-height%,left-left%"/>
+      <Button icon="ui://27vd145blj2n7int"/>
+    </component>
+    <component id="n7_rayb" name="btn_NextRound" src="lj2n7inq" fileName="component/record/Btn_record_speed(1).xml" xy="1671,17" size="337,134">
+      <relation target="" sidePair="height-height%,left-left%"/>
+      <Button icon="ui://27vd145blj2n7inu"/>
+    </component>
+    <text id="n10_dpym" name="tex_step" xy="17,-8" size="216,38" fontSize="30" color="#ffffff" autoSize="none" text="第 999 / 999 步">
+      <gearDisplay controller="type" pages="1"/>
+    </text>
+    <component id="n11_tjv8" name="btn_play" src="lj2n7inv" fileName="component/record/Btn_record_play(1).xml" xy="520,15" size="337,134">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
+      <Button icon="ui://27vd145blj2n7inx"/>
+    </component>
+    <text id="n12_tjv8" name="tex_speed" xy="299,43" size="64,78" font="ui://27vd145blj2n18c" fontSize="30" color="#ffffff" text="1">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
+    </text>
+    <text id="n13_tjv8" name="tex_1" xy="370,-8" size="0,0" visible="false" fontSize="30" color="#ff9c00" text="">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="n12_tjv8" sidePair="left-right"/>
+    </text>
+    <text id="n14_tjv8" name="tex_2" xy="281,-417" size="64,42" visible="false" fontSize="30" color="#ff9c00" text="暂停">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="n13_tjv8" sidePair="left-right"/>
+    </text>
+    <component id="n9_rayb" name="btn_return" src="lj2n7iny" fileName="component/record/Btn_record_return(1).xml" xy="1279,15" size="334,134">
+      <gearXY controller="type" pages="0,1,2" values="1279,15|227,32|458,35"/>
+      <gearSize controller="type" pages="0,1,2" values="334,134,1,1|128,98,1,1|135,93,0.6,0.6"/>
+      <relation target="" sidePair="height-height%,left-left%"/>
+    </component>
+    <component id="n16_lj2n" name="btn_restart" src="lj2n7inq" fileName="component/record/Btn_record_speed(1).xml" xy="905,15" size="334,134">
+      <relation target="" sidePair="height-height%,left-left%"/>
+      <Button icon="ui://27vd145blj2n7io1"/>
+    </component>
+    <image id="n17_lj2n" name="n17" src="lj2n18b" fileName="component/record/Component/font/x.png" xy="227,45" size="60,74">
+      <relation target="" sidePair="height-height%,left-left%"/>
+    </image>
+  </displayList>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Main/Component/btn_mul.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="100,20" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <loader id="n3_lj2n" name="icon" xy="0,0" size="100,20" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_HandCard2_Record.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,77">
+  <displayList>
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="94,77" url="ui://v0j9abjylj2n18d" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,77">
+  <displayList>
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="94,77" url="ui://v0j9abjylj2n18d" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="94,77">
+  <displayList>
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="94,77" skew="0,180" url="ui://v0j9abjylj2n18d" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+</component>