Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/AssetBundleBuilderSetting.asset

@@ -17,6 +17,6 @@ MonoBehaviour:
   BuildPackage: GameLogic
   CompressOption: 2
   OutputNameStyle: 1
-  CopyBuildinFileOption: 2
+  CopyBuildinFileOption: 4
   CopyBuildinFileTags: preload
   EncyptionClassName: EncryptionNone

GameClient/Assets/Editor/BuildEditor/PreloadAssetHelper.cs

@@ -44,7 +44,6 @@ namespace GFGEditor
                 {
                     var resPath = ResPathUtil.GetSceneBgPath(cfg.bgRes);
                     preloadFiles.Add(resPath);
-                    Debug.Log($"preload StoryDialogCfg cfg.bgRes {cfg.bgRes} resPath {resPath}");
                 }
             }
 
@@ -54,7 +53,10 @@ namespace GFGEditor
                 {
                     var packageBundle = manifest.BundleList[packageAsset.BundleID];
                     if (bundles.Contains(packageBundle) == false)
+                    {
                         bundles.Add(packageBundle);
+                        Debug.Log($"preload assetPath {assetPath}");
+                    }
                 }
             }
 
@@ -66,7 +68,7 @@ namespace GFGEditor
                 //...... //拷贝文件
                 string sourcePath = $"{dirPath}/{packageBundle.FileName}";
                 File.Copy(sourcePath, destPath, true);
-                Debug.Log($"sourcePath { sourcePath}");
+                //Debug.Log($"sourcePath { sourcePath}");
                 Debug.Log($"destPath { destPath}");
             }
         }

GameClient/Assets/GFGAsset/PreloadFiles.asset

@@ -20,3 +20,4 @@ MonoBehaviour:
   - Assets/Res/Texture/DressUp/lianyiqun_ys.png
   - Assets/Res/Texture/DressUp/shangyi_ys.png
   - Assets/Res/Texture/DressUp/xiazhuang_ys.png
+  - Assets/Res/Texture/SceneBg/sanmiaoy_bg.jpg

GameClient/Assets/Game/HotUpdate/DressUp/DressUpLayerOperation.cs

@@ -270,7 +270,8 @@ namespace GFGGame
                 DressUpUtil.AddSpriteObj(this.resPath, spritObjName, parentObj, sortingOrder, needSetMask);
                 if (removeBodyAni)
                 {
-                    parentObj.transform.SetPositionAndRotation(Vector3.zero, Quaternion.identity); 
+                    parentObj.transform.localPosition = Vector3.zero;
+                    parentObj.transform.localRotation = Quaternion.identity;
                 }
             }
             if (!string.IsNullOrEmpty(effectResPath))

GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -331,7 +331,8 @@ namespace GFGGame
                     dressUpBodyOffsetInfo.Rotation = gameObj.transform.localRotation;
                 }
                 //如果是动作动画，就根据动画位置及角度信息设置给Role对象
-                parentObj.transform.SetPositionAndRotation(dressUpBodyOffsetInfo.OffsetPosition, dressUpBodyOffsetInfo.Rotation);
+                parentObj.transform.localPosition = dressUpBodyOffsetInfo.OffsetPosition;
+                parentObj.transform.rotation = dressUpBodyOffsetInfo.Rotation;
                 gameObj.transform.localPosition = Vector3.zero;
                 gameObj.transform.rotation = Quaternion.identity;
                 //.SetPositionAndRotation(Vector3.zero, Quaternion.identity); 

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -121,7 +121,7 @@ namespace GFGGame
         {
             _bgIndex = 0;
             _modelIndex = 0;
-            _dressUpObjUI.ResetSceneObj(0, false, false, null, false);
+            _dressUpObjUI.dressUpObj.TakeOffAll();
             UI_ComModel _comModel = UI_ComModel.Proxy(_com);
             _comModel.m_comModelRes.m_loaRes.url = "";
             UI_ComModel.ProxyEnd();

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -95,7 +95,7 @@ namespace GFGGame
         }
         private void UpdateTime(object param)
         {
-            if (ActivityDataManager.Instance.actLimitChargeId > 0)
+            if (ActivityDataManager.Instance.actLimitChargeId > 0 || _limitChargeInfo.Count > 0)
             {
                 for (int i = 0; i < _limitChargeInfo.Count; i++)
                 {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -43,7 +43,7 @@ namespace GFGGame
 
             _ui.m_listTab.selectedIndex = 0;
             _ui.m_listType.selectedIndex = 0;
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
+            _ui.m_loaBg.url = "ui://Main/zhangjie_bg";//ResPathUtil.GetBgImgPath("zxian_bg3");
 
             _ui.m_listChapter.scrollPane.onScroll.Add(DoSpecialEffect);//滚动时派发事件
 
@@ -76,6 +76,7 @@ namespace GFGGame
 
             Timers.inst.Remove(CheckGuide);
             Timers.inst.Remove(OnTimerUpdate);
+            Timers.inst.Remove(DoSpecialEffect);
         }
 
         private void OnClickBtnBack()
@@ -107,7 +108,7 @@ namespace GFGGame
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             //这里变成-1，是因为调整了item，最左右两边现在有item但是是透明没数据的
             int index = chapterCfg.order - 1;
-            index = Mathf.Clamp(index, 0, _ui.m_listChapter.numItems - 2);
+            //index = Mathf.Clamp(index, 0, _ui.m_listChapter.numItems - 2);
             int firstChildIndex = _ui.m_listChapter.GetFirstChildInView();
             if (firstChildIndex != index)
             {
@@ -288,6 +289,7 @@ namespace GFGGame
             }
             _timeCount = 0;
             Timers.inst.Add(0.1f, _ui.m_listChapter.numChildren , OnTimerUpdate, 1);
+            DoSpecialEffect();
         }
         private void CheckGuide(object param)
         {
@@ -323,18 +325,18 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");
         }
 
-        private void DoSpecialEffect()
+        private void DoSpecialEffect(object parm = null)
         {
-            float listCenter = _ui.m_listChapter.scrollPane.posX + _ui.m_listChapter.viewWidth / 2;
+            //scrollPane.scrollingPosX这个实时变化，。scrollPane.posX这个使用ScrlootoVIew直接取终值
+            float listCenter = _ui.m_listChapter.scrollPane.scrollingPosX + _ui.m_listChapter.viewWidth / 2;
             float listLeft = _ui.m_listChapter.scrollPane.posX + _ui.m_listChapter.viewWidth / 2; ;
-            //list组件的x值，加上list组件自身宽度的一半，设置为对标的中心x值
             for (int i = 0; i < _ui.m_listChapter.numChildren; i++)
             {
                 GObject item = _ui.m_listChapter.GetChildAt(i);
                 float itemCenter = item.x + item.width / 2;//循环列表内元素的中心x值
                 float itemWidth = item.width;//列表元素的宽度
                 float distance = Mathf.Abs(listCenter - itemCenter);
-                if (distance < item.width)
+               // if (distance < item.width)
                 {
                     float distanceRange = 1 + (1 - distance / itemWidth) * 0.3f;//使放大动画有渐进效果
                     item.SetScale(distanceRange, distanceRange);//设置放大比例
@@ -350,16 +352,10 @@ namespace GFGGame
                         listItem.m_content.m_compPic.m_pic.color = new Color(0.4f, 0.4f, 0.4f, 1.000f);
                     }
                 }
-                else
-                {
-                    //设置颜色变化
-                    UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(_ui.m_listChapter.GetChildAt(i));
-                    listItem.m_content.m_compPic.m_pic.color = new Color(0.4f, 0.4f, 0.4f, 1.000f);
-                    item.SetScale(1.0f, 1.0f);
-                }
                 float distanceX = ((1 - (listCenter - itemCenter)) / itemWidth) * 0.05f;//使y轴移动有渐进效果
                 item.y = -_ui.m_listChapter.height * distanceX;
             }
         }
-    }
+        
+      }
 }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -21,6 +21,8 @@ namespace GFGGame
         private int currentDifficulty;
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
             if (_comEff != null)
             {
                 _comEff.RemoveFromParent();
@@ -31,8 +33,6 @@ namespace GFGGame
                 _valueBarController.Dispose();
                 _valueBarController = null;
             }
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -71,7 +71,7 @@ namespace GFGGame
             {
                 OnClickBonusBox(_ui.m_bonusBox3, 2);
             });
-            _ui.m_loaBg.url = "ui://Main/zhangjie_bg";//ResPathUtil.GetBgImgPath("zxian_bg3");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
 
             _comEff = new GComponent();
             _comEff = UIPackage.CreateObject(UI_MainUI.PACKAGE_NAME, "ComEff").asCom;

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -156,7 +156,8 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -160,7 +160,8 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
 

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -110,7 +110,8 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneFightResult"));
-                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
+                MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false, null, true);
+                MyDressUpHelper.dressUpObj.AddOrRemove(180014, false);
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(roleData.itemList);
 

GameClient/Assets/Resources/BuildinFileManifest.asset

@@ -101,13 +101,13 @@ MonoBehaviour:
   - 52bf99954f34b61d9766e35b50d7d602.bundle
   - 5315f1a5c5e4bb9824ee9c8d3578b23f.bundle
   - 532594f3077543a4a25f8919cb2c8468.bundle
+  - 53f59600170f8f1e4848b8718cb1349d.bundle
   - 5755769bcf9eacabf117f0514c541247.bundle
   - 57fbaa65226c7dd05c4abbd3a66ddb58.bundle
   - 59008fe3484e1a7a4a90ca2a0939da2d.bundle
   - 598320e2a6c3233413bdbe834d19f568.bundle
   - 59990f8db90cdebc0bf07230fbe24be3.bundle
   - 59de46f6096f778d45f5d1e4fc176606.bundle
-  - 5b1630b2feba8a46e1cf40403d4d7f05.bundle
   - 5c044014844579395ac3733be5835bba.bundle
   - 5c3a89599bf59fa23e211f950e57fa3d.bundle
   - 5c67c6d67753c4fd92ed3016c1b5f6ba.bundle
@@ -173,6 +173,7 @@ MonoBehaviour:
   - 9e27821383225233c3ef6613e6b4102d.bundle
   - a1b314be0a5113e747bcfc9d949ed6e5.bundle
   - a27218799e24f02f000038af5f5e621e.bundle
+  - a3189ea2f009efcd8190cd349fe33192.bundle
   - a74042e18051c7f520349ce4880a2ebb.bundle
   - ac00e9d1615c80397acbb09309d57792.bundle
   - ac57be5e35b817947c0c83a98608f8e8.bundle
@@ -182,6 +183,7 @@ MonoBehaviour:
   - aee0833c800865e627f3a7f52a483d3b.bundle
   - af783527a505fbbec73564b3321d8c58.bundle
   - b08bd44fc59ef9b98968120abbfffa09.bundle
+  - b0a595b6a0c5c957af8a120553cf9a3f.bundle
   - b3672f1c19a9d9ec7054aed59298aa54.bundle
   - b3aeef69577122f64d613ba1e7fb9d04.bundle
   - b422c8b6cbbde5ee1566a92dd2d5598d.bundle

GameClient/Assets/link.xml

@@ -5,4 +5,8 @@
 	</assembly>
 	<assembly fullname="UnityEngine.CoreModule" preserve="all">
 	</assembly>
+	<assembly fullname="UnityEngine.DirectorModule" preserve="all">
+	</assembly>
+	<assembly fullname="Unity.Timeline" preserve="all">
+	</assembly>
 </linker>