Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo

wangzhenxing 2024-02-23 21:52:52 +08:00
commit 2f620dcfcb
5 changed files with 58 additions and 58 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

@ -308,8 +308,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -260.52002, y: 1.71}
m_SizeDelta: {x: 255, y: 550}
m_AnchoredPosition: {x: -220, y: 14}
m_SizeDelta: {x: 200, y: 450}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3221193827527416953
CanvasRenderer:
@ -478,8 +478,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 277, y: 1.71}
m_SizeDelta: {x: 255, y: 550}
m_AnchoredPosition: {x: 220, y: 14.000001}
m_SizeDelta: {x: 200, y: 450}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5305888755826435458
CanvasRenderer:
@ -524,7 +524,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.4, y: -238}
m_AnchoredPosition: {x: 0.4, y: -193.00002}
m_SizeDelta: {x: 129, y: 132}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3222465788781620408
@ -5515,7 +5515,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 26.6, y: -535}
m_AnchoredPosition: {x: 12, y: -462}
m_SizeDelta: {x: 360, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1481527221238133842
@ -11382,7 +11382,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1481527221964054113}
m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000028088027}
m_LocalPosition: {x: 27.17, y: -324, z: -9.999594}
m_LocalPosition: {x: -2, y: -225.3, z: -10}
m_LocalScale: {x: 80, y: 30, z: 0}
m_Children: []
m_Father: {fileID: 1481527221518941040}
@ -36171,7 +36171,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 28.11, y: -460}
m_AnchoredPosition: {x: 0, y: -363}
m_SizeDelta: {x: 205.78, y: 85.35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1481527223225029559
@ -36634,7 +36634,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 69, y: -218}
m_AnchoredPosition: {x: 69, y: -155.00002}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4093618476494820469
@ -37020,7 +37020,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 69, y: -218}
m_AnchoredPosition: {x: 69, y: -155}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1819438235284542676
@ -37176,7 +37176,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 4.41, y: -223}
m_AnchoredPosition: {x: 4.41, y: -178}
m_SizeDelta: {x: 145.68, y: 60.17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7649638815911520560
@ -37509,7 +37509,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 4.41, y: -223}
m_AnchoredPosition: {x: 4.41, y: -178}
m_SizeDelta: {x: 145.68, y: 60.17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3653749324296290786
@ -37649,8 +37649,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 10, y: 1.71}
m_SizeDelta: {x: 255, y: 550}
m_AnchoredPosition: {x: 0, y: 14.000001}
m_SizeDelta: {x: 200, y: 450}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3051443985431962444
CanvasRenderer:
@ -38008,7 +38008,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 155}
m_AnchoredPosition: {x: 0, y: 114}
m_SizeDelta: {x: 120, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3964993807845092361
@ -38150,7 +38150,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 155}
m_AnchoredPosition: {x: 0, y: 114}
m_SizeDelta: {x: 120, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3903077778479446164
@ -38878,7 +38878,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 12}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5526079154983721375
@ -39233,8 +39233,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.4, y: 230}
m_SizeDelta: {x: 152.81, y: 36.6}
m_AnchoredPosition: {x: 0, y: 198}
m_SizeDelta: {x: 152.81, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1248235393540463956
CanvasRenderer:
@ -39558,7 +39558,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.4, y: -238}
m_AnchoredPosition: {x: 0.4, y: -193}
m_SizeDelta: {x: 129, y: 132}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1783303078148169606
@ -39800,7 +39800,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 155}
m_AnchoredPosition: {x: 0, y: 114}
m_SizeDelta: {x: 120, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6923664995480057055
@ -39869,7 +39869,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0.4, y: -238}
m_AnchoredPosition: {x: 0.4, y: -193.00002}
m_SizeDelta: {x: 129, y: 132}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &730655663164609257
@ -40192,7 +40192,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 69, y: -218}
m_AnchoredPosition: {x: 69, y: -155.00002}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4874439213355832803
@ -40435,8 +40435,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.4, y: 230}
m_SizeDelta: {x: 152.81, y: 36.6}
m_AnchoredPosition: {x: 0, y: 198}
m_SizeDelta: {x: 152.81, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6849683814499726865
CanvasRenderer:
@ -40659,7 +40659,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 4.41, y: -223}
m_AnchoredPosition: {x: 4.41, y: -178}
m_SizeDelta: {x: 145.68, y: 60.17}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2901113111699475545
@ -40794,8 +40794,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.4, y: 230}
m_SizeDelta: {x: 152.81, y: 36.6}
m_AnchoredPosition: {x: 0, y: 198}
m_SizeDelta: {x: 152.81, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6578396964909660959
CanvasRenderer:
@ -40875,7 +40875,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -106, y: -753}
m_AnchoredPosition: {x: -123, y: -787}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2456363721581970683
@ -41298,8 +41298,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 10, y: -201.5}
m_SizeDelta: {x: 1063, y: 881}
m_AnchoredPosition: {x: 10, y: -133}
m_SizeDelta: {x: 900, y: 700}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3953431661856025054
CanvasRenderer:

View File

@ -6351,7 +6351,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000030517578, y: -8.5}
m_AnchoredPosition: {x: 0.00000001731307, y: -8.5}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &7428001346248983693
@ -6829,7 +6829,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 249, y: 30}
m_AnchoredPosition: {x: 249, y: 47}
m_SizeDelta: {x: 73.9, y: 42.04}
m_Pivot: {x: 0.36038244, y: 0.5}
--- !u!222 &5221557223127298546
@ -11678,7 +11678,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 249, y: 30}
m_AnchoredPosition: {x: 249, y: 49}
m_SizeDelta: {x: 73.9, y: 42.04}
m_Pivot: {x: 0.36038244, y: 0.5}
--- !u!222 &8303619605653060538
@ -12268,8 +12268,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.9214, y: -0.19046}
m_SizeDelta: {x: 798.15, y: 151.91}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 798.15, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3912324450016212587
CanvasRenderer:
@ -27664,7 +27664,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 657.44006, y: -93.142}
m_SizeDelta: {x: 142.49, y: 52.725}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6356434684782085281
CanvasRenderer:
@ -28065,7 +28065,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 5.07, y: 1588}
m_SizeDelta: {x: 796.31, y: 151.52}
m_SizeDelta: {x: 796.31, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1753429525616099593
GameObject:
@ -33057,8 +33057,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.9214, y: -0.19046}
m_SizeDelta: {x: 798.15, y: 151.91}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 798.15, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8738607448137387369
CanvasRenderer:
@ -43436,7 +43436,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 21, y: 0}
m_AnchoredPosition: {x: -51.6, y: 0}
m_SizeDelta: {x: 242.11, y: 39.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4523721566213525253
@ -49187,7 +49187,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 657.28, y: -93.142}
m_SizeDelta: {x: 142.81, y: 52.726}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &245560598634028686
CanvasRenderer:
@ -79471,8 +79471,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -86.3, y: -33.75}
m_SizeDelta: {x: 527.8, y: 133}
m_AnchoredPosition: {x: -128.6, y: -29.246}
m_SizeDelta: {x: 515.8, y: 112.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4262336696161190878
MonoBehaviour:
@ -79585,8 +79585,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -252, y: 55}
m_SizeDelta: {x: 297, y: 44}
m_AnchoredPosition: {x: -205.04, y: 63}
m_SizeDelta: {x: 390.93, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7281135729660457134
CanvasRenderer:
@ -84407,7 +84407,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 657.44, y: -93.142}
m_SizeDelta: {x: 142.49, y: 52.725}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &106390788067534452
CanvasRenderer:
@ -84947,7 +84947,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 657.44, y: -93.142}
m_SizeDelta: {x: 142.49, y: 52.725}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7965685104904795972
CanvasRenderer:
@ -85802,7 +85802,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 657.28, y: -93.142}
m_SizeDelta: {x: 142.81, y: 52.726}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4265660881893781513
CanvasRenderer:
@ -105001,8 +105001,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -86.3, y: -31}
m_SizeDelta: {x: 527.8, y: 108.73}
m_AnchoredPosition: {x: -128.6, y: -29.246}
m_SizeDelta: {x: 515.8, y: 112.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7170362735377660931
MonoBehaviour:
@ -110192,8 +110192,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -252, y: 48}
m_SizeDelta: {x: 297, y: 44}
m_AnchoredPosition: {x: -205.04, y: 63}
m_SizeDelta: {x: 390.93, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7585818912839897492
CanvasRenderer:
@ -134804,7 +134804,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 657.44006, y: -93.142}
m_SizeDelta: {x: 142.49, y: 52.725}
m_SizeDelta: {x: 200, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7960960008785816419
CanvasRenderer:
@ -174297,7 +174297,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 5.07, y: 1364}
m_SizeDelta: {x: 796.31, y: 151.52}
m_SizeDelta: {x: 796.31, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7952533447423413802
GameObject:
@ -174548,7 +174548,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3766131170455723064
RectTransform:
m_ObjectHideFlags: 0
@ -208114,7 +208114,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 21, y: 0}
m_AnchoredPosition: {x: -51.6, y: 0}
m_SizeDelta: {x: 242.11, y: 39.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8803283497968640721

View File

@ -129,7 +129,7 @@ function ArenaResultPopup:OnOpen(_args,_fun)
end
local rScore = redInfo.deltaScore
LogError("rscore=========================="..rScore)
if rScore and isWin then
redScore:SetActive(true)
local redScoreColor = rScore >= 0 and UIColorStr.GREEN or UIColorStr.RED