Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

# Conflicts:
#	GameClient/Packages/manifest.json

FGUIProject/assets/LuckyBox/components/ComListBgItem.xml

@@ -2,14 +2,14 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1,,2," selected="0"/>
   <displayList>
-    <loader id="n25_vek8" name="loaBg" xy="0,-240" size="1080,2400" url="ui://drx9d1usvek8x" autoSize="true">
+    <loader id="n25_vek8" name="loaBg" xy="0,-240" size="1080,2400" url="ui://drx9d1useshh1f" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <loader id="n26_vek8" name="n26" xy="0,1378" size="1080,542" url="ui://drx9d1usvek8s" autoSize="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="" sidePair="bottom-bottom"/>
     </loader>
-    <text id="n28_vek8" name="txtTime" xy="626,614" size="55,902" fontSize="40" color="#fffbdd" align="center" vAlign="middle" autoSize="none" text="剩余81天">
+    <text id="n28_vek8" name="txtTime" xy="324,409" size="55,902" fontSize="40" color="#fffbdd" align="center" vAlign="middle" autoSize="none" text="剩余81天">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="height-height,top-top"/>
     </text>

FGUIProject/assets/LuckyBox/package.xml

@@ -43,6 +43,7 @@
     <component id="qdrt1c" name="Button4.xml" path="/components/"/>
     <image id="ly9g1d" name="cj_xhua.png" path="/images/"/>
     <component id="ly9g1e" name="Button5.xml" path="/components/"/>
+    <image id="eshh1f" name="cj_bj_4.jpg" path="/images/" exported="true" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -19,7 +19,7 @@
     </component>
     <component id="n15_mza1" name="comMineCircle" src="v3k9cv" fileName="components/comMineCircle.xml" xy="350,641" pivot="0.5,0.5" anchor="true" visible="false"/>
     <component id="n17_mza1" name="comTargetCircle" src="v3k9c4" fileName="components/comTargetCircle.xml" xy="730,641" pivot="0.5,0.5" anchor="true" visible="false"/>
-    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="133,895"/>
+    <component id="n25_vbe8" name="ComShieldMine" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="157,883"/>
     <component id="n27_vbe8" name="ComShieldNpc" src="v3k9c3" fileName="components/ComSkillShield.xml" xy="712,895"/>
     <component id="n24_vbe8" name="proMinusMine" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="190,820">
       <ProgressBar value="100" max="100"/>
@@ -27,10 +27,10 @@
     <component id="n26_vbe8" name="proMinusNpc" src="mhyhd4" fileName="components/ProgressBar2.xml" xy="708,820">
       <ProgressBar value="100" max="100"/>
     </component>
-    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
-    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="100,914"/>
-    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
-    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="v3k9c1" fileName="components/ComRoleSkillScore.xml" xy="620,914"/>
+    <component id="n29_uj53" name="ComRoleSkillMineAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="60,914"/>
+    <component id="n34_pcn0" name="ComRoleSkillMineMinus" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="40,914" controller="c1,0"/>
+    <component id="n33_uj53" name="ComRoleSkillNpcAdd" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="590,914"/>
+    <component id="n35_pcn0" name="ComRoleSkillNpcMinus" src="lki4db" fileName="components/ComRoleSkill1.xml" xy="40,914" controller="c1,1"/>
     <component id="n1_8xpg" name="selfName" src="8xpg41" fileName="components/CompFightResultName.xml" xy="48,1499">
       <relation target="" sidePair="bottom-bottom"/>
     </component>

FGUIProject/assets/Main/StoryFightTargetUI.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <component id="n0_8xpg" name="roleName" src="8xpg3s" fileName="components/CompFightNameRole.xml" xy="50,521">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n0_8xpg" name="roleName" src="8xpg3s" fileName="components/CompFightNameRole.xml" xy="50,718">
+      <relation target="" sidePair="bottomext-bottom,leftext-left"/>
     </component>
-    <component id="n1_8xpg" name="targetName" src="8xpg3t" fileName="components/CompFightNameTarget.xml" xy="920,1138">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <component id="n1_8xpg" name="targetName" src="8xpg3t" fileName="components/CompFightNameTarget.xml" xy="920,718">
+      <relation target="" sidePair="rightext-right,bottomext-bottom"/>
     </component>
     <component id="n2_8xpg" name="aniFightIcon" src="8xpg3u" fileName="components/CompAnimationFightIcon.xml" xy="271,672">
       <relation target="" sidePair="center-center,middle-middle"/>

FGUIProject/assets/Main/components/ButtonModle1.xml

@@ -3,6 +3,12 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n1_wg7t" name="icon" xy="127,130" pivot="0.5,0.5" anchor="true" size="254,260" url="ui://mfvz4q8kq08xi" autoSize="true"/>
+    <graph id="n2_lki4" name="holder" xy="127,130" size="0,0" touchable="false">
+      <relation target="" sidePair="height-height"/>
+    </graph>
+    <graph id="n4_lki4" name="holder1" xy="127,130" size="0,0" visible="false" touchable="false">
+      <relation target="" sidePair="height-height"/>
+    </graph>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/Main/components/ComRoleSkill.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="360,360">
-  <controller name="c1" pages="0,,1," selected="1"/>
+<component size="400,450">
   <displayList>
-    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="0,0"/>
-    <text id="n29_uj53" name="txtScore" xy="180,205" pivot="0.5,0" anchor="true" size="231,59" font="ui://mfvz4q8kvuz5b5" fontSize="55" color="#5dd05d" vars="true" text="-{count=10086}">
-      <gearText controller="c1" pages="0,1" values="+{count=9000}|-{count=10086}"/>
-    </text>
-    <image id="n31_v3k9" name="n31" src="v3k9cg" fileName="imagesStory/zd_jnsxzi_1.png" xy="79,101">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n32_v3k9" name="n32" src="v3k9ch" fileName="imagesStory/zd_jnsxzi_2.png" xy="79,101">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
+    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="128,0" pivot="0.5,0.5" size="243,243" group="n34_lki4" aspect="true"/>
+    <text id="n33_lki4" name="txtResult" xy="94,123" pivot="0.5,0.5" anchor="true" size="68,114" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="110" color="#5dd05d" vars="true" text="+"/>
+    <text id="n29_uj53" name="txtScore" xy="249,122" pivot="0.5,0.5" anchor="true" size="203,74" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="70" color="#5dd05d" align="center" vars="true" autoSize="none" text="{count=9000}"/>
+    <group id="n34_lki4" name="n34" xy="60,0" size="311,243" advanced="true"/>
+    <image id="n31_v3k9" name="n31" src="v3k9cg" fileName="imagesStory/zd_jnsxzi_1.png" xy="100,357" pivot="0.5,0.5"/>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
+    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
+    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="60,0" endValue="60,-250" duration="18" ease="Linear"/>
+  </transition>
 </component>

FGUIProject/assets/Main/components/ComRoleSkill1.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1000,450">
+  <controller name="c1" exported="true" pages="0,,1," selected="1"/>
+  <displayList>
+    <image id="n30_v3k9" name="n30" src="v3k9cb" fileName="imagesStory/zd_jinengdi_1.png" xy="148,0" pivot="0.5,0.5" size="243,243" group="n34_lki4" aspect="true"/>
+    <text id="n33_lki4" name="txtResult" xy="114,123" pivot="0.5,0.5" anchor="true" size="68,114" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="110" color="#5dd05d" vars="true" text="-"/>
+    <text id="n29_uj53" name="txtScore" xy="269,121" pivot="0.5,0.5" anchor="true" size="203,74" group="n34_lki4" font="ui://mfvz4q8kvuz5b5" fontSize="70" color="#5dd05d" align="center" vars="true" autoSize="none" text="{count=90}"/>
+    <group id="n34_lki4" name="n34" xy="80,0" size="311,243" advanced="true">
+      <gearXY controller="c1" pages="1" values="80,0" default="610,0"/>
+    </group>
+    <image id="n31_v3k9" name="n31" src="v3k9ch" fileName="imagesStory/zd_jnsxzi_2.png" xy="660,357" pivot="0.5,0.5">
+      <gearXY controller="c1" pages="0" values="120,357" default="660,357"/>
+    </image>
+  </displayList>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
+    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
+    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="610,0" endValue="610,-250" duration="18" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n34_lki4" value="0"/>
+    <item time="0" type="Scale" target="n31_v3k9" tween="true" startValue="1.6,1.6" endValue="1,1" duration="6" ease="Bounce.Out"/>
+    <item time="6" type="Alpha" target="n34_lki4" tween="true" startValue="1" endValue="0" duration="18" ease="Quart.In"/>
+    <item time="6" type="XY" target="n34_lki4" tween="true" startValue="80,0" endValue="80,-250" duration="18" ease="Linear"/>
+  </transition>
+</component>

FGUIProject/assets/Main/components/ComRoleSkillScore.xml

@@ -1,20 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="360,360">
+  <controller name="c1" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n30_v3k9" name="comRoleSkill" src="v3k9cx" fileName="components/ComRoleSkill.xml" xy="180,180" pivot="0.5,0.5" anchor="true"/>
   </displayList>
-  <transition name="t0">
-    <item time="0" type="Pivot" target="n30_v3k9" value="0.5,0.5"/>
-    <item time="0" type="Scale" target="n30_v3k9" tween="true" startValue="1.5,1.5" endValue="1,1" duration="12" ease="Bounce.Out"/>
-    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
-    <item time="0" type="XY" target="n30_v3k9" value="180,180"/>
-    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
-  </transition>
-  <transition name="t1">
-    <item time="0" type="Pivot" target="n30_v3k9" value="0,1"/>
-    <item time="0" type="Visible" target="n30_v3k9" value="true"/>
-    <item time="0" type="XY" target="n30_v3k9" value="0,360"/>
-    <item time="6" type="Rotation" target="n30_v3k9" tween="true" startValue="0" endValue="15" duration="6" ease="Bounce.Out"/>
-    <item time="18" type="Visible" target="n30_v3k9" value="false"/>
-  </transition>
 </component>

FGUIProject/assets/Main/components/ComSkillShield.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="244,237">
   <displayList>
-    <image id="n25_vbe8" name="img" src="8xpg3z" fileName="imagesStory/zd_drpf_fsz_1.png" xy="0,0"/>
+    <graph id="n26_tr2r" name="holder" xy="122,118" size="0,0" touchable="false">
+      <relation target="" sidePair="height-height"/>
+    </graph>
+    <graph id="n27_tr2r" name="holder1" xy="122,118" size="0,0" visible="false" touchable="false">
+      <relation target="" sidePair="height-height"/>
+    </graph>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComponentHeadBar.xml

@@ -10,5 +10,8 @@
     <text id="n38_slb4" name="txtLvl" xy="96,84" size="29,29" fontSize="20" color="#ffffff" align="center" text="99">
       <relation target="n37_slb4" sidePair="center-center,middle-middle"/>
     </text>
+    <graph id="n40_lki4" name="holder" xy="62,62" size="0,0" touchable="false">
+      <relation target="" sidePair="height-height"/>
+    </graph>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter1.xml

@@ -1,27 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1985,4301" scroll="both">
+<component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n37_r5m0" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0" size="1985,4301" aspect="true"/>
-    <component id="n38_r5m0" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1157,3939"/>
-    <component id="n39_r5m0" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="912,3722"/>
-    <component id="n40_r5m0" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="585,3405"/>
-    <component id="n41_r5m0" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="904,3197"/>
-    <component id="n42_r5m0" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1298,2966"/>
-    <component id="n43_r5m0" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="889,2789"/>
-    <component id="n44_r5m0" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="459,2673"/>
-    <component id="n45_r5m0" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="176,2351"/>
-    <component id="n46_r5m0" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="727,2326"/>
-    <component id="n47_r5m0" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1145,2225"/>
-    <component id="n48_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1529,2033"/>
-    <component id="n49_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="933,1969"/>
-    <component id="n50_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1174,1692"/>
-    <component id="n51_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="631,1581"/>
-    <component id="n52_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="251,1313"/>
-    <component id="n53_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="914,1354"/>
-    <component id="n54_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1566,1199"/>
-    <component id="n55_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1056,1040"/>
-    <component id="n56_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="698,689"/>
-    <component id="n57_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="1025,246"/>
+    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
+    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="536,2227"/>
+    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="350,1972"/>
+    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1870"/>
+    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1675"/>
+    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,1437"/>
+    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1292"/>
+    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1153"/>
+    <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,960"/>
+    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,802"/>
+    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,670"/>
+    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="398,516"/>
+    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,209"/>
   </displayList>
-  <relation target="n37_r5m0" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -2,25 +2,17 @@
 <component size="1200,2600" scroll="both">
   <displayList>
     <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
-    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,2373"/>
-    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="331,2299"/>
-    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="213,2086"/>
-    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="415,1978"/>
-    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="644,1891"/>
-    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="813,1694"/>
-    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="427,1686"/>
-    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="211,1564"/>
-    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="331,1411"/>
-    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="575,1305"/>
-    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="821,1244"/>
-    <component id="n27_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="812,784"/>
-    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="576,924"/>
-    <component id="n29_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="449,623"/>
-    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="266,714"/>
-    <component id="n31_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="859,1025"/>
-    <component id="n32_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="374,944"/>
-    <component id="n33_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="587,780"/>
-    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="388,417"/>
-    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="495,193"/>
+    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="536,2227"/>
+    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="350,1972"/>
+    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1870"/>
+    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1675"/>
+    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,1437"/>
+    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,1292"/>
+    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,1153"/>
+    <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,960"/>
+    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="180,802"/>
+    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="850,670"/>
+    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="398,516"/>
+    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="528,209"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
-    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="582,2242"/>
-    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="348,2002"/>
-    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="822,2002"/>
-    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="582,1762"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="348,1522"/>
-    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="822,1522"/>
-    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="582,1282"/>
-    <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="348,1042"/>
-    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="822,1042"/>
-    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="582,802"/>
-    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="348,562"/>
-    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="822,562"/>
-    <component id="n43_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="582,322"/>
+    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="-1,-1"/>
+    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,2400"/>
+    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,2273"/>
+    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,2091"/>
+    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,1979"/>
+    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="675,1887"/>
+    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1695"/>
+    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1687"/>
+    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,1565"/>
+    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,1407"/>
+    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1293"/>
+    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1252"/>
+    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1043"/>
+    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,994"/>
+    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,909"/>
+    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,737"/>
+    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,767"/>
+    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,688"/>
+    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,577"/>
+    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,359"/>
+    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="495,193"/>
   </displayList>
 </component>

FGUIProject/assets/Main/componentsLevel/CompChapter2.xml

@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="0,0"/>
-    <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="588,2221"/>
-    <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="354,1981"/>
-    <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="828,1981"/>
-    <component id="n34_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="588,1741"/>
-    <component id="n35_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="354,1501"/>
-    <component id="n36_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="828,1501"/>
-    <component id="n37_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="588,1261"/>
-    <component id="n38_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="354,1021"/>
-    <component id="n39_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="828,1021"/>
-    <component id="n40_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="588,781"/>
-    <component id="n41_oq7r" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="354,541"/>
-    <component id="n42_oq7r" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="828,541"/>
-    <component id="n43_oq7r" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="588,301"/>
+    <image id="n0_xuzk" name="bg" src="ga166r" fileName="imagesStory/zhangjie_bg2.jpg" xy="-1,-1"/>
+    <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,2400"/>
+    <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,2273"/>
+    <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,2091"/>
+    <component id="n19_oq7r" name="g4" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,1979"/>
+    <component id="n20_oq7r" name="g5" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="675,1887"/>
+    <component id="n21_oq7r" name="g6" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1695"/>
+    <component id="n22_oq7r" name="g7" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1687"/>
+    <component id="n23_oq7r" name="g8" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,1565"/>
+    <component id="n24_oq7r" name="g9" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,1407"/>
+    <component id="n25_oq7r" name="g10" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="540,1293"/>
+    <component id="n26_r5m0" name="g11" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1252"/>
+    <component id="n31_r5m0" name="g12" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,1043"/>
+    <component id="n28_r5m0" name="g13" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,994"/>
+    <component id="n32_r5m0" name="g14" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,909"/>
+    <component id="n30_r5m0" name="g15" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="163,737"/>
+    <component id="n33_r5m0" name="g16" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="539,767"/>
+    <component id="n27_r5m0" name="g17" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="840,688"/>
+    <component id="n29_r5m0" name="g18" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="403,577"/>
+    <component id="n34_r5m0" name="g19" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="324,359"/>
+    <component id="n35_r5m0" name="g20" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="495,193"/>
   </displayList>
 </component>

FGUIProject/assets/Main/package.xml

@@ -50,10 +50,8 @@
     <image id="v35428" name="zx_gka_zsp_2.png" path="/imagesStory/"/>
     <image id="v35429" name="zx_gka_zsp_3.png" path="/imagesStory/"/>
     <component id="v3542b" name="CompBonusBox.xml" path="/componentsLevel/"/>
-    <component id="xuzk2c" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
     <component id="xuzk2d" name="CompStoryLevelItem.xml" path="/componentsLevel/"/>
     <component id="xuzk2e" name="CompChapter.xml" path="/componentsLevel/"/>
-    <component id="xuzk2g" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
     <image id="xuzk2h" name="zx_gka_zsp_4.png" path="/imagesStory/"/>
     <component id="xuzk2i" name="StoryDialogUI.xml" path="/" exported="true"/>
     <image id="nmnb2j" name="dhjm_bstx_1.png" path="/imagesDialog/"/>
@@ -208,8 +206,8 @@
     <image id="jvi38f" name="zhuxian_zj_pic_3.png" path="/imagesExport/" exported="true"/>
     <image id="jvi38g" name="zhuxian_zj_pic_4.png" path="/imagesExport/" exported="true"/>
     <image id="jvi38h" name="zhuxian_zj_pic_5.png" path="/imagesExport/" exported="true"/>
-    <component id="kpb08i" name="CompChapter10001.xml" path="/componentsLevel/" exported="true"/>
-    <component id="kpb08j" name="CompChapter10002.xml" path="/componentsLevel/" exported="true"/>
+    <component id="kpb08i" name="CompChapter10002.xml" path="/componentsLevel/" exported="true"/>
+    <component id="kpb08j" name="CompChapter10001.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08k" name="CompChapter10003.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08l" name="CompChapter10004.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08m" name="CompChapter10005.xml" path="/componentsLevel/" exported="true"/>
@@ -368,6 +366,9 @@
     <image id="mhyhd6" name="grxx_txtx.png" path="/images/"/>
     <image id="mhyhd7" name="grxx_mzk_1.png" path="/images/"/>
     <image id="mhyhd8" name="grxx_mzk_2.png" path="/images/"/>
+    <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
+    <component id="txgzdc" name="CompChapter2.xml" path="/componentsLevel/" exported="true"/>
+    <component id="txgzdd" name="CompChapter1.xml" path="/componentsLevel/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Editor/ToolsMenu.cs

@@ -81,7 +81,8 @@ namespace GFGEditor
         }
 
         [MenuItem("策划/其它/更新美术资源", false, (int)TOOL_MENU_PRIORITY.UpdateArtRes)]
-        public static void UpdateArtRes()
+        public static void UpdateArtRes
+            ()
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新美术资源", 1);
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat");

GameClient/Assets/Game/HotUpdate/Data/Cache/LuckyBoxBonusDataCache.cs

@@ -65,7 +65,7 @@ namespace GFGGame
             List<ItemData> bonusList = null;
             if (isGuide)
             {
-                List<ItemData> guideBonusList = ItemUtil.CreateItemDataList("10070*1;10071*1;10072*1");
+                List<ItemData> guideBonusList = ItemUtil.CreateItemDataList("10003*1;10004*1;10006*1;10007*1");
                 count = count - guideBonusList.Count;
                 bonusList = DropOutDataCache.GetDropItemDatas(_dropOutId, count);
                 while (guideBonusList.Count > 1)

GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using FairyGUI;
+using UI.DressUp;
 using UnityEngine;
 
 namespace GFGGame
@@ -13,6 +15,10 @@ namespace GFGGame
     }
     public class PhotographDataManager : SingletonBase<PhotographDataManager>
     {
+        public List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
+        public Dictionary<int, List<int>> _equipSceneData = new Dictionary<int, List<int>>();//当前穿戴的场景数据
+
+
         public List<int> listBgData = new List<int>();
         public List<int> listNpcData = new List<int>();
         public List<int> listSceneData = new List<int>();
@@ -57,7 +63,24 @@ namespace GFGGame
             }
         }
 
-
+        //将穿戴数据分类
+        public void ClassifyEquipData()
+        {
+            _equipRoleData.Clear();
+            _equipSceneData.Clear();
+            for (int i = 0; i < EquipDataCache.cacher.equipDatas.Length; i++)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.equipDatas[i]);
+                if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING)
+                {
+                    PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemCfg.id, out _equipSceneData);
+                }
+                else
+                {
+                    _equipRoleData.Add(EquipDataCache.cacher.equipDatas[i]);
+                }
+            }
+        }
         public void AddEquipItem(Dictionary<int, List<int>> _equipSceneData, int itemID, out Dictionary<int, List<int>> equipSceneData)
         {
             if (!_equipSceneData.ContainsKey(itemID))
@@ -68,19 +91,129 @@ namespace GFGGame
             equipSceneData = _equipSceneData;
         }
 
-        public void GetMaxLayer(int _maxLayer, bool isAdd, ItemCfg itemCfg, out int maxLayer)
+
+        public List<int> GetListData(EnumPhotographType index)
+        {
+            List<int> _listData = null;
+            switch (index)
+            {
+                case EnumPhotographType.BG:
+                    _listData = PhotographDataManager.Instance.listBgData;
+                    break;
+                case EnumPhotographType.NPC:
+                    _listData = PhotographDataManager.Instance.listNpcData;
+                    break;
+                case EnumPhotographType.SCENE:
+                    _listData = PhotographDataManager.Instance.listSceneData;
+                    break;
+                case EnumPhotographType.BORDER:
+                    _listData = PhotographDataManager.Instance.listBorderData;
+                    break;
+                case EnumPhotographType.EFFECT:
+                    _listData = PhotographDataManager.Instance.listEffectData;
+                    break;
+            }
+            return _listData;
+        }
+
+
+        //是否点击在UI上
+        public bool IsTouchUI(GComponent viewCom)
+        {
+            GObject obj = GRoot.inst.touchTarget;
+            UI_PhotographUI _viewCom = UI_PhotographUI.Proxy(viewCom);
+            return _viewCom.m_comSelectBox.m_btnSize.GetChild("icon").asLoader == obj || _viewCom.m_comSelectBox.m_btnDelete.GetChild("icon").asLoader == obj || _viewCom.m_comSelectBox.m_btnFlip.GetChild("icon").asLoader == obj || _viewCom.m_btnBack == obj || _viewCom.m_btnChoose.GetChild("icon").asLoader == obj || _viewCom.m_btnPhotograph.GetChild("icon").asLoader == obj;
+        }
+
+        //传入父物体，设置子物体层级
+        public void SetItemLayer(GameObject parentObj, int layer)
+        {
+
+            for (int i = 0; i < parentObj.transform.childCount; i++)
+            {
+                Transform tf = parentObj.transform.GetChild(i);
+                string[] strs = tf.name.Split('_');
+                if (strs.Length > 1 && strs[1] == "eff")//子物体是特效
+                {
+                    DressUpUtil.SetParticleSortingOrder(tf.gameObject, layer, true);
+                }
+            }
+            SpriteRenderer[] sps = parentObj.GetComponentsInChildren<SpriteRenderer>();
+            List<SpriteRenderer> listSp = new List<SpriteRenderer>(sps);
+            listSp = SortItemList(listSp);
+
+            for (int i = 0; i < listSp.Count; i++)
+            {
+                int sortingOrder = listSp[i].sortingOrder;
+                listSp[i].sortingOrder = layer + i;
+            }
+        }
+        private static List<SpriteRenderer> SortItemList(List<SpriteRenderer> arrayList)
+        {
+
+            arrayList.Sort((SpriteRenderer a, SpriteRenderer b) =>
+            {
+
+                int rarityA = a.sortingOrder;
+                int rarityB = b.sortingOrder;
+                if (rarityA < rarityB)
+                {
+                    return -1;
+                }
+                else if (rarityA > rarityB)
+                {
+                    return 1;
+                }
+                return 0;
+            });
+            return arrayList;
+        }
+
+
+        public int GetMaxLayer(GameObject parentObj, int maxLayer)
+        {
+            int layer = GetLayer(parentObj);
+            return maxLayer < layer ? layer : maxLayer;
+        }
+        public int GetLayer(GameObject parentObj)
+        {
+            int layer = int.MinValue;
+            for (int i = 0; i < parentObj.transform.childCount; i++)
+            {
+                Transform tf = parentObj.transform.GetChild(i);
+                SpriteRenderer sp = tf.GetComponent<SpriteRenderer>();
+                if (sp && layer < sp.sortingOrder)
+                {
+                    layer = sp.sortingOrder;
+                }
+            }
+            return layer;
+        }
+
+        public void SetBgPos(GameObject hitGameObj, Vector2 uiSize)
         {
+            Vector2 size = hitGameObj.GetComponent<SpriteRenderer>().size;
 
-            if (isAdd)
+            float deviationWidth = (size.x - uiSize.x / 100) / 2;
+            float deviationHeigh = (size.y - uiSize.y / 100) / 2;
+            Vector2 pos = hitGameObj.transform.position;
+            if (pos.x <= -deviationWidth)
+            {
+                hitGameObj.transform.position = new Vector2(-deviationWidth, hitGameObj.transform.position.y);
+            }
+            if (pos.x >= deviationWidth)
             {
-                _maxLayer += 1;
+                hitGameObj.transform.position = new Vector2(deviationWidth, hitGameObj.transform.position.y);
             }
-            else
+            if (pos.y <= -deviationHeigh)
             {
-                //初始场景最大层级
-                _maxLayer = itemCfg.resLayer1 > itemCfg.resLayer2 ? itemCfg.resLayer1 : itemCfg.resLayer2;
+                hitGameObj.transform.position = new Vector2(hitGameObj.transform.position.x, -deviationHeigh);
+            }
+            if (pos.y >= deviationHeigh)
+            {
+                hitGameObj.transform.position = new Vector2(hitGameObj.transform.position.x, deviationHeigh);
             }
-            maxLayer = _maxLayer;
         }
+
     }
 }

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

@@ -15,7 +15,7 @@ namespace GFGGame
         private const string FORMAT_EFFECT_OBJ_NAME = "T{0}_eff";
         private const string FORMAT_LAYER_RES_NAME_WITH_T = "{0}_t";
 
-        public static void AddItem(int itemID, GameObject sceneObj, bool needSetMask = false, bool showAni = true, GameObject parentObj = null, int layerId = int.MinValue, int layer = int.MinValue)
+        public static void AddItem(int itemID, GameObject sceneObj, bool needSetMask = false, bool showAni = true, GameObject parentObj = null, int layerId = int.MinValue, int resLayer = int.MinValue)
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
             if (itemCfg != null)
@@ -36,25 +36,25 @@ namespace GFGGame
                 }
                 if (layerId > int.MinValue)
                 {
-                    updateLayerRes(itemCfg, parentObj, layerId, layerId == 2, needSetMask, showAni, layer);
+                    updateLayerRes(itemCfg, parentObj, layerId, resLayer == 2, needSetMask, showAni);
                 }
                 else
                 {
                     //普通层
                     if (itemCfg.resLayer1 > 0)
                     {
-                        updateLayerRes(itemCfg, parentObj, 1, itemCfg.resLayer1 == 2, needSetMask, showAni, layer);
+                        updateLayerRes(itemCfg, parentObj, 1, itemCfg.resLayer1 == 2, needSetMask, showAni);
                     }
                     //特殊层
                     if (itemCfg.resLayer2 > 0)
                     {
 
-                        updateLayerRes(itemCfg, parentObj, 2, itemCfg.resLayer2 == 2, needSetMask, showAni, layer);
+                        updateLayerRes(itemCfg, parentObj, 2, itemCfg.resLayer2 == 2, needSetMask, showAni);
                     }
                 }
 
                 //特效
-                if (itemCfg.effLayer > 0 && showAni)
+                if (itemCfg.effLayer > 0)
                 {
                     var objName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.subType);
                     ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
@@ -180,7 +180,7 @@ namespace GFGGame
             assetDisposer.resPath = resPath;
         }
 
-        private static void updateLayerRes(ItemCfg itemCfg, GameObject parentObj, int layerId, bool isT, bool needSetMask, bool showAni = true, int layer = int.MinValue)
+        private static void updateLayerRes(ItemCfg itemCfg, GameObject parentObj, int layerId, bool isT, bool needSetMask, bool showAni = true)
         {
 
             ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType);
@@ -191,10 +191,6 @@ namespace GFGGame
             {
                 sortingOrder = typeCfg.specialLayer;
             }
-            if (layer > int.MinValue)
-            {
-                sortingOrder = layer;
-            }
             if (isT)
             {
                 res = string.Format(FORMAT_LAYER_RES_NAME_WITH_T, res);
@@ -267,9 +263,9 @@ namespace GFGGame
             SetParticleSortingOrder(gameObj, sortingOrder);
             return gameObj;
         }
-        public static GameObject AddAnimationObj(string res)
+        public static GameObject AddAnimationObj(string resPath)
         {
-            string resPath = ResPathUtil.GetCardAnimationPath(res);
+            // string resPath = ResPathUtil.GetCardAnimationPath(res);
             var prefab = GFGAsset.Load<GameObject>(resPath);
             if (prefab == null)
             {
@@ -311,7 +307,7 @@ namespace GFGGame
             ty = 0;
         }
 
-        private static void SetParticleSortingOrder(GameObject gameObj, int sortingOrder)
+        public static void SetParticleSortingOrder(GameObject gameObj, int sortingOrder, bool isAdd = false)
         {
             var count = gameObj.transform.childCount;
             for (int i = 0; i < count; i++)
@@ -323,7 +319,15 @@ namespace GFGGame
                     var renderer = ps.GetComponent<Renderer>();
                     if (renderer != null)
                     {
-                        renderer.sortingOrder = sortingOrder;
+                        if (isAdd)
+                        {
+                            renderer.sortingOrder = renderer.sortingOrder + sortingOrder;
+                        }
+                        else
+                        {
+
+                            renderer.sortingOrder = sortingOrder;
+                        }
                     }
                 }
             }

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

@@ -2,6 +2,7 @@ using UnityEngine;
 using System.Collections;
 using System;
 using UnityEditor;
+using FairyGUI;
 
 namespace GFGGame
 {
@@ -154,7 +155,9 @@ namespace GFGGame
             }
         }
 
-        public static void UpdatePhotographBody(int[] equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true, GameObject parentObj = null)
+
+        //拍照角色
+        public static void UpdatePhotographBody(int[] equipDatas, GameObject sceneObj, GameObject parentObj)
         {
             SceneController.UpdateRole(equipDatas, sceneObj, false, null, false, parentObj);
             if (EquipDataCache.cacher.IsSuitPic && EquipDataCache.cacher.suitId > 0)
@@ -162,37 +165,24 @@ namespace GFGGame
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(EquipDataCache.cacher.suitId);
                 DressUpUtil.UpdateBody(suitCfg.picRes, sceneObj, false, null, false, parentObj);
             }
-            GameObject gameObject = sceneObj.transform.Find("Scene/Role/Body").gameObject;
+            GameObject gameObject = parentObj.transform.Find("Body").gameObject;
 
-            SceneController.PhotographAddCollider(gameObject);
+            SceneController.SetBoxCollider2DToGameObject(gameObject);
 
         }
-
-        public static void UpdatePhotographBgOrNpcOrBorder(GameObject sceneObj, EnumPhotographType type, int itemId, int maxlayer, out int maxLayer)
+        //拍照场景添加单个道具
+        public static void AddItemToScene(GameObject sceneObj, GameObject parentGameObj, int itemId, int layerId, int resLayer)
         {
-            maxLayer = maxlayer;
-            string objName = "";
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            var resPath = ""; ResPathUtil.GetDressUpPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
-            if (type == EnumPhotographType.BG)
-            {
-                objName = "Bg/BgRes";
-                resPath = ResPathUtil.GetDressUpPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
-            }
-            else if (type == EnumPhotographType.NPC)
-            {
-                objName = "Scene/Npc/NpcRes";
-                resPath = ResPathUtil.GetNpcPicFPath(itemCfg.res);
-
-            }
-            else if (type == EnumPhotographType.BORDER)
-            {
-                objName = "Border/BorderRes";
-                resPath = ResPathUtil.GetDressUpPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
 
-            }
+            parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
+            DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, layerId, resLayer);
+            SceneController.SetBoxCollider2DToGameObject(parentGameObj.transform.GetChild(0).gameObject);
+        }
 
-            Transform tf = sceneObj.transform.Find(objName);
+        //向Transform添加SpriteRenderer并设置资源
+        public static void SetSpriteRendererToTransform(Transform tf, string resPath)
+        {
             tf.position = Vector3.zero;
             SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
             if (spr == null)
@@ -204,28 +194,12 @@ namespace GFGGame
             Sprite sp = GFGAsset.Load<Sprite>(resPath);
             spr.sprite = sp;
             spr.size = spr.sprite.bounds.size;//将节点设置为原图大小
-
-            if (type == EnumPhotographType.BG)
-            {
-                ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(ConstDressUpItemType.BEI_JING);
-                spr.sortingOrder = typeCfg.defaultLayer;
-
-            }
-            if (type == EnumPhotographType.NPC)
-            {
-                maxlayer++;
-                maxLayer = maxlayer;
-                spr.sortingOrder = maxLayer;
-            }
-            if (type != EnumPhotographType.BORDER)//边框不加碰撞盒
-            {
-
-                PhotographAddCollider(tf.gameObject);
-            }
+            ItemTypeCfg typeCfg = ItemTypeCfgArray.Instance.GetCfg(ConstDressUpItemType.BEI_JING);
 
         }
-        //添加碰撞盒
-        public static void PhotographAddCollider(GameObject gameObject)
+
+        //向GameObject添加BoxCollider2D
+        public static void SetBoxCollider2DToGameObject(GameObject gameObject)
         {
             BoxCollider2D polygonCollider2D = gameObject.GetComponent<BoxCollider2D>();
             if (polygonCollider2D != null)
@@ -239,31 +213,8 @@ namespace GFGGame
         }
 
 
-        //场景添加单个道具
-        public static void AddScene(GameObject sceneObj, int itemId, int index, int resLayer = int.MinValue)
-        {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-            //普通层
-            if (itemCfg.resLayer1 > 0)
-            {
-                var parentGameObj = new GameObject(string.Format("{0}_{1}_{2}", itemId, index, itemCfg.resLayer1));
-                parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
-                DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, itemCfg.resLayer1, resLayer);
-                SceneController.PhotographAddCollider(parentGameObj.transform.GetChild(0).gameObject);
-
-            }
-            //特殊层
-            if (itemCfg.resLayer2 > 0)
-            {
-                var parentGameObj = new GameObject(string.Format("{0}_{1}_{2}", itemId, index, itemCfg.resLayer2));
-                parentGameObj.transform.SetParent(sceneObj.transform.Find("Scene"), false);
-                DressUpUtil.AddItem(itemId, sceneObj, false, false, parentGameObj, itemCfg.resLayer2, resLayer);
-                SceneController.PhotographAddCollider(parentGameObj.transform.GetChild(0).gameObject);
-
-            }
 
-        }
-        //传入父物体，根据所有子物体大小计算父物体边框大小
+        //传入父物体，返回体碰撞盒大小
         public static Vector2 GetGameObjectSize(GameObject parentObj)
         {
             Vector2 size = Vector2.one;
@@ -281,7 +232,7 @@ namespace GFGGame
         //设置物体中心点
         public static void SetGameObjectCenter(GameObject parentObj)
         {
-            Transform parent = parentObj.transform;
+            Transform parent = parentObj.transform;  // 2.选中技算
             Vector3 postion = parent.position;
             Quaternion rotation = parent.rotation;
             Vector3 scale = parent.localScale;
@@ -290,15 +241,27 @@ namespace GFGGame
             parent.localScale = Vector3.one;
             Vector3 center = Vector3.zero;
             Renderer[] renders = parent.GetComponentsInChildren<Renderer>();
-            foreach (Renderer child in renders)
+            int index = 0;
+            foreach (Transform t in parent)
             {
-                center += child.bounds.center;
+                string[] strs = t.name.Split('_');
+                if (strs.Length > 1 && strs[1] == "eff") continue;//不计算特效大小
+                Renderer render = t.GetComponent<Renderer>();
+                if (render)
+                {
+                    index++;
+                    center += render.bounds.center;
+                }
             }
-            center /= parent.GetComponentsInChildren<Transform>().Length;
+            center /= index;
             Bounds bounds = new Bounds(center, Vector3.zero);
-            foreach (Renderer child in renders)
+            foreach (Transform t in parent)
             {
-                bounds.Encapsulate(child.bounds);
+                string[] strs = t.name.Split('_');
+                if (strs.Length > 1 && strs[1] == "eff") continue;
+                Renderer render = t.GetComponent<Renderer>();
+                if (render) bounds.Encapsulate(render.bounds);
+                Debug.Log("zoya_111" + bounds);
             }
 
             parent.position = postion;
@@ -307,21 +270,16 @@ namespace GFGGame
 
             foreach (Transform t in parent)
             {
+                string[] strs = t.parent.name.Split('_');
+                if (strs.Length > 1 && strs[1] == "eff") continue;
                 t.position = t.position - bounds.center;
             }
-            parent.transform.position = bounds.center + parent.position;
 
-        }
+            parent.position = bounds.center + parent.position;
 
-        //输入变换前后的向量，返回旋转角度
-        public static float GetRotationAngle(Vector3 lastRotation, Vector3 curRotation)
-        {
-            float angle = Vector3.Angle(lastRotation, curRotation); //求出两向量之间的夹角 
-            Vector3 normal = Vector3.Cross(lastRotation, curRotation);//叉乘求出法线向量 
-            angle *= Mathf.Sign(Vector3.Dot(normal, Vector3.forward));  //Mathf.Sign()求符号，Vector3.Dot()求方向，求法线向量与物体上方向向量点乘，结果为1或-1，修正旋转方向 
-            return angle;
         }
 
+
         public static GameObject GetFirstHitObj(RaycastHit2D[] hit2Ds)
         {
             int layer = int.MinValue;
@@ -338,5 +296,28 @@ namespace GFGGame
             }
             return gameObject;
         }
+
+        public static void AddObjectToView(GameObject _gameObject, GoWrapper _wrapper, GGraph holder, string res, out GameObject gameObject, out GoWrapper wrapper, float scale = 100)
+        {
+            if (_gameObject != null)
+            {
+                GameObject.Destroy(_gameObject);
+                _gameObject = null;
+            }
+            _gameObject = DressUpUtil.AddAnimationObj(res);
+            _gameObject.transform.localScale = new Vector3(scale, scale, scale);
+
+            if (_wrapper == null)
+            {
+                _wrapper = new GoWrapper(_gameObject);
+                holder.SetNativeObject(_wrapper);
+            }
+            else
+            {
+                _wrapper.wrapTarget = _gameObject;//替换资源
+            }
+            wrapper = _wrapper;
+            gameObject = _gameObject;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle1.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonModle1
+    {
+        public GButton target;
+        public GGraph m_holder;
+        public GGraph m_holder1;
+        public const string URL = "ui://mfvz4q8kq08xu";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonModle1";
+        private static UI_ButtonModle1 _proxy;
+
+        public static UI_ButtonModle1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonModle1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonModle1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonModle1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_holder = null;
+            m_holder1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkillScore.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fa5ea94a729bf304e91b516900c4f923
+guid: be62a9f7075aa2043bd570a86680736b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill.cs

@@ -7,8 +7,9 @@ namespace UI.Main
     public partial class UI_ComRoleSkill
     {
         public GComponent target;
-        public Controller m_c1;
+        public GTextField m_txtResult;
         public GTextField m_txtScore;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8kv3k9cx";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComRoleSkill";
@@ -56,13 +57,15 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_c1 = comp.GetController("c1");
+            m_txtResult = (GTextField)comp.GetChild("txtResult");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_c1 = null;
+            m_txtResult = null;
             m_txtScore = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkillScore.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs

@@ -4,20 +4,22 @@ using FairyGUI;
 
 namespace UI.Main
 {
-    public partial class UI_ComRoleSkillScore
+    public partial class UI_ComRoleSkill1
     {
         public GComponent target;
-        public UI_ComRoleSkill m_comRoleSkill;
+        public Controller m_c1;
+        public GTextField m_txtResult;
+        public GTextField m_txtScore;
         public Transition m_t0;
         public Transition m_t1;
-        public const string URL = "ui://mfvz4q8kv3k9c1";
+        public const string URL = "ui://mfvz4q8klki4db";
         public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ComRoleSkillScore";
-        private static UI_ComRoleSkillScore _proxy;
+        public const string RES_NAME = "ComRoleSkill1";
+        private static UI_ComRoleSkill1 _proxy;
 
-        public static UI_ComRoleSkillScore Create(GObject gObject = null)
+        public static UI_ComRoleSkill1 Create(GObject gObject = null)
         {
-            var ui = new UI_ComRoleSkillScore();
+            var ui = new UI_ComRoleSkill1();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +28,11 @@ namespace UI.Main
             return ui;
         }
 
-        public static UI_ComRoleSkillScore Proxy(GObject gObject = null)
+        public static UI_ComRoleSkill1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComRoleSkillScore();
+                _proxy = new UI_ComRoleSkill1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,14 +59,17 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_comRoleSkill = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("comRoleSkill"));
+            m_c1 = comp.GetController("c1");
+            m_txtResult = (GTextField)comp.GetChild("txtResult");
+            m_txtScore = (GTextField)comp.GetChild("txtScore");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comRoleSkill.Dispose();
-            m_comRoleSkill = null;
+            m_c1 = null;
+            m_txtResult = null;
+            m_txtScore = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleSkill1.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: db7b7ee5a5e356245a14d5c12d54abce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSkillShield.cs

@@ -7,7 +7,8 @@ namespace UI.Main
     public partial class UI_ComSkillShield
     {
         public GComponent target;
-        public GImage m_img;
+        public GGraph m_holder;
+        public GGraph m_holder1;
         public const string URL = "ui://mfvz4q8kv3k9c3";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComSkillShield";
@@ -55,11 +56,13 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_img = (GImage)comp.GetChild("img");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holder1 = (GGraph)comp.GetChild("holder1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_img = null;
+            m_holder = null;
+            m_holder1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter1.cs

@@ -20,15 +20,7 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
-        public const string URL = "ui://mfvz4q8kxuzk2c";
+        public const string URL = "ui://mfvz4q8ktxgzdd";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter1";
         private static UI_CompChapter1 _proxy;
@@ -88,14 +80,6 @@ namespace UI.Main
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -124,22 +108,6 @@ namespace UI.Main
             m_g11 = null;
             m_g12.Dispose();
             m_g12 = null;
-            m_g13.Dispose();
-            m_g13 = null;
-            m_g14.Dispose();
-            m_g14 = null;
-            m_g15.Dispose();
-            m_g15 = null;
-            m_g16.Dispose();
-            m_g16 = null;
-            m_g17.Dispose();
-            m_g17 = null;
-            m_g18.Dispose();
-            m_g18 = null;
-            m_g19.Dispose();
-            m_g19 = null;
-            m_g20.Dispose();
-            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10001.cs

@@ -20,15 +20,7 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g10;
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
-        public UI_CompStoryLevelItem m_g13;
-        public UI_CompStoryLevelItem m_g14;
-        public UI_CompStoryLevelItem m_g15;
-        public UI_CompStoryLevelItem m_g16;
-        public UI_CompStoryLevelItem m_g17;
-        public UI_CompStoryLevelItem m_g18;
-        public UI_CompStoryLevelItem m_g19;
-        public UI_CompStoryLevelItem m_g20;
-        public const string URL = "ui://mfvz4q8kkpb08i";
+        public const string URL = "ui://mfvz4q8kkpb08j";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10001";
         private static UI_CompChapter10001 _proxy;
@@ -88,14 +80,6 @@ namespace UI.Main
             m_g10 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g10"));
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
-            m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
-            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
-            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
-            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
-            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
-            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
-            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
-            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -124,22 +108,6 @@ namespace UI.Main
             m_g11 = null;
             m_g12.Dispose();
             m_g12 = null;
-            m_g13.Dispose();
-            m_g13 = null;
-            m_g14.Dispose();
-            m_g14 = null;
-            m_g15.Dispose();
-            m_g15 = null;
-            m_g16.Dispose();
-            m_g16 = null;
-            m_g17.Dispose();
-            m_g17 = null;
-            m_g18.Dispose();
-            m_g18 = null;
-            m_g19.Dispose();
-            m_g19 = null;
-            m_g20.Dispose();
-            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10002.cs

@@ -21,7 +21,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
         public UI_CompStoryLevelItem m_g13;
-        public const string URL = "ui://mfvz4q8kkpb08j";
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
+        public const string URL = "ui://mfvz4q8kkpb08i";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter10002";
         private static UI_CompChapter10002 _proxy;
@@ -82,6 +89,13 @@ namespace UI.Main
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
             m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -112,6 +126,20 @@ namespace UI.Main
             m_g12 = null;
             m_g13.Dispose();
             m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter2.cs

@@ -21,7 +21,14 @@ namespace UI.Main
         public UI_CompStoryLevelItem m_g11;
         public UI_CompStoryLevelItem m_g12;
         public UI_CompStoryLevelItem m_g13;
-        public const string URL = "ui://mfvz4q8kxuzk2g";
+        public UI_CompStoryLevelItem m_g14;
+        public UI_CompStoryLevelItem m_g15;
+        public UI_CompStoryLevelItem m_g16;
+        public UI_CompStoryLevelItem m_g17;
+        public UI_CompStoryLevelItem m_g18;
+        public UI_CompStoryLevelItem m_g19;
+        public UI_CompStoryLevelItem m_g20;
+        public const string URL = "ui://mfvz4q8ktxgzdc";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompChapter2";
         private static UI_CompChapter2 _proxy;
@@ -82,6 +89,13 @@ namespace UI.Main
             m_g11 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g11"));
             m_g12 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g12"));
             m_g13 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g13"));
+            m_g14 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g14"));
+            m_g15 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g15"));
+            m_g16 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g16"));
+            m_g17 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g17"));
+            m_g18 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g18"));
+            m_g19 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g19"));
+            m_g20 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g20"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -112,6 +126,20 @@ namespace UI.Main
             m_g12 = null;
             m_g13.Dispose();
             m_g13 = null;
+            m_g14.Dispose();
+            m_g14 = null;
+            m_g15.Dispose();
+            m_g15 = null;
+            m_g16.Dispose();
+            m_g16 = null;
+            m_g17.Dispose();
+            m_g17 = null;
+            m_g18.Dispose();
+            m_g18 = null;
+            m_g19.Dispose();
+            m_g19 = null;
+            m_g20.Dispose();
+            m_g20 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComponentHeadBar.cs

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GTextField m_txtName;
         public GTextField m_txtLvl;
+        public GGraph m_holder;
         public const string URL = "ui://mfvz4q8kslb416";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComponentHeadBar";
@@ -58,11 +59,13 @@ namespace UI.Main
         {
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtLvl = (GTextField)comp.GetChild("txtLvl");
+            m_holder = (GGraph)comp.GetChild("holder");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtName = null;
             m_txtLvl = null;
+            m_holder = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -10,11 +10,11 @@ namespace UI.Main
         public Controller m_c1;
         public UI_ComponentHeadBar m_headBar;
         public GComponent m_valueBar;
-        public GButton m_btnXiuFang;
-        public GButton m_btnMain;
-        public GButton m_btnHuanZhuang;
-        public GButton m_btnZhaiXing;
-        public GButton m_btnCiPai;
+        public UI_ButtonModle1 m_btnXiuFang;
+        public UI_ButtonModle1 m_btnMain;
+        public UI_ButtonModle1 m_btnHuanZhuang;
+        public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_ButtonModle1 m_btnCiPai;
         public GList m_list;
         public GButton m_btnChange;
         public const string URL = "ui://mfvz4q8kq08x0";
@@ -67,11 +67,11 @@ namespace UI.Main
             m_c1 = comp.GetController("c1");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_btnXiuFang = (GButton)comp.GetChild("btnXiuFang");
-            m_btnMain = (GButton)comp.GetChild("btnMain");
-            m_btnHuanZhuang = (GButton)comp.GetChild("btnHuanZhuang");
-            m_btnZhaiXing = (GButton)comp.GetChild("btnZhaiXing");
-            m_btnCiPai = (GButton)comp.GetChild("btnCiPai");
+            m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
+            m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
+            m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
+            m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (GButton)comp.GetChild("btnChange");
         }
@@ -81,10 +81,15 @@ namespace UI.Main
             m_headBar.Dispose();
             m_headBar = null;
             m_valueBar = null;
+            m_btnXiuFang.Dispose();
             m_btnXiuFang = null;
+            m_btnMain.Dispose();
             m_btnMain = null;
+            m_btnHuanZhuang.Dispose();
             m_btnHuanZhuang = null;
+            m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
+            m_btnCiPai.Dispose();
             m_btnCiPai = null;
             m_list = null;
             m_btnChange = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -18,10 +18,10 @@ namespace UI.Main
         public UI_ComSkillShield m_ComShieldNpc;
         public GProgressBar m_proMinusMine;
         public GProgressBar m_proMinusNpc;
-        public UI_ComRoleSkillScore m_ComRoleSkillMineAdd;
-        public UI_ComRoleSkillScore m_ComRoleSkillMineMinus;
-        public UI_ComRoleSkillScore m_ComRoleSkillNpcAdd;
-        public UI_ComRoleSkillScore m_ComRoleSkillNpcMinus;
+        public UI_ComRoleSkill m_ComRoleSkillMineAdd;
+        public UI_ComRoleSkill1 m_ComRoleSkillMineMinus;
+        public UI_ComRoleSkill m_ComRoleSkillNpcAdd;
+        public UI_ComRoleSkill1 m_ComRoleSkillNpcMinus;
         public UI_CompFightResultName m_selfName;
         public UI_CompFightResultName m_targetName;
         public UI_ComBtnSkill m_btnSkill0;
@@ -86,10 +86,10 @@ namespace UI.Main
             m_ComShieldNpc = (UI_ComSkillShield)UI_ComSkillShield.Create(comp.GetChild("ComShieldNpc"));
             m_proMinusMine = (GProgressBar)comp.GetChild("proMinusMine");
             m_proMinusNpc = (GProgressBar)comp.GetChild("proMinusNpc");
-            m_ComRoleSkillMineAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineAdd"));
-            m_ComRoleSkillMineMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillMineMinus"));
-            m_ComRoleSkillNpcAdd = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcAdd"));
-            m_ComRoleSkillNpcMinus = (UI_ComRoleSkillScore)UI_ComRoleSkillScore.Create(comp.GetChild("ComRoleSkillNpcMinus"));
+            m_ComRoleSkillMineAdd = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillMineAdd"));
+            m_ComRoleSkillMineMinus = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillMineMinus"));
+            m_ComRoleSkillNpcAdd = (UI_ComRoleSkill)UI_ComRoleSkill.Create(comp.GetChild("ComRoleSkillNpcAdd"));
+            m_ComRoleSkillNpcMinus = (UI_ComRoleSkill1)UI_ComRoleSkill1.Create(comp.GetChild("ComRoleSkillNpcMinus"));
             m_selfName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("selfName"));
             m_targetName = (UI_CompFightResultName)UI_CompFightResultName.Create(comp.GetChild("targetName"));
             m_btnSkill0 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill0"));

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -96,6 +96,10 @@ namespace GFGGame
         {
             return $"{EFFECT_DIR_PATH}/{res}/{res}.{extName}";
         }
+        public static string GetViewEffectPath(string uiName, string resName, string extName = "prefab")
+        {
+            return $"{EFFECT_DIR_PATH}/{uiName}/{resName}.{extName}";
+        }
         public static string GetCardAnimationPath(string res, string extName = "prefab")
         {
             return $"{ANIMATION_DIR_PATH}/Card/{res}/{res}.{extName}";

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -99,7 +99,8 @@ namespace GFGGame
         private void OnClickListCardItem(EventContext context)
         {
 
-            ViewManager.Show(ViewName.CARD_FOSTER_VIEW, (context.data as GObject).data);
+            ViewManager.Show(ViewName.CARD_FOSTER_VIEW, (context.data as GObject).data, new object[] { ViewName.CARD_DETAIL_VIEW });
+            this.Clear();
 
         }
         private void RenderListRoleItem(int index, GObject obj)

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -146,7 +146,8 @@ namespace GFGGame
                     GameObject.Destroy(_cardObj);
                     _cardObj = null;
                 }
-                _cardObj = DressUpUtil.AddAnimationObj(_viewData.res);
+                string resPath = ResPathUtil.GetCardAnimationPath(_viewData.res);
+                _cardObj = DressUpUtil.AddAnimationObj(resPath);
                 _cardObj.transform.localScale = new Vector3(scale, scale, scale);
                 if (_wrapper == null)
                 {

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -83,7 +83,7 @@ namespace GFGGame
         //用于获取Android原生方法类对象
         private AndroidJavaObject GetAndroidJavaObject()
         {
-            return new AndroidJavaObject("com.gfg.saveimagelibrary.SaveImageActivity"); //设置成我们aar库中的签名+类名
+            return new AndroidJavaObject("com.gfg.gfglibrary.SaveImage"); //设置成我们aar库中的签名+类名
         }
 
         private void GetSaveState(string path)

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -13,43 +13,49 @@ namespace GFGGame
         private UI_PhotographUI _ui;
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
-        private DressUpObjDataCache equipDataCache;
+        // private DressUpObjDataCache equipDataCache;
 
-        private const string MOVE = "MOVE";
-        private const string SCALE = "SCALE";
-        private const string ROTATION = "ROTATION";
+        // private const string MOVE = "MOVE";
+        // private const string SCALE = "SCALE";
+        // private const string ROTATION = "ROTATION";
         private const float MaxScale = 2;
         private const float MinScale = 0.1f;
-
-        private GameObject bodyParent;
-        private GameObject bgParent;
-        private GameObject npcParent;
-        private GameObject borderParent;
-        private GameObject sceneParent;
+        private const string BgResPath = "Bg/BgRes";
+        private const string BorderResPath = "Border/BorderRes";
+        private const string NpcResPath = "Scene/Npc/NpcRes";
+        private const string RolePath = "Scene/Role";
+        private const string NpcPath = "Scene/Npc";
+        private const string BgResName = "BgRes";
+        // private const string BorderResName = "BorderRes";
+
+        // private GameObject bodyParent;
+        // private GameObject bgParent;
+        // private GameObject npcParent;
+        // private GameObject borderParent;
+        // private GameObject sceneParent;
 
         private List<int> _listData = null;//当前选择的资源数据
-        private List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
-        private Dictionary<int, List<int>> _equipSceneData = new Dictionary<int, List<int>>();//当前穿戴的场景数据
-        private Dictionary<GameObject, Vector2> _equipPos = new Dictionary<GameObject, Vector2>();
-        private Dictionary<GameObject, Vector2> _mousePos = new Dictionary<GameObject, Vector2>();
+        public List<int> _equipRoleData = new List<int>();//当前穿戴的角色数据
+        public Dictionary<int, List<int>> _equipSceneData = new Dictionary<int, List<int>>();//当前穿戴的场景数据
         private Dictionary<GameObject, float> _equipDistance = new Dictionary<GameObject, float>();
-        // private GameObject hitGameObj;//当前选中的物体
-        private GameObject hitParentGameObj;//当前选中的父物体（需要进行移动缩放旋转的物体）
-        private GameObject memoryHitParentGameObj;//当前选中的父物体（需要进行移动缩放旋转的物体）
+
+        private GameObject hitGameObj;//当前选中的物体（单指拖动，双指缩放旋转）
+        private GameObject memoryHitGameObj;//当前选中的物体（单指缩放旋转）
 
         private Vector3 distance = Vector3.zero;//点击位置和点击物体原点的距离，用于
         private Vector2 lastPos = Vector2.zero;//上一次移动后从物体中心到鼠标位置的方向
 
-        private float _startDistance;//从物体中心到缩放按钮的距离
+        // private float _startDistance;//从物体中心到缩放按钮的距离
 
 
         private SwipeGesture swipeGesture;
         private PinchGesture pinchGesture;
         private RotationGesture rotationGesture;
 
-        private bool isTouchUI = false;//点击在m_comSelectBox按钮上
+
         private bool isTwoTouchPoint = false;
         private int maxLayer = int.MinValue;//最上层的层级数
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -59,7 +65,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBg.onClick.Add(OnClickBtnBg);
-            _ui.m_btnChoose.onClick.Add(OnClickBtnChoose);
+            _ui.m_btnChoose.onClick.Add(SetUIView);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnPhotograph.onClick.Add(OnClickBtnPhotograph);
 
@@ -89,31 +95,26 @@ namespace GFGGame
         {
             base.OnShown();
             Input.multiTouchEnabled = true;
-            equipDataCache = EquipDataCache.cacher;
+            // equipDataCache = EquipDataCache.cacher;
+            PhotographDataManager.Instance.ClassifyEquipData();
+            _equipRoleData = PhotographDataManager.Instance._equipRoleData;
+            _equipSceneData = PhotographDataManager.Instance._equipSceneData;
 
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
                 EquipDataCache.cacher.setSceneObj(_sceneObject);
-                bgParent = _sceneObject.transform.Find("Bg").gameObject;
-                bodyParent = _sceneObject.transform.Find("Scene/Role").gameObject;
-                sceneParent = _sceneObject.transform.Find("Scene").gameObject;
-                npcParent = _sceneObject.transform.Find("Scene/Npc").gameObject;
-                borderParent = _sceneObject.transform.Find("Border").gameObject;
             }
-
             pinchGesture = new PinchGesture(_ui.target);
             pinchGesture.onAction.Add(OnPinch);
             rotationGesture = new RotationGesture(_ui.target);
             rotationGesture.onAction.Add(OnRotate);
 
             _ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex = 0;
-            OnClickBtnChoose();
-            RefreshList(EnumPhotographType.BG);
-            DisposeEquipData();
-
-            SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, EnumPhotographType.BG, equipDataCache.bgId, maxLayer, out maxLayer);
 
+            RefreshList(EnumPhotographType.BG);
+            SetUIView();
+            UpdateBg(ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId));
             UpdateBody();
             UpdateScene();
 
@@ -128,24 +129,7 @@ namespace GFGGame
         {
             _ui.m_ComSelectRes.m_list.numItems = 0;
 
-            switch (index)
-            {
-                case EnumPhotographType.BG:
-                    _listData = PhotographDataManager.Instance.listBgData;
-                    break;
-                case EnumPhotographType.NPC:
-                    _listData = PhotographDataManager.Instance.listNpcData;
-                    break;
-                case EnumPhotographType.SCENE:
-                    _listData = PhotographDataManager.Instance.listSceneData;
-                    break;
-                case EnumPhotographType.BORDER:
-                    _listData = PhotographDataManager.Instance.listBorderData;
-                    break;
-                case EnumPhotographType.EFFECT:
-                    _listData = PhotographDataManager.Instance.listEffectData;
-                    break;
-            }
+            _listData = PhotographDataManager.Instance.GetListData(index);
             _ui.m_ComSelectRes.m_list.numItems = _listData.Count;
         }
         private void RenderListItem(int index, GObject obj)
@@ -161,184 +145,158 @@ namespace GFGGame
         private void OnListItemClick(EventContext context)
         {
             int itemID = (int)((context.data as GObject).data);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID);
+
             EnumPhotographType type = (EnumPhotographType)_ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex;
             switch (type)
             {
                 case EnumPhotographType.BG:
+                    UpdateBg(itemCfg);
+                    break;
+
                 case EnumPhotographType.BORDER:
+                    if (_listData.IndexOf(itemID) == 0)
+                    {
+                        Transform tf = _sceneObject.transform.Find(BorderResPath);
+                        SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+                        if (spr != null)
+                        {
+                            GameObject.Destroy(spr);
+                        }
+                        return;
+                    }
+                    UpdateBorder(itemCfg);
+                    break;
+
                 case EnumPhotographType.NPC:
-                    SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, type, itemID, maxLayer, out maxLayer);
+
+                    UpdateNpc(itemCfg);
                     break;
 
                 case EnumPhotographType.SCENE:
 
-                    PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemID, out _equipSceneData);
-                    SceneController.AddScene(_sceneObject, itemID, _equipSceneData[itemID].Count - 1, maxLayer + 1);
-                    maxLayer++;
+                    AddSceneItem(itemCfg, false);
                     break;
                 case EnumPhotographType.EFFECT:
 
                     break;
             }
         }
-        /**************************  **********************************场景*********************************************************/
+        /************************************************************场景*********************************************************/
 
         private void OnTouchUIBegin(EventContext context)
         {
             context.CaptureTouch();
-            if (_ui.m_ComSelectRes.target.visible == true) return;
-            if (Stage.inst.touchCount > 1 || context.inputEvent.touchId != 0 || isTwoTouchPoint) return;//只监听一根手指
-            if (isTouchUI) return;
+
+            if (_ui.m_ComSelectRes.target.visible == true) return;//添加道具不监听场景点击
+            if (Stage.inst.touchCount > 1 && hitGameObj != null || Stage.inst.touchCount == 1 && context.inputEvent.touchId != 0) return;//两根手指&&两指不是同时按下||一根手指但属于中途换指
+            if (PhotographDataManager.Instance.IsTouchUI(this.viewCom)) return;
 
             RaycastHit2D[] hit2Ds = Physics2D.RaycastAll(Camera.main.ScreenToWorldPoint(Input.mousePosition), Vector2.zero);
             if (hit2Ds.Length > 0)
             {
-                maxLayer++;
-                hitParentGameObj = SceneController.GetFirstHitObj(hit2Ds);
+                // maxLayer++;
+                lastPos = Vector2.zero;
+
+                hitGameObj = SceneController.GetFirstHitObj(hit2Ds);
 
                 _ui.m_comSelectBox.m_btnDelete.visible = true;
-                if (hitParentGameObj.name == "Body")//主角不可删除
+                if (hitGameObj.name == "Body")//主角不可删除
                 {
                     _ui.m_comSelectBox.m_btnDelete.visible = false;
                 }
                 _ui.m_comSelectBox.target.visible = false;
-                if (hitParentGameObj.name != "BgRes")//背景不可改动层级
+                if (hitGameObj.name != BgResName)//背景不可改动层级
                 {
-                    hitParentGameObj.GetComponent<SpriteRenderer>().sortingOrder = maxLayer;
-                    hitParentGameObj = hitParentGameObj.transform.parent.gameObject;
+                    hitGameObj = hitGameObj.transform.parent.gameObject;
+
+                    PhotographDataManager.Instance.SetItemLayer(hitGameObj, maxLayer);
+                    maxLayer = PhotographDataManager.Instance.GetMaxLayer(hitGameObj, maxLayer) + 1;
                     _ui.m_comSelectBox.target.visible = true;
 
+                    SceneController.SetGameObjectCenter(hitGameObj);
                 }
+                memoryHitGameObj = hitGameObj;
 
-                distance = Input.mousePosition - Camera.main.WorldToScreenPoint(hitParentGameObj.transform.position);
-
-
-                if (_ui.m_comSelectBox.target.data == null || _ui.m_comSelectBox.target.data as GameObject != hitParentGameObj)
-                {
-                    lastPos = Vector2.zero;
-                    _ui.m_comSelectBox.target.rotation = -hitParentGameObj.transform.eulerAngles.z;
-                    _ui.m_comSelectBox.target.size = SceneController.GetGameObjectSize(hitParentGameObj);
-                }
-                _ui.m_comSelectBox.target.data = hitParentGameObj;
+                distance = Input.mousePosition - Camera.main.WorldToScreenPoint(hitGameObj.transform.position);
 
+                _ui.m_comSelectBox.target.rotation = -hitGameObj.transform.eulerAngles.z;
+                _ui.m_comSelectBox.target.size = SceneController.GetGameObjectSize(hitGameObj);
                 ControllerSelectBoxPos();
             }
         }
-
         private void OnTouchUIMove(EventContext context)
         {
-            if (hitParentGameObj == null) return;//未选中任何物体
-            if (Stage.inst.touchCount > 1 || context.inputEvent.touchId != 0 || isTwoTouchPoint) return; //只监听1根手指
-            if (isTouchUI) return;
+            if (hitGameObj == null) return;//未选中任何物体
+            if (Stage.inst.touchCount > 1) return; //只监听1根手指
+            if (PhotographDataManager.Instance.IsTouchUI(this.viewCom)) return;
 
             Debug.Log("拖动");
             ControllerObjectPos();
             ControllerSelectBoxPos();
-
         }
         private void OnTouchUIEnd(EventContext context)
         {
-            if (Stage.inst.touchCount > 1 || context.inputEvent.touchId != 0) return; //只监听1根手指
-            hitParentGameObj = null;
-            if (Stage.inst.touchCount == 0)
-            {
-                isTwoTouchPoint = false;
-            }
+            // if (Stage.inst.touchCount > 1 || context.inputEvent.touchId != 0) return; //只监听1根手指
+            hitGameObj = null;
         }
 
+
         //选中物体的位置
         private void ControllerObjectPos()
         {
-            hitParentGameObj.transform.position = Camera.main.ScreenToWorldPoint(Input.mousePosition - distance);
-            if (hitParentGameObj.name == "BgRes")
+            hitGameObj.transform.position = Camera.main.ScreenToWorldPoint(Input.mousePosition - distance);
+            if (hitGameObj.name == BgResName)
             {
-                Vector2 size = hitParentGameObj.GetComponent<SpriteRenderer>().size;
-                Vector2 uiSize = _ui.target.size;
-                float deviationWidth = (size.x - uiSize.x / 100) / 2;
-                float deviationHeigh = (size.y - uiSize.y / 100) / 2;
-                Vector2 pos = hitParentGameObj.transform.position;
-                if (pos.x <= -deviationWidth)
-                {
-                    hitParentGameObj.transform.position = new Vector2(-deviationWidth, hitParentGameObj.transform.position.y);
-                }
-                if (pos.x >= deviationWidth)
-                {
-                    hitParentGameObj.transform.position = new Vector2(deviationWidth, hitParentGameObj.transform.position.y);
-                }
-                if (pos.y <= -deviationHeigh)
-                {
-                    hitParentGameObj.transform.position = new Vector2(hitParentGameObj.transform.position.x, -deviationHeigh);
-                }
-                if (pos.y >= deviationHeigh)
-                {
-                    hitParentGameObj.transform.position = new Vector2(hitParentGameObj.transform.position.x, deviationHeigh);
-                }
+                PhotographDataManager.Instance.SetBgPos(hitGameObj, _ui.target.size);
             }
         }
-
         //选中框的位置
         private void ControllerSelectBoxPos()
         {
-            SceneController.SetGameObjectCenter(hitParentGameObj);
-
-            //位置：角色、道具、npc全用对应父物体的位置
-            Vector2 objScreenPos = Camera.main.WorldToScreenPoint(hitParentGameObj.transform.position);
+            Vector2 objScreenPos = Camera.main.WorldToScreenPoint(hitGameObj.transform.position);
             Vector2 localPos = this.viewCom.GlobalToLocal(new Vector2(objScreenPos.x, (Screen.height - objScreenPos.y)));
-
-            _ui.m_comSelectBox.target.position = localPos;//(localPos.x, localPos.y);
-
+            _ui.m_comSelectBox.target.position = localPos;
         }
 
 
 
         private void OnTouchBtnSizeBegin(EventContext context)
         {
-            isTouchUI = true;
-
-            GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
             InputEvent inputEvent = (InputEvent)context.data;
             Vector2 screenPos = this.viewCom.GlobalToLocal(_ui.m_comSelectBox.m_btnSize.LocalToGlobal(Vector2.zero));
             Vector2 pt = new Vector2(screenPos.x, screenPos.y);
-            Vector2 pt1 = this.viewCom.GlobalToLocal(new Vector2(inputEvent.x, inputEvent.y));
             Vector2 pt2 = new Vector2(_ui.m_comSelectBox.target.x, _ui.m_comSelectBox.target.y);
-            Debug.Log("pt1" + pt1 + "   pt2:" + pt2);
 
-            if (!_equipDistance.ContainsKey(gameObject))
+            if (!_equipDistance.ContainsKey(memoryHitGameObj))
             {
-                float distance = Vector2.Distance(pt, pt2) / gameObject.transform.localScale.x;
-                _equipDistance.Add(gameObject, distance);
+                float distance = Vector2.Distance(pt, pt2) / memoryHitGameObj.transform.localScale.x;
+                _equipDistance.Add(memoryHitGameObj, distance);
             }
-            _startDistance = _equipDistance[gameObject];
-            Debug.Log("_startDistance:" + _startDistance);
-
         }
         private void OnTouchBtnSizeMove(EventContext context)
         {
-            GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
-            if (gameObject == null) return;
+            if (memoryHitGameObj == null) return;
             InputEvent inputEvent = (InputEvent)context.data;
             Vector2 pt1 = this.viewCom.GlobalToLocal(new Vector2(inputEvent.x, inputEvent.y));
             Vector2 pt2 = new Vector2(_ui.m_comSelectBox.target.x, _ui.m_comSelectBox.target.y);
             Vector2 curPos = pt1 - pt2;
-            Debug.Log("pt1" + pt1 + "   pt2:" + pt2 + "  curPos:" + curPos + "    lastPos:" + lastPos);
+
             float angle = Vector3.Angle(lastPos, curPos); //求出两向量之间的夹角 
             Vector3 normal = Vector3.Cross(lastPos, curPos);//叉乘求出法线向量 
             angle *= Mathf.Sign(Vector3.Dot(normal, Vector3.forward));  //Mathf.Sign()求符号，Vector3.Dot()求方向，求法线向量与物体上方向向量点乘，结果为1或-1，修正旋转方向 
             lastPos = curPos;
-            ControllerRotate(angle, gameObject);
-            Debug.Log("angle:" + angle);
+            ControllerRotate(angle, memoryHitGameObj);
 
-            float dist = Vector2.Distance(pt1, pt2);
-            Debug.Log("dist:" + dist);
 
-            float ss = dist / _startDistance;
+            float dist = Vector2.Distance(pt1, pt2);
+            float ss = dist / _equipDistance[memoryHitGameObj];
             float newValue = Mathf.Clamp(ss, 0.1f, 2);
-            ControllerScale(newValue, gameObject);
+            ControllerScale(newValue, memoryHitGameObj);
 
         }
         private void OnTouchBtnSizeEnd(EventContext context)
         {
-            isTouchUI = false;
             lastPos = Vector2.zero;
         }
 
@@ -347,41 +305,39 @@ namespace GFGGame
         //双指缩放
         private void OnPinch(EventContext context)
         {
-            if (hitParentGameObj == null) return;
-            if (hitParentGameObj.name == "BgRes") return;//背景不可以缩放、旋转
-            isTwoTouchPoint = true;
 
-            GTween.Kill(hitParentGameObj);
+            if (hitGameObj == null) return;
+            if (hitGameObj.name == BgResName) return;//背景不可以缩放、旋转
 
+            GTween.Kill(hitGameObj);
             PinchGesture gesture = (PinchGesture)context.sender;
-            float newValue = Mathf.Clamp(hitParentGameObj.transform.localScale.x + gesture.delta, 0.3f, 2);
+            float newValue = Mathf.Clamp(hitGameObj.transform.localScale.x + gesture.delta, 0.3f, 2);
             Debug.Log("双指缩放:" + newValue);
 
-            ControllerScale(newValue, hitParentGameObj);
+            ControllerScale(newValue, hitGameObj);
         }
-
-        private void ControllerScale(float value, GameObject gameObject)
-        {
-            if (value > MaxScale || value < MinScale) return;
-            gameObject.transform.localScale = new Vector3(value, value, value);
-            Vector2 size = SceneController.GetGameObjectSize(gameObject);
-            _ui.m_comSelectBox.target.SetSize(size.x, size.y);
-        }
-
-
+        //双指旋转
         private void OnRotate(EventContext context)
         {
-            if (hitParentGameObj == null) return;
-            if (hitParentGameObj.name == "BgRes") return;//背景不可以缩放、旋转
-            isTwoTouchPoint = true;
-
-
-            GTween.Kill(hitParentGameObj.transform);
+            Debug.Log("双指旋转hitGameObj:" + hitGameObj);
+            if (hitGameObj == null) return;
+            Debug.Log("双指旋转name:" + hitGameObj.name);
+            if (hitGameObj.name == BgResName) return;//背景不可以缩放、旋转
+            // isTwoTouchPoint = true;
 
+            GTween.Kill(hitGameObj.transform);
             RotationGesture gesture = (RotationGesture)context.sender;
             Debug.Log("双指旋转:" + gesture.delta);
+            ControllerRotate(gesture.delta, hitGameObj);
+        }
 
-            ControllerRotate(gesture.delta, hitParentGameObj);
+
+        private void ControllerScale(float value, GameObject gameObject)
+        {
+            if (value > MaxScale || value < MinScale) return;
+            gameObject.transform.localScale = new Vector3(value, value, 1);
+            Vector2 size = SceneController.GetGameObjectSize(gameObject);
+            _ui.m_comSelectBox.target.SetSize(size.x, size.y);
         }
         private void ControllerRotate(float value, GameObject gameObject)
         {
@@ -389,13 +345,25 @@ namespace GFGGame
             _ui.m_comSelectBox.target.rotation += value;
         }
 
+
+        private void UpdateBg(ItemCfg itemCfg)
+        {
+            Transform tf = _sceneObject.transform.Find(BgResPath);
+            string resPath = ResPathUtil.GetDressUpPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
+            SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+            spr.sortingOrder = ItemTypeCfgArray.Instance.GetCfg(ConstDressUpItemType.BEI_JING).defaultLayer;
+            SceneController.SetBoxCollider2DToGameObject(tf.gameObject);
+        }
         //主角
         private void UpdateBody()
         {
+            GameObject bodyParent = _sceneObject.transform.Find(RolePath).gameObject;
+            SceneController.UpdatePhotographBody(_equipRoleData.ToArray(), _sceneObject, bodyParent);
 
-            SceneController.UpdatePhotographBody(_equipRoleData.ToArray(), _sceneObject, false, null, false, bodyParent);
+            maxLayer = PhotographDataManager.Instance.GetMaxLayer(bodyParent, maxLayer) + 1;
         }
-        //场景道具
+        //添加初始场景道具
         private void UpdateScene()
         {
             ICollection keys = _equipSceneData.Keys;
@@ -403,75 +371,112 @@ namespace GFGGame
             {
                 for (int i = 0; i < _equipSceneData[key].Count; i++)
                 {
-                    SceneController.AddScene(_sceneObject, key, i);
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
-                    PhotographDataManager.Instance.GetMaxLayer(maxLayer, false, itemCfg, out maxLayer);
+                    int defaultLayer = ItemTypeCfgArray.Instance.GetCfg(itemCfg.subType).defaultLayer;
+                    AddSceneItem(itemCfg, true);
                 }
             }
         }
-
-
-        //滤镜效果
+        private void UpdateNpc(ItemCfg itemCfg)
+        {
+            maxLayer++;
+            Transform tf = _sceneObject.transform.Find(NpcResPath);
+            string resPath = ResPathUtil.GetNpcPicFPath(itemCfg.res);
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
+            SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+            spr.sortingOrder = maxLayer;
+            tf.localPosition = new Vector2(-spr.bounds.center.x, -spr.bounds.center.y);
+            SceneController.SetBoxCollider2DToGameObject(tf.gameObject);
+        }
+        private void UpdateBorder(ItemCfg itemCfg)
+        {
+            Transform tf = _sceneObject.transform.Find(BorderResPath);
+            string resPath = ResPathUtil.GetPhotographFPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
+            SceneController.SetSpriteRendererToTransform(tf, resPath);
+            SpriteRenderer spr = tf.GetComponent<SpriteRenderer>();
+            spr.sortingOrder = 10000;//边框在所有道具的上边
+        }
         private void UpdateEffect()
         {
 
         }
 
 
-
-        private void DisposeEquipData()
+        private void AddSceneItem(ItemCfg itemCfg, bool isDefaultLayer)
         {
-            for (int i = 0; i < equipDataCache.equipDatas.Length; i++)
+            int index = 0;
+
+            GameObject parentGameObj;
+            if (itemCfg.resLayer2 > 0)
             {
-                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(equipDataCache.equipDatas[i]);
-                if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING)
+                if (!isDefaultLayer)
                 {
                     PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemCfg.id, out _equipSceneData);
                 }
-                else
+                index = _equipSceneData[itemCfg.id].Count - 1;
+                parentGameObj = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, index, 1));
+                SceneController.AddItemToScene(_sceneObject, parentGameObj, itemCfg.id, 2, itemCfg.resLayer2);
+
+                maxLayer = PhotographDataManager.Instance.GetMaxLayer(parentGameObj, maxLayer) + 1;
+
+                if (!isDefaultLayer)
                 {
-                    _equipRoleData.Add(equipDataCache.equipDatas[i]);
+                    PhotographDataManager.Instance.SetItemLayer(parentGameObj, maxLayer);
                 }
+
             }
+            if (itemCfg.resLayer1 > 0)
+            {
+                if (!isDefaultLayer)
+                {
+                    PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemCfg.id, out _equipSceneData);
+                }
+                index = _equipSceneData[itemCfg.id].Count - 1;
+
+                parentGameObj = new GameObject(string.Format("{0}_{1}_{2}", itemCfg.id, index, 0));
+                SceneController.AddItemToScene(_sceneObject, parentGameObj, itemCfg.id, 1, itemCfg.resLayer1);
+
+                maxLayer = PhotographDataManager.Instance.GetMaxLayer(parentGameObj, maxLayer) + 1;
 
+                if (!isDefaultLayer)
+                {
+                    PhotographDataManager.Instance.SetItemLayer(parentGameObj, maxLayer);
+                }
+
+            }
         }
 
+
+
+
+
+
         private void OnClickBtnBg()
         {
             _ui.m_ComSelectRes.target.visible = false;
-
-        }
-        private void OnClickBtnChoose()
-        {
-            _ui.m_ComSelectRes.target.visible = true;
-            _ui.m_comSelectBox.target.visible = false;
-            hitParentGameObj = null;
         }
-        private void OnTouchBtnFlipBegin()
+        private void OnTouchBtnFlipBegin()//翻转
         {
-            isTouchUI = true;
-            Transform transform = (_ui.m_comSelectBox.target.data as GameObject).transform;
+            Transform transform = memoryHitGameObj.transform;
             for (int i = 0; i < transform.childCount; i++)
             {
-                transform.GetChild(i).Rotate(Vector3.up, 180, Space.World);
+                transform.GetChild(i).Rotate(Vector3.up, 180, Space.Self);
             }
         }
         private void OnTouchBtnFlipEnd()
         {
-            isTouchUI = false;
+
         }
 
-        private void OnTouchBtnDeleteBegin()
+        private void OnTouchBtnDeleteBegin()//删除
         {
-            isTouchUI = true;
-            GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
-            if (gameObject.transform.gameObject == bodyParent)
+            if (memoryHitGameObj.transform.name == RolePath)
             {
                 return;
             }
-            else if (gameObject.transform.gameObject == npcParent)
+            else if (memoryHitGameObj.transform.name == NpcPath)
             {
-                SpriteRenderer spriteRenderer = gameObject.transform.GetChild(0).GetComponent<SpriteRenderer>();
+                SpriteRenderer spriteRenderer = memoryHitGameObj.transform.GetChild(0).GetComponent<SpriteRenderer>();
                 if (spriteRenderer != null)
                 {
                     GameObject.Destroy(spriteRenderer);
@@ -479,14 +484,21 @@ namespace GFGGame
             }
             else
             {
-                GameObject.DestroyImmediate(gameObject);
+                GameObject.DestroyImmediate(memoryHitGameObj);
             }
             _ui.m_comSelectBox.target.visible = false;
 
         }
         private void OnTouchBtnDeleteEnd()
         {
-            isTouchUI = false;
+
+        }
+        private void SetUIView()
+        {
+            _ui.m_ComSelectRes.target.visible = true;
+            _ui.m_comSelectBox.target.visible = false;
+            hitGameObj = null;
+            memoryHitGameObj = null;
         }
         private void OnClickBtnPhotograph()
         {
@@ -505,7 +517,6 @@ namespace GFGGame
 
             ViewManager.Show<PhotographSaveView>(tex);
             _ui.target.visible = true;
-
         }
 
         private void OnClickBtnBack()
@@ -522,10 +533,11 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-            equipDataCache = null;
+            // equipDataCache = null;
             _equipRoleData.Clear();
             _equipSceneData.Clear();
-            hitParentGameObj = null;
+            hitGameObj = null;
+            memoryHitGameObj = null;
 
             pinchGesture.onAction.Remove(OnPinch);
             rotationGesture.onAction.Remove(OnRotate);

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

@@ -25,6 +25,14 @@ namespace GFGGame
         private const int _range = 30;//圆圈随机范围
         private float _time = 0;// 登峰造极按住的时间
 
+        private GameObject _effectObj0;
+        private GoWrapper _wrapper0;
+        private GameObject _effectObj0_1;
+        private GoWrapper _wrapper0_1;
+        private GameObject _effectObj1;
+        private GoWrapper _wrapper1;
+        private GameObject _effectObj1_1;
+        private GoWrapper _wrapper1_1;
         private Dictionary<int, RoleSkillCfg> _npcSkillDic;
 
         public override void Dispose()
@@ -83,6 +91,7 @@ namespace GFGGame
             _ui.m_targetName.m_txtName.text = fightCfg.targetName;
 
             UpdateNormal();
+            AddEffect();
 
             ScoreSystemData.Instance.SetEquipDicWithType();
             _npcSkillDic = SkillDataManager.Instance.GetNpcSkill();
@@ -103,6 +112,19 @@ namespace GFGGame
                 GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
             }
         }
+        private void AddEffect()
+        {
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_sc");
+            SceneController.AddObjectToView(_effectObj0, _wrapper0, _ui.m_ComShieldMine.m_holder, resPath0, out _effectObj0, out _wrapper0);
+            SceneController.AddObjectToView(_effectObj1, _wrapper1, _ui.m_ComShieldNpc.m_holder, resPath0, out _effectObj1, out _wrapper1);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_ps");
+            SceneController.AddObjectToView(_effectObj0_1, _wrapper0_1, _ui.m_ComShieldMine.m_holder1, resPath1, out _effectObj0_1, out _wrapper0_1);
+            SceneController.AddObjectToView(_effectObj1_1, _wrapper1_1, _ui.m_ComShieldNpc.m_holder1, resPath1, out _effectObj1_1, out _wrapper1_1);
+            _ui.m_ComShieldMine.m_holder.visible = false;
+            _ui.m_ComShieldMine.m_holder1.visible = false;
+            _ui.m_ComShieldNpc.m_holder.visible = false;
+            _ui.m_ComShieldNpc.m_holder1.visible = false;
+        }
 
         private void CircleScoreStart(object param)
         {
@@ -240,7 +262,8 @@ namespace GFGGame
         }
         private void UpdateAddUI(RoleSkillCfg cfg, int role)
         {
-            UI_ComRoleSkillScore comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
+            UI_ComRoleSkill comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineAdd : _ui.m_ComRoleSkillNpcAdd;
+            comRoleSkillScore.target.visible = true;
             int score = 0;
             if (role == SkillDataManager.MINE)
             {
@@ -252,9 +275,12 @@ namespace GFGGame
                 score = (int)_targetMainScore * cfg.value / 100;
                 _targetScore += score;
             }
-            comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
-            comRoleSkillScore.m_comRoleSkill.m_txtScore.SetVar("count", score.ToString()).FlushVars();
-            comRoleSkillScore.m_t0.Play();
+            // comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
+            comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+            comRoleSkillScore.m_t0.Play(() =>
+                {
+                    comRoleSkillScore.target.visible = false;
+                });
 
             UpdateProgressBar();
 
@@ -271,14 +297,17 @@ namespace GFGGame
             comSkillMinus.TweenValue(100, 2f).OnComplete(() =>
             {
                 comSkillMinus.visible = false;
-                if (targetComSkillShield.target.visible)
+
+                if (targetComSkillShield.m_holder.visible)
                 {
-                    targetComSkillShield.target.visible = false;
+                    targetComSkillShield.m_holder.visible = false;
+                    targetComSkillShield.m_holder1.visible = true;
                     return;
                 }
 
-                UI_ComRoleSkillScore comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
-
+                UI_ComRoleSkill1 comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
+                comRoleSkillScore.target.visible = true;
+                comRoleSkillScore.m_c1.selectedIndex = role == SkillDataManager.MINE ? 0 : 1;
                 int score = 0;
                 if (role == SkillDataManager.MINE)
                 {
@@ -292,9 +321,24 @@ namespace GFGGame
                     _score -= score;
                 }
 
-                comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 1;
-                comRoleSkillScore.m_comRoleSkill.m_txtScore.SetVar("count", score.ToString()).FlushVars();
-                comRoleSkillScore.m_t1.Play();
+                // comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 1;
+                comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
+                if (role == SkillDataManager.MINE)
+                {
+
+                    comRoleSkillScore.m_t0.Play(() =>
+                    {
+                        comRoleSkillScore.target.visible = false;
+                    });
+                }
+                else
+                {
+                    comRoleSkillScore.m_t1.Play(() =>
+                {
+                    comRoleSkillScore.target.visible = false;
+                });
+                }
+
                 UpdateProgressBar();
 
             });
@@ -315,9 +359,16 @@ namespace GFGGame
         private void UpdateShieldUI(RoleSkillCfg cfg, int role)
         {
             UI_ComSkillShield comSkillShield = role == SkillDataManager.MINE ? _ui.m_ComShieldMine : _ui.m_ComShieldNpc;
-            comSkillShield.target.visible = true;
 
-            Timers.inst.Add(cfg.duration, 1, (param) => { comSkillShield.target.visible = false; });
+            comSkillShield.m_holder.visible = true;
+            comSkillShield.m_holder1.visible = false;
+
+            Timers.inst.Add(cfg.duration, 1, (param) =>
+            {
+                // comSkillShield.target.visible = false;
+                comSkillShield.m_holder.visible = false;
+
+            });
         }
         private void OnBtnBackClick()
         {
@@ -359,13 +410,16 @@ namespace GFGGame
             GTweener twenerNpc = GTween.GetTween(_ui.m_proMinusNpc, TweenPropType.Progress);
             if (twenerNpc != null) twenerNpc.Kill(true);
 
-            _ui.m_ComShieldNpc.target.visible = false;
-            _ui.m_ComShieldMine.target.visible = false;
+            // _ui.m_ComShieldNpc.target.visible = false;
+            // _ui.m_ComShieldMine.target.visible = false;
+
+            _ui.m_ComShieldMine.m_holder.visible = false;
+            _ui.m_ComShieldNpc.m_holder1.visible = false;
 
-            _ui.m_ComRoleSkillMineAdd.m_comRoleSkill.target.visible = false;
-            _ui.m_ComRoleSkillMineMinus.m_comRoleSkill.target.visible = false;
-            _ui.m_ComRoleSkillNpcAdd.m_comRoleSkill.target.visible = false;
-            _ui.m_ComRoleSkillNpcMinus.m_comRoleSkill.target.visible = false;
+            _ui.m_ComRoleSkillMineAdd.target.visible = false;
+            _ui.m_ComRoleSkillMineMinus.target.visible = false;
+            _ui.m_ComRoleSkillNpcAdd.target.visible = false;
+            _ui.m_ComRoleSkillNpcMinus.target.visible = false;
 
             RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
             for (int i = 0; i < roleSkillCfgs.Length; i++)

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -12,6 +12,8 @@ namespace GFGGame
         private GameObject _sceneObject;
         private ValueBarController _valueBarController;
 
+        private float effectTime = 0.7f;
+        private bool isOpen = false;
         private GButton _btnGongGao;
         private GButton _btnHaoYou;
         private GButton _btnYouJian;
@@ -21,6 +23,32 @@ namespace GFGGame
         private GButton _btnTianGong;
         private GButton _btnStore;
         private GButton _btnTuJian;
+
+        private GameObject _effectObj0;
+        private GoWrapper _wrapper0;
+        private GameObject _effectObj1;
+        private GoWrapper _wrapper1;
+        private GameObject _effectObj2;
+        private GoWrapper _wrapper2;
+        private GameObject _effectObj3;
+        private GoWrapper _wrapper3;
+        private GameObject _effectObj4;
+        private GoWrapper _wrapper4;
+
+        private GameObject _effectObj0_1;
+        private GoWrapper _wrapper0_1;
+        private GameObject _effectObj1_1;
+        private GoWrapper _wrapper1_1;
+        private GameObject _effectObj2_1;
+        private GoWrapper _wrapper2_1;
+        private GameObject _effectObj3_1;
+        private GoWrapper _wrapper3_1;
+        private GameObject _effectObj4_1;
+        private GoWrapper _wrapper4_1;
+
+        private GameObject _effectObj5;
+        private GoWrapper _wrapper5;
+
         public override void Dispose()
         {
             _valueBarController.Dispose();
@@ -60,16 +88,19 @@ namespace GFGGame
             _btnJInShu.visible = false;
             _btnTianGong.visible = false;
 
-            _ui.m_btnMain.onClick.Add(OnClickBtnMain);
-            _ui.m_btnHuanZhuang.onClick.Add(OnClickBtnHuanZhuang);
-            _ui.m_btnZhaiXing.onClick.Add(OnClickBtnZhaiXing);
-            _ui.m_btnXiuFang.onClick.Add(OnClickBtnXiuFang);
-            _ui.m_btnCiPai.onClick.Add(OnClickBtnCiPai);
+            _ui.m_btnMain.target.onTouchBegin.Add(OnClickBtnMain);
+            _ui.m_btnHuanZhuang.target.onTouchBegin.Add(OnClickBtnHuanZhuang);
+            _ui.m_btnZhaiXing.target.onTouchBegin.Add(OnClickBtnZhaiXing);
+            _ui.m_btnXiuFang.target.onTouchBegin.Add(OnClickBtnXiuFang);
+            _ui.m_btnCiPai.target.onTouchBegin.Add(OnClickBtnCiPai);
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
 
             _btnStore.onClick.Add(OnClickBtnStore);
             _btnTuJian.onClick.Add(OnClickBtnTuJian);
             _btnYouJian.onClick.Add(OnClickBtnYouJian);
+
+
+
         }
 
         protected override void OnShown()
@@ -84,6 +115,7 @@ namespace GFGGame
             SceneController.UpdateMainScene(_sceneObject);
             UpdateRoleLvl();
             _valueBarController.OnShown();
+            AddEffect();
 
             TryGuide();
             Timers.inst.AddUpdate(Update);
@@ -102,37 +134,111 @@ namespace GFGGame
             Timers.inst.Remove(Update);
             Timers.inst.Remove(UpdateToCheckGuide);
         }
+        private void AddEffect()
+        {
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_xf_tx");
+            SceneController.AddObjectToView(_effectObj0, _wrapper0, _ui.m_btnXiuFang.m_holder, resPath0, out _effectObj0, out _wrapper0);
+            SceneController.AddObjectToView(_effectObj1, _wrapper1, _ui.m_btnHuanZhuang.m_holder, resPath0, out _effectObj1, out _wrapper1);
+            SceneController.AddObjectToView(_effectObj2, _wrapper2, _ui.m_btnZhaiXing.m_holder, resPath0, out _effectObj2, out _wrapper2);
+            SceneController.AddObjectToView(_effectObj3, _wrapper3, _ui.m_btnCiPai.m_holder, resPath0, out _effectObj3, out _wrapper3);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zzl_tx");
+            SceneController.AddObjectToView(_effectObj4, _wrapper4, _ui.m_btnMain.m_holder, resPath1, out _effectObj4, out _wrapper4);
+
+            string resPath3 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_dj");
+            SceneController.AddObjectToView(_effectObj0_1, _wrapper0_1, _ui.m_btnXiuFang.m_holder1, resPath3, out _effectObj0_1, out _wrapper0_1);
+            SceneController.AddObjectToView(_effectObj1_1, _wrapper1_1, _ui.m_btnHuanZhuang.m_holder1, resPath3, out _effectObj1_1, out _wrapper1_1);
+            SceneController.AddObjectToView(_effectObj2_1, _wrapper2_1, _ui.m_btnZhaiXing.m_holder1, resPath3, out _effectObj2_1, out _wrapper2_1);
+            SceneController.AddObjectToView(_effectObj3_1, _wrapper3_1, _ui.m_btnCiPai.m_holder1, resPath3, out _effectObj3_1, out _wrapper3_1);
+            SceneController.AddObjectToView(_effectObj4_1, _wrapper4_1, _ui.m_btnMain.m_holder1, resPath3, out _effectObj4_1, out _wrapper4_1);
+
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_zjm", "ui_zjm_tx");
+            SceneController.AddObjectToView(_effectObj5, _wrapper5, _ui.m_headBar.m_holder, resPath2, out _effectObj5, out _wrapper5);
+        }
+
 
         private void OnClickBtnMain()
         {
-            this.Hide();
-            ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW);
+            if (isOpen) return;
+            isOpen = true;
+            _ui.m_btnMain.m_holder1.visible = true;
+            Timers.inst.Add(effectTime, 1, (param) =>
+            {
+                _ui.m_btnMain.m_holder1.visible = false;
+                this.Hide();
+                ViewManager.Show(ViewName.STORY_CHAPTER_LIST_VIEW);
+                isOpen = false; ;
+
+
+            });
         }
 
         private void OnClickBtnHuanZhuang()
         {
-            this.Hide();
-            ViewManager.Show(ViewName.DRESS_UP_VIEW);
+            if (isOpen) return;
+            isOpen = true;
+            _ui.m_btnHuanZhuang.m_holder1.visible = true;
+
+            Timers.inst.Add(effectTime, 1, (param) =>
+            {
+                _ui.m_btnHuanZhuang.m_holder1.visible = false;
+                this.Hide();
+                ViewManager.Show(ViewName.DRESS_UP_VIEW);
+                isOpen = false;
+
+
+            });
         }
 
         private void OnClickBtnZhaiXing()
         {
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
-            ViewManager.Show(ViewName.LUCKY_BOX_VIEW, null, null, false, true);
+            if (isOpen) return;
+            isOpen = true;
+            _ui.m_btnZhaiXing.m_holder1.visible = true;
+
+            Timers.inst.Add(effectTime, 1, (param) =>
+            {
+                _ui.m_btnZhaiXing.m_holder1.visible = false;
+                Timers.inst.AddUpdate(UpdateToCheckGuide);
+                ViewManager.Show(ViewName.LUCKY_BOX_VIEW, null, null, false, true);
+                isOpen = false;
+
+
+            });
         }
 
         private void OnClickBtnXiuFang()
         {
-            Timers.inst.AddUpdate(UpdateToCheckGuide);
-            ViewManager.Show(ViewName.XIU_FANG_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            if (isOpen) return;
+            isOpen = true;
+            _ui.m_btnXiuFang.m_holder1.visible = true;
+            Timers.inst.Add(effectTime, 1, (param) =>
+            {
+                _ui.m_btnXiuFang.m_holder1.visible = false;
+                Timers.inst.AddUpdate(UpdateToCheckGuide);
+                ViewManager.Show(ViewName.XIU_FANG_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+                isOpen = false;
+
+
+            });
         }
         private void OnClickBtnCiPai()
         {
-            //Timers.inst.AddUpdate(UpdateToCheckGuide);
-            ViewManager.Show(ViewName.CARD_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            if (isOpen) return;
+            isOpen = true;
+            _ui.m_btnCiPai.m_holder1.visible = true;
+            Timers.inst.Add(effectTime, 1, (param) =>
+            {
+                _ui.m_btnCiPai.m_holder1.visible = false;
+                //Timers.inst.AddUpdate(UpdateToCheckGuide);
+                ViewManager.Show(ViewName.CARD_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+                isOpen = false;
+
+            });
 
         }
 
+
+
         private void OnClickBtnStore()
         {
             Timers.inst.AddUpdate(UpdateToCheckGuide);
@@ -187,11 +293,11 @@ namespace GFGGame
 
         private void TryGuide()
         {
-            if (!GuideController.TryGuideByGuideId(_ui.m_btnZhaiXing, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, false, "点击摘星按钮，进入抽奖界面"))
+            if (!GuideController.TryGuideByGuideId(_ui.m_btnZhaiXing.target, ConstGuideId.MAIN_UI_BTN_ZHAI_XING, 1, false, "点击摘星按钮，进入抽奖界面"))
             {
-                if (!GuideController.TryGuideByGuideId(_ui.m_btnHuanZhuang, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "点击自由换装按钮，进入换装界面"))
+                if (!GuideController.TryGuideByGuideId(_ui.m_btnHuanZhuang.target, ConstGuideId.MAIN_UI_BTN_HUAN_ZHUANG, 1, false, "点击自由换装按钮，进入换装界面"))
                 {
-                    GuideController.TryGuideByGuideId(_ui.m_btnMain, ConstGuideId.MAIN_UI_BTN_STORY, 1, false, "这套服装搭配这个背景可真好看！点击按钮，继续故事可以获取更多好看的服装");
+                    GuideController.TryGuideByGuideId(_ui.m_btnMain.target, ConstGuideId.MAIN_UI_BTN_STORY, 1, false, "这套服装搭配这个背景可真好看！点击按钮，继续故事可以获取更多好看的服装");
                 }
             }
         }

GameClient/Assets/MD5/MusicMd5

@@ -1 +1 @@
-)../../../gfg/正式资源/music/fight.mp3 488360779cc496ac14788cf3735a22f9)../../../gfg/正式资源/music/music.mp3 488360779cc496ac14788cf3735a22f9+../../../gfg/正式资源/music/zhuxian.mp3 f29da32eeb48f1b5238c0c5785004fe0)../../../gfg/正式资源/music/story.mp3 c1c693e165ecf7b58056daa6c876608a
+)../../../gfg/正式资源/music/fight.mp3 488360779cc496ac14788cf3735a22f9+../../../gfg/正式资源/music/zhuxian.mp3 f29da32eeb48f1b5238c0c5785004fe0

GameClient/Assets/Plugins/Android/libs/SaveImageLibrary-debug.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 1c26febe1b8d9b74abc1ecc731b2732f
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_eshh1f.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 1de6c0149860c09488e988f47b783ffb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ThirdParty/FairyGUI/Scripts/Gesture/RotationGesture.cs

@@ -122,6 +122,7 @@ namespace FairyGUI
 
         void __touchMove(EventContext context)
         {
+            Debug.Log("zoya_000:" + _touchBegan + "    " + Stage.inst.touchCount);
             if (!_touchBegan || Stage.inst.touchCount != 2)
                 return;
 
@@ -131,12 +132,15 @@ namespace FairyGUI
             Vector2 vec = pt1 - pt2;
 
             float rot = Mathf.Rad2Deg * ((Mathf.Atan2(vec.y, vec.x) - Mathf.Atan2(_startVector.y, _startVector.x)));
+            Debug.Log("zoya_111:" + rot + "    " + vec + "     " + _startVector);
+
             if (snapping)
             {
                 rot = Mathf.Round(rot);
                 if (rot == 0)
                     return;
             }
+            Debug.Log("zoya_222:" + _started + "     " + rot);
 
             if (!_started && rot > 5)
             {

GameClient/Packages/packages-lock.json

@@ -1,5 +1,11 @@
 {
   "dependencies": {
+    "com.unity.2d.sprite": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.collab-proxy": {
       "version": "1.15.12",
       "depth": 0,