zhaoyang 2 жил өмнө
parent
commit
02849c14c7

+ 1 - 1
FGUIProject/assets/Store/StoreUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920" designImageOffsetY="-240">
+<component size="1080,1920" overflow="hidden" designImageOffsetY="-240">
   <displayList>
   <displayList>
     <image id="n21_hhx9" name="n21" src="hhx91q" fileName="imagesNew/sc_beijing.png" xy="0,-240"/>
     <image id="n21_hhx9" name="n21" src="hhx91q" fileName="imagesNew/sc_beijing.png" xy="0,-240"/>
     <loader id="n0_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
     <loader id="n0_fqor" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -357,6 +357,7 @@ namespace GFGGame
             GameObject myRole = _sceneObject.transform.Find("MyRole").Find("Role").gameObject;
             GameObject myRole = _sceneObject.transform.Find("MyRole").Find("Role").gameObject;
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, myRole, false);
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, myRole, false);
             MyDressUpHelper.dressUpObj.PutOnItemList(_dataManager.DressupList[0].itemList);
             MyDressUpHelper.dressUpObj.PutOnItemList(_dataManager.DressupList[0].itemList);
+            myRole.transform.localPosition = Vector3.zero;
 
 
             GameObject targetRole = _sceneObject.transform.Find("TargetRole").Find("Role").gameObject;
             GameObject targetRole = _sceneObject.transform.Find("TargetRole").Find("Role").gameObject;
             targetRole.SetActive(false);
             targetRole.SetActive(false);

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -12,7 +12,7 @@ namespace GFGGame
         private UI_ComModel _comModel;
         private UI_ComModel _comModel;
         private DressUpObjUI _dressUpObjUI;
         private DressUpObjUI _dressUpObjUI;
         private LuckyBoxCfg _luckyBoxCfg;
         private LuckyBoxCfg _luckyBoxCfg;
-        private const int _turnTime = 3;
+        private const int _turnTime = 8;
         private int _curTime = _turnTime;
         private int _curTime = _turnTime;
         private int _bgIndex = 0;
         private int _bgIndex = 0;
         private int _modelIndex = 0;
         private int _modelIndex = 0;
@@ -45,10 +45,11 @@ namespace GFGGame
         private void UpdateTime(object param)
         private void UpdateTime(object param)
         {
         {
             _curTime = _curTime - 1 == 0 ? _turnTime : _curTime - 1;
             _curTime = _curTime - 1 == 0 ? _turnTime : _curTime - 1;
-            _bgIndex = _bgIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _bgIndex + 1;
-            _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitShowArr.Length ? 0 : _modelIndex + 1;
+
             if (_curTime == _turnTime)
             if (_curTime == _turnTime)
             {
             {
+                _bgIndex = _bgIndex + 1 == _luckyBoxCfg.resArr.Length ? 0 : _bgIndex + 1;
+                _modelIndex = _modelIndex + 1 == _luckyBoxCfg.suitShowArr.Length ? 0 : _modelIndex + 1;
                 if (_luckyBoxCfg.resArr.Length > 1)
                 if (_luckyBoxCfg.resArr.Length > 1)
                 {
                 {
                     _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);
                     _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_bgIndex]);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -183,7 +183,7 @@ namespace GFGGame
         }
         }
         private void OnClikcBtnShop()
         private void OnClikcBtnShop()
         {
         {
-
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
         }
         private void OnClikcBtnGiftBag()
         private void OnClikcBtnGiftBag()
         {
         {

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -103,6 +103,7 @@ namespace GFGGame
         {
         {
             ViewManager.Hide(_curViewName);
             ViewManager.Hide(_curViewName);
             this.Hide();
             this.Hide();
+            // ViewManager.GoBackFrom(typeof(StoreView).FullName);
         }
         }
 
 
         private void OnTabChange()
         private void OnTabChange()

+ 1 - 1
GameClient/Assets/ResIn/Prefab/SceneArena.prefab

@@ -432,7 +432,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7684116393383725891}
   m_GameObject: {fileID: 7684116393383725891}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   m_Children:
   - {fileID: 4342571773848954758}
   - {fileID: 4342571773848954758}

BIN
GameClient/Assets/ResIn/UI/Store/Store_fui.bytes