Selaa lähdekoodia

fix image load

Виктор Шейко 4 vuotta sitten
vanhempi
commit
fab5880e18

+ 1 - 0
Assets/Resources/Image/Icons/refresh-24px.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>

+ 55 - 0
Assets/Resources/Image/Icons/refresh-24px.svg.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 9b6fe5699455cae4daf4949b139e5ca4
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: a57477913897c46af95d590f580878bd, type: 3}
+  svgType: 4
+  texturedSpriteMeshType: 0
+  svgPixelsPerUnit: 100
+  gradientResolution: 64
+  alignment: 0
+  customPivot: {x: 0, y: 0}
+  generatePhysicsShape: 0
+  viewportOptions: 1
+  preserveViewport: 0
+  advancedMode: 0
+  predefinedResolutionIndex: 1
+  targetResolution: 1080
+  resolutionMultiplier: 1
+  stepDistance: 10
+  samplingStepDistance: 100
+  maxCordDeviationEnabled: 0
+  maxCordDeviation: 1
+  maxTangentAngleEnabled: 0
+  maxTangentAngle: 5
+  keepTextureAspectRatio: 1
+  textureSize: 256
+  textureWidth: 256
+  textureHeight: 256
+  wrapMode: 0
+  filterMode: 1
+  sampleCount: 4
+  preserveSVGImageAspect: 0
+  useSVGPixelsPerUnit: 0
+  spriteData:
+    TessellationDetail: 0
+    SpriteRect:
+      name: 
+      originalName: 
+      pivot: {x: 0, y: 0}
+      alignment: 0
+      border: {x: 0, y: 0, z: 0, w: 0}
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 0
+        height: 0
+      spriteID: 7fb95fb0348cfad4a911089ec378d1b2
+      internalID: 0
+    PhysicsOutlines: []

+ 498 - 37
Assets/Scenes/Player.unity

@@ -4527,7 +4527,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 185, y: -15}
+  m_AnchoredPosition: {x: 231, y: -15}
   m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &175243280
@@ -6377,8 +6377,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104, y: -14.6}
-  m_SizeDelta: {x: 200, y: 20}
+  m_AnchoredPosition: {x: 143, y: -14}
+  m_SizeDelta: {x: 278, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &272699088
 MonoBehaviour:
@@ -11385,8 +11385,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 84, y: -15}
-  m_SizeDelta: {x: 168, y: 30}
+  m_AnchoredPosition: {x: 107, y: -15}
+  m_SizeDelta: {x: 214, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &476522315
 MonoBehaviour:
@@ -12941,7 +12941,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.99999106, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -14281,14 +14281,13 @@ RectTransform:
   - {fileID: 1010503891}
   - {fileID: 1140478577}
   - {fileID: 1783852231}
-  - {fileID: 1369070962}
   m_Father: {fileID: 100471033}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 320, y: 81}
-  m_SizeDelta: {x: 208, y: 162}
+  m_AnchoredPosition: {x: 358, y: 81}
+  m_SizeDelta: {x: 286, y: 162}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &583944821
 MonoBehaviour:
@@ -14307,10 +14306,10 @@ MonoBehaviour:
     m_Right: 4
     m_Top: 4
     m_Bottom: 4
-  m_ChildAlignment: 4
+  m_ChildAlignment: 1
   m_Spacing: 2
   m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
+  m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
@@ -15637,7 +15636,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 536863489}
   m_Direction: 0
   m_Value: 0
-  m_Size: 0.99999106
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -17278,6 +17277,12 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 724272960}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!224 &732927149 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+    type: 3}
+  m_PrefabInstance: {fileID: 1651287581}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &738543677
 GameObject:
   m_ObjectHideFlags: 0
@@ -17361,6 +17366,136 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 738543677}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &741463563
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 741463564}
+  - component: {fileID: 741463567}
+  - component: {fileID: 741463566}
+  - component: {fileID: 741463565}
+  m_Layer: 5
+  m_Name: Button_update
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &741463564
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741463563}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1409497788}
+  - {fileID: 2036240343}
+  m_Father: {fileID: 1010503891}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 263, y: -15}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &741463565
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741463563}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 741463566}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1379126282}
+        m_MethodName: UpdatePanelSize
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &741463566
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741463563}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &741463567
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 741463563}
+  m_CullTransparentMesh: 0
 --- !u!1 &743934772
 GameObject:
   m_ObjectHideFlags: 0
@@ -18578,8 +18713,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 111, y: -15}
-  m_SizeDelta: {x: 178, y: 30}
+  m_AnchoredPosition: {x: 72, y: -15}
+  m_SizeDelta: {x: 100, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &797219994
 MonoBehaviour:
@@ -21411,13 +21546,13 @@ RectTransform:
   m_Children:
   - {fileID: 1266599155}
   - {fileID: 90903536}
-  m_Father: {fileID: 1140478577}
-  m_RootOrder: 1
+  m_Father: {fileID: 1010503891}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 111, y: -15}
-  m_SizeDelta: {x: 178, y: 30}
+  m_AnchoredPosition: {x: 196, y: -15}
+  m_SizeDelta: {x: 100, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &917919570
 MonoBehaviour:
@@ -24061,13 +24196,16 @@ RectTransform:
   m_Children:
   - {fileID: 2071510946}
   - {fileID: 797219993}
+  - {fileID: 1389745162}
+  - {fileID: 917919569}
+  - {fileID: 741463564}
   m_Father: {fileID: 583944820}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104, y: -42.800003}
-  m_SizeDelta: {x: 200, y: 30}
+  m_AnchoredPosition: {x: 143, y: -41}
+  m_SizeDelta: {x: 278, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1010503892
 MonoBehaviour:
@@ -26579,7 +26717,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1139257395
 RectTransform:
   m_ObjectHideFlags: 0
@@ -26630,7 +26768,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C"
+  m_Text: "\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442\u0443\u0440\u0443"
 --- !u!222 &1139257397
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -26777,7 +26915,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1140478577
 RectTransform:
   m_ObjectHideFlags: 0
@@ -26788,16 +26926,14 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1389745162}
-  - {fileID: 917919569}
+  m_Children: []
   m_Father: {fileID: 583944820}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104, y: -76}
-  m_SizeDelta: {x: 200, y: 30}
+  m_AnchoredPosition: {x: 189, y: -59.666664}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1140478578
 MonoBehaviour:
@@ -32515,13 +32651,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1139257395}
-  m_Father: {fileID: 583944820}
-  m_RootOrder: 4
+  - {fileID: 732927149}
+  m_Father: {fileID: 1783852231}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104, y: -142.4}
-  m_SizeDelta: {x: 200, y: 30}
+  m_AnchoredPosition: {x: 263, y: -15}
+  m_SizeDelta: {x: 30, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1369070963
 MonoBehaviour:
@@ -33132,12 +33269,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1140478577}
-  m_RootOrder: 0
+  m_Father: {fileID: 1010503891}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 10, y: -15}
+  m_AnchoredPosition: {x: 134, y: -15}
   m_SizeDelta: {x: 20, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1389745163
@@ -33808,6 +33945,83 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1409116678}
   m_CullTransparentMesh: 0
+--- !u!1 &1409497787
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1409497788}
+  - component: {fileID: 1409497790}
+  - component: {fileID: 1409497789}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1409497788
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1409497787}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 741463564}
+  m_RootOrder: 0
+  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_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1409497789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1409497787}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 74d3785fa719d15429525fe4a1584744, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C"
+--- !u!222 &1409497790
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1409497787}
+  m_CullTransparentMesh: 0
 --- !u!1 &1413667701
 GameObject:
   m_ObjectHideFlags: 0
@@ -35551,6 +35765,126 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1466962171}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &1476886101
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 741463564}
+    m_Modifications:
+    - target: {fileID: -4005918263034271025, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_Name
+      value: refresh-24px
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 7243324766535440047, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+    type: 3}
 --- !u!1 &1484795432
 GameObject:
   m_ObjectHideFlags: 0
@@ -40694,6 +41028,126 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_IsOn: 1
+--- !u!1001 &1651287581
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1369070962}
+    m_Modifications:
+    - target: {fileID: -4005918263034271025, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_Name
+      value: refresh-24px
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 7243324766535440047, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+    type: 3}
 --- !u!1 &1654594826
 GameObject:
   m_ObjectHideFlags: 0
@@ -43530,13 +43984,14 @@ RectTransform:
   m_Children:
   - {fileID: 476522314}
   - {fileID: 175243279}
+  - {fileID: 1369070962}
   m_Father: {fileID: 583944820}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 104, y: -109.200005}
-  m_SizeDelta: {x: 200, y: 30}
+  m_AnchoredPosition: {x: 143, y: -73}
+  m_SizeDelta: {x: 278, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1783852232
 MonoBehaviour:
@@ -51296,6 +51751,12 @@ Transform:
   m_Father: {fileID: 1998721015}
   m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+--- !u!224 &2036240343 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8351988624676192265, guid: 9b6fe5699455cae4daf4949b139e5ca4,
+    type: 3}
+  m_PrefabInstance: {fileID: 1476886101}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2037433954
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 23
Assets/Scripts/Components/TouchScript.cs

@@ -115,31 +115,36 @@ public class TouchScript : MonoBehaviour
                 case Tools.Scale:
                     //var scale = transform.localScale;
                     //transform.localScale = new Vector3(scale.x + (h + v), scale.z + (h + v), scale.z);
-                    var proportions = transform.transform.localScale.z / transform.transform.localScale.x;
-                    var z = proportions * deltaScale;
-
-                    //transform.transform.position = new Vector3(scale.x *5, 0, scale.z *5);
-                    if (increase)
-                    {
-                        scaleChange = new Vector3(deltaScale, 0, z);
-                        positionChange = new Vector3(deltaScale * 5, 0, z * 5);
-                    }
-                    else
-                    {
-                        scaleChange = new Vector3(-deltaScale, 0, -z);
-                        positionChange = new Vector3(-deltaScale * 5, 0, -z * 5);
-                    }
-                    transform.transform.localScale += scaleChange;
-                    transform.transform.position += positionChange;
-
-                    // Move upwards when the sphere hits the floor or downwards
-                    // when the sphere scale extends 1.0f.
-                    if (transform.transform.localScale.y < 0.01f || transform.transform.localScale.y > 10.0f)
+                    if (EditorController.instance.ToggleScalePanel.isOn)
                     {
-                        increase = !increase;
+                        var proportions = transform.transform.localScale.z / transform.transform.localScale.x;
+                        var z = proportions * deltaScale;
+
+                        //transform.transform.position = new Vector3(scale.x *5, 0, scale.z *5);
+                        if (increase)
+                        {
+                            scaleChange = new Vector3(deltaScale, 0, z);
+                            positionChange = new Vector3(deltaScale * 5, 0, z * 5);
+                        }
+                        else
+                        {
+                            scaleChange = new Vector3(-deltaScale, 0, -z);
+                            positionChange = new Vector3(-deltaScale * 5, 0, -z * 5);
+                        }
+                        transform.transform.localScale += scaleChange;
+                        transform.transform.position += positionChange;
+
+                        // Move upwards when the sphere hits the floor or downwards
+                        // when the sphere scale extends 1.0f.
+                        if (transform.transform.localScale.y < 0.01f || transform.transform.localScale.y > 10.0f)
+                        {
+                            increase = !increase;
+                        }
+                        //Debug.Log("MouseDrag: Scale");
+                        //panel.transform.localScale = transform.localScale;
+                        EditorController.instance.SizeX.text = transform.localScale.x.ToString();
+                        EditorController.instance.SizeY.text = transform.localScale.z.ToString();
                     }
-                    //Debug.Log("MouseDrag: Scale");
-                    panel.transform.localScale = transform.localScale;
                     break;
                 case Tools.Rectangle:
                     //Debug.Log("MouseDrag: Rectangle");

+ 29 - 13
Assets/Scripts/Controllers/EditorController.cs

@@ -56,7 +56,7 @@ public class EditorController : MonoBehaviour
 
         ButtonAddBeacon.onClick.AddListener(() => {
             AddBeacon(company);
-            
+
         });
 
         var random = new System.Random();
@@ -95,18 +95,17 @@ public class EditorController : MonoBehaviour
             DropdownLocation.options.Add(new Dropdown.OptionData("Новая локация"));
 
             DropdownLocation.RefreshShownValue();
-        }       
+        }
     }
 
-
     // Update is called once per frame
     void Update()
     {
-        if (company.active_location >= 0 && company.locations != null)
-        {
-            var l = company.locations[company.locations_index[company.active_location]];
-            l.plane.GetComponent<TouchScript>().Resize = ToggleScalePanel.isOn;
-        }
+        //if (company.active_location >= 0 && company.locations != null)
+        //{
+        //    var l = company.locations[company.locations_index[company.active_location]];
+        //    l.plane.GetComponent<TouchScript>().Resize = ToggleScalePanel.isOn;
+        //}
     }
 
     string texture_url = "";
@@ -118,12 +117,16 @@ public class EditorController : MonoBehaviour
     public void UpdatePanel()
     {
         var p = company.locations[company.locations_index[company.active_location]].plane;
-        if (!Image.text.Equals(texture_url))
-        {
-            StartCoroutine(SendingFormController.LoadImage(Image.text, p));
-            texture_url = Image.text;
-        }
+        //if (!Image.text.Equals(texture_url))
+        //{
+        StartCoroutine(SendingFormController.LoadImage(Image.text, p, Vector3.zero, Vector3.zero, LoadTexture));
+        texture_url = Image.text;
+        //}
+    }
 
+    public void UpdatePanelSize()
+    {
+        var p = company.locations[company.locations_index[company.active_location]].plane;
         var x = 1f;
         if (!SizeX.text.Equals(""))
             x = float.Parse(SizeX.text, CultureInfo.InvariantCulture);
@@ -135,6 +138,19 @@ public class EditorController : MonoBehaviour
         p.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
     }
 
+    //public void LoadTexture(Texture2D texture)
+    //{
+    //    var p = company.locations[company.locations_index[company.active_location]].plane;
+    //    Renderer renderer = p.GetComponent<Renderer>();
+    //    renderer.material.mainTexture = texture;        
+    //}
+
+    public void LoadTexture(float x, float y)
+    {
+        SizeX.text = x.ToString();
+        SizeY.text = y.ToString();
+    }
+
     public void Save()
     {
         //SceneManager.LoadScene("Location");

+ 1 - 0
Assets/Scripts/Controllers/FileBrowserController.cs

@@ -117,6 +117,7 @@ public class FileBrowserController : MonoBehaviour, IPointerDownHandler
         {
             Debug.Log("Uploaded");
             inputField.text = $"{Application.streamingAssetsPath}/{file_name}";
+            EditorController.instance.UpdatePanel();
         }
         Debug.Log(www.downloadHandler.text);
     }

+ 1 - 2
Assets/Scripts/Controllers/LocationController.cs

@@ -67,7 +67,6 @@ public class LocationController : MonoBehaviour
     }
 
 
-
     public static void Cube(GameObject cube, Vector3 cube_size, Vector2 position = new Vector2(), float wall_thickness = 0.01f)
     {
         //GameObject cube = GameObject.Find("Cube");
@@ -196,7 +195,7 @@ public class LocationController : MonoBehaviour
     /// </summary>
     public void GroundTexture(string url)
     {
-        StartCoroutine(SendingFormController.LoadImage(url, Ground));
+        StartCoroutine(SendingFormController.LoadImage(url, Ground, Ground.transform.position, Ground.transform.localScale));
     }
 
     public void GroundResize(float x, float y)

+ 11 - 6
Assets/Scripts/Controllers/SendingFormController.cs

@@ -127,10 +127,16 @@ public class SendingFormController : MonoBehaviour
          img.sprite = Sprite.Create(www.texture, new Rect(0, 0, www.texture.width, www.texture.height), new Vector2(0, 0));
      }*/
 
-
-    public static IEnumerator LoadImage(string url, GameObject plane, Vector3 pos = new Vector3(), Vector3 scale = new Vector3())
+    /// <summary>
+    /// https://forum.unity.com/threads/no-access-control-allow-origin-header.819588/
+    /// </summary>
+    /// <param name="url"></param>
+    /// <param name="plane"></param>
+    /// <param name="pos"></param>
+    /// <param name="scale"></param>
+    /// <returns></returns>
+    public static IEnumerator LoadImage(string url, GameObject plane, Vector3 pos = new Vector3(), Vector3 scale = new Vector3(), Action<float, float> callback = null)
     {
-
         //string url = "https://example.com/image.jpeg";
         ////WWWForm form = new WWWForm();
         ////var headers = form.headers;
@@ -155,9 +161,7 @@ public class SendingFormController : MonoBehaviour
             }
             else
             {
-                //Texture2D texture = new Texture2D(1, 1);
                 var texture = DownloadHandlerTexture.GetContent(img);
-                //img.LoadImageIntoTexture(texture);
 
                 Renderer renderer = plane.GetComponent<Renderer>();
                 renderer.material.mainTexture = texture;
@@ -170,7 +174,8 @@ public class SendingFormController : MonoBehaviour
                 if (pos.x == 0 && pos.z == 0)
                     plane.transform.position = new Vector3(scale.x * 5, 0, scale.z * 5);
                 else plane.transform.position = pos;
-                //GetComponent<Renderer>().material.mainTexture = img.texture;
+
+                callback?.Invoke(scale.x, scale.z);
             }
         }
 

+ 42 - 43
Assets/Scripts/Controllers/ToolsController.cs

@@ -38,7 +38,6 @@ public class ToolsController : MonoBehaviour
     enum Tools { Wall, Room, Del, Cursor};
    // Tools tools = Tools.Cursor;
 
-
     // Start is called before the first frame update
     void Start()
     {
@@ -170,8 +169,8 @@ public class ToolsController : MonoBehaviour
 
     public static void SelectButton(Button button, Button old_button)
     {
-        var color = new Color();
-        ColorUtility.TryParseHtmlString("#C8C8C8", out color);
+        //var color = new Color();
+        ColorUtility.TryParseHtmlString("#C8C8C8", out var color);
         if (old_button != null) old_button.GetComponent<Image>().color = Color.white;
         button.GetComponent<Image>().color = color;
     }
@@ -191,50 +190,50 @@ public class ToolsController : MonoBehaviour
     /// <summary>
     /// old
     /// </summary>
-    public void OpenFileBrowser()
-    {
-       StartCoroutine(ShowLoadDialogCoroutine($"Выбор карты"));
-    }
+    //public void OpenFileBrowser()
+    //{
+    //   StartCoroutine(ShowLoadDialogCoroutine($"Выбор карты"));
+    //}
 
     /// <summary>
     /// old
     /// </summary>
     /// <param name="name_view"></param>
     /// <returns></returns>
-    IEnumerator ShowLoadDialogCoroutine(string name_view)
-    {
-        FileBrowser.SetFilters(true, new FileBrowser.Filter("Images", ".jpg", ".png"));
-        FileBrowser.SetDefaultFilter(".jpg");
-        //FileBrowser.AddQuickLink("Users", "C:\\Users", null);
-
-        // Show a load file dialog and wait for a response from user
-        // Load file/folder: file, Initial path: default (Documents), Title: "Load File", submit button text: "Load"
-        yield return FileBrowser.WaitForLoadDialog(false, null, name_view, "Load");
-
-        // Dialog is closed
-        // Print whether a file is chosen (FileBrowser.Success)
-        // and the path to the selected file (FileBrowser.Result) (null, if FileBrowser.Success is false)
-        Debug.Log(FileBrowser.Success + " " + FileBrowser.Result);
-
-        if (FileBrowser.Success)
-        {
-            var go = GameObject.Find("InputField_Image");
-            if (go != null)
-            {
-                var ifield = go.GetComponent<InputField>();
-                if (ifield != null)
-                {
-                    ifield.text = FileBrowser.Result;
-                }
-            }
-            // If a file was chosen, read its bytes via FileBrowserHelpers
-            // Contrary to File.ReadAllBytes, this function works on Android 10+, as well
-            byte[] bytes = FileBrowserHelpers.ReadBytesFromFile(FileBrowser.Result);
-            var loc = CompanyController.instance.GetActiveLocation();
-            if (loc != null)
-            {
-                loc.SaveTexture(bytes);
-            }
-        }
-    }
+    //IEnumerator ShowLoadDialogCoroutine(string name_view)
+    //{
+    //    FileBrowser.SetFilters(true, new FileBrowser.Filter("Images", ".jpg", ".png"));
+    //    FileBrowser.SetDefaultFilter(".jpg");
+    //    //FileBrowser.AddQuickLink("Users", "C:\\Users", null);
+
+    //    // Show a load file dialog and wait for a response from user
+    //    // Load file/folder: file, Initial path: default (Documents), Title: "Load File", submit button text: "Load"
+    //    yield return FileBrowser.WaitForLoadDialog(false, null, name_view, "Load");
+
+    //    // Dialog is closed
+    //    // Print whether a file is chosen (FileBrowser.Success)
+    //    // and the path to the selected file (FileBrowser.Result) (null, if FileBrowser.Success is false)
+    //    Debug.Log(FileBrowser.Success + " " + FileBrowser.Result);
+
+    //    if (FileBrowser.Success)
+    //    {
+    //        var go = GameObject.Find("InputField_Image");
+    //        if (go != null)
+    //        {
+    //            var ifield = go.GetComponent<InputField>();
+    //            if (ifield != null)
+    //            {
+    //                ifield.text = FileBrowser.Result;
+    //            }
+    //        }
+    //        // If a file was chosen, read its bytes via FileBrowserHelpers
+    //        // Contrary to File.ReadAllBytes, this function works on Android 10+, as well
+    //        byte[] bytes = FileBrowserHelpers.ReadBytesFromFile(FileBrowser.Result);
+    //        var loc = CompanyController.instance.GetActiveLocation();
+    //        if (loc != null)
+    //        {
+    //            loc.SaveTexture(bytes);
+    //        }
+    //    }
+    //}
 }