Merge remote-tracking branch 'refs/remotes/origin/jiaoneiqunuan' into jiaoneiqunuan

taobao_jn/client/mini.project.json

+{
+    "exclude": [
+        "server/**"
+    ]
+}

taobao_jn/client/pages/pagegamemain/pagegamemain.acss

@@ -628,10 +628,10 @@ letter-spacing: 3rpx;
 }
 @keyframes aniscale{
   from{
-    transform: scale(0);
+    transform: translateX(411rpx)
   }
   to{
-    transform: scale(1);
+    transform: translateX(0rpx)
   }
 }
 .gamemain .gamembot .gameinfogro .gameminfo {

taobao_jn/client/pages/pagegamemain/pagegamemain.axml

@@ -69,8 +69,8 @@
       <image class="gamemtask1" onTap="openTask" src={{resList['578cb214-b8d4-4d91-b57a-9477ec61933e'].url}} />
       <image class="gamemtask2" src={{resList['d9ce0594-e262-4e9a-adfc-0b5b2a16d9c5'].url}} />
     </view>
-    <scroll-view class="gameinfogro" scroll-y={{true}} scroll-animation-duration={{300}} scroll-with-animation={{true}} scroll-top={{(attionlist.length)*130}} disable-scroll={{false}} >
-      <view class="gameminfo{{index==(attionlist.length-1)?' aninfo':''}}" a:for="{{showattionlist}}" a:key="*this" style="top:{{index*130+'rpx;'}}">
+    <scroll-view class="gameinfogro" scroll-y={{true}} scroll-animation-duration={{300}} scroll-with-animation={{true}} scroll-top={{(showattionlist.length-1)*130}} disable-scroll={{false}} >
+      <view class="gameminfo{{index==(showattionlist.length-1)?' aninfo':''}}" a:for="{{showattionlist}}" a:key="*this" style="top:{{index*130+'rpx;'}}">
         <image class="gameminfobg" src={{resList['f1611c59-e6ba-4e4d-8aeb-50d3c794e98b'].url}} />
         <label class="gameminfotxt">{{item.txt}}</label>
       </view>