Browse Source

千山万水

zhaoyang 2 years ago
parent
commit
1b9cce9c38

+ 2 - 2
FGUIProject/assets/poem/PoemPhotoPreviewUI.xml

@@ -20,11 +20,11 @@
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     </list>
-    <component id="n12_11rzz" name="btnLeft" src="uyux10d" fileName="components/Button8.xml" xy="106,960" pivot="0.5,0.5" anchor="true" rotation="180">
+    <component id="n12_11rzz" name="btnLeft" src="uyux10d" fileName="components/Button8.xml" xy="98,960" pivot="0.5,0.5" anchor="true" rotation="180">
       <relation target="" sidePair="middle-middle"/>
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://eg2y0ldpuyuxtj3"/>
       <Button icon="ui://eg2y0ldpuyuxtj3"/>
     </component>
     </component>
-    <component id="n13_11rzz" name="btnRight" src="uyux10d" fileName="components/Button8.xml" xy="971,960" pivot="0.5,0.5" anchor="true">
+    <component id="n13_11rzz" name="btnRight" src="uyux10d" fileName="components/Button8.xml" xy="980,960" pivot="0.5,0.5" anchor="true">
       <relation target="" sidePair="middle-middle"/>
       <relation target="" sidePair="middle-middle"/>
       <Button icon="ui://eg2y0ldpuyuxtj3"/>
       <Button icon="ui://eg2y0ldpuyuxtj3"/>
     </component>
     </component>

+ 4 - 4
FGUIProject/assets/poem/components/Button8.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="90,90" extention="Button">
 <component size="90,90" extention="Button">
-  <Button/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
-    <image id="n0_uyux" src="uyux10b" name="n0" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+    <image id="n0_uyux" name="n0" src="uyux10b" fileName="photImages/xc_xzxzz.png" xy="45,45" pivot="0.5,0.5" anchor="true">
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
     </image>
   </displayList>
   </displayList>
+  <Button/>
 </component>
 </component>

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

@@ -62,7 +62,7 @@ namespace GFGGame
             List<PoemPhotoData> photoInfos = (this.viewData as object[])[1] as List<PoemPhotoData>;
             List<PoemPhotoData> photoInfos = (this.viewData as object[])[1] as List<PoemPhotoData>;
             _photoInfos = new List<PoemPhotoData>(photoInfos.ToArray());
             _photoInfos = new List<PoemPhotoData>(photoInfos.ToArray());
 
 
-             _sourceType = (int)(this.viewData as object[])[2];
+            _sourceType = (int)(this.viewData as object[])[2];
             _ui.m_c1.selectedIndex = _sourceType;
             _ui.m_c1.selectedIndex = _sourceType;
             if (_sourceType == (int)PictureSourceType.PersonalAlbum)
             if (_sourceType == (int)PictureSourceType.PersonalAlbum)
             {
             {
@@ -97,8 +97,8 @@ namespace GFGGame
         }
         }
         private void UpdateView(bool ani = false)
         private void UpdateView(bool ani = false)
         {
         {
-            _ui.m_btnLeft.enabled = _curIndex > 0;
-            _ui.m_btnRight.enabled = _curIndex < _list.numItems - 1;
+            _ui.m_btnLeft.grayed = _curIndex <= 0;
+            _ui.m_btnRight.grayed = _curIndex >= _list.numItems - 1;
             _ui.m_txtTime.text = TimeUtil.FormattingTime1(_photoInfos[_curIndex].CreationTime);
             _ui.m_txtTime.text = TimeUtil.FormattingTime1(_photoInfos[_curIndex].CreationTime);
             _ui.m_btnLock.m_c1.selectedIndex = _photoInfos[_curIndex].LockingStatus ? 1 : 0;
             _ui.m_btnLock.m_c1.selectedIndex = _photoInfos[_curIndex].LockingStatus ? 1 : 0;
             _ui.m_btnUp.m_c1.selectedIndex = _photoInfos[_curIndex].ToppingStatus ? 1 : 0;
             _ui.m_btnUp.m_c1.selectedIndex = _photoInfos[_curIndex].ToppingStatus ? 1 : 0;
@@ -131,13 +131,13 @@ namespace GFGGame
         {
         {
             UI_ComPostcard item = UI_ComPostcard.Proxy(obj);
             UI_ComPostcard item = UI_ComPostcard.Proxy(obj);
 
 
-            PoemPhotoData photoData = _photoInfos[_curIndex];
+            PoemPhotoData photoData = _photoInfos[index];
             TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(photoData.TravelLocationId);
             TravelLoactionCfg loactionCfg = TravelLoactionCfgArray.Instance.GetCfg(photoData.TravelLocationId);
 
 
             item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
             item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
             item.m_txtLocationName.text = loactionCfg.name;
             item.m_txtLocationName.text = loactionCfg.name;
             item.m_txtTime.text = TimeUtil.FormattingTime2(photoData.CreationTime);
             item.m_txtTime.text = TimeUtil.FormattingTime2(photoData.CreationTime);
-
+            item.m_comTravel.m_loaRole.url = "";
             if (photoData.TravelSuitId > 0)
             if (photoData.TravelSuitId > 0)
             {
             {
                 TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(photoData.TravelSuitId);
                 TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(photoData.TravelSuitId);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

@@ -65,7 +65,7 @@ namespace GFGGame
                 _ui.m_comPostcard.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
                 _ui.m_comPostcard.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
                 _ui.m_comPostcard.m_txtLocationName.text = loactionCfg.name;
                 _ui.m_comPostcard.m_txtLocationName.text = loactionCfg.name;
                 _ui.m_comPostcard.m_txtTime.text = TimeUtil.FormattingTime2(_curPhotoData.CreationTime);
                 _ui.m_comPostcard.m_txtTime.text = TimeUtil.FormattingTime2(_curPhotoData.CreationTime);
-
+                _ui.m_comPostcard.m_comTravel.m_loaRole.url = "";
                 if (_curPhotoData.TravelSuitId > 0)
                 if (_curPhotoData.TravelSuitId > 0)
                 {
                 {
                     TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(_curPhotoData.TravelSuitId);
                     TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(_curPhotoData.TravelSuitId);

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs

@@ -166,6 +166,7 @@ namespace GFGGame
 
 
             item.m_imgSelect.visible = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0;
             item.m_imgSelect.visible = _ui.m_c2.selectedIndex == 1 && _listDelete.IndexOf(_photoInfos[index].PictureId) >= 0;
             item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
             item.m_comTravel.m_loaBg.url = ResPathUtil.GetTravelBgPath(loactionCfg.res);
+            item.m_comTravel.m_loaRole.url = "";
             if (poemPhotoData.TravelSuitId > 0)
             if (poemPhotoData.TravelSuitId > 0)
             {
             {
                 TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(poemPhotoData.TravelSuitId);
                 TravelSuitCfg travelSuitCfg = TravelSuitCfgArray.Instance.GetCfg(poemPhotoData.TravelSuitId);

BIN
GameClient/Assets/ResIn/UI/Poem/Poem_fui.bytes