Merge branch 'dev' of WEP/WEP_V2.1.3 into master

SourceCode/We.AppOnline/WeOnlineApp.Web/WeOnlineApp.Web.csproj

@@ -503,6 +503,8 @@
     </Content>
     <Content Include="Content\Image\logo.jpg" />
     <Content Include="Content\Image\logo.png" />
+    <Content Include="Content\Image\logo_bk.png" />
+    <Content Include="Content\Image\logo_bk2.png" />
     <Content Include="Content\Image\Upload\home.png" />
     <Content Include="Content\Image\Upload\login.png" />
     <Content Include="Content\Image\gjdw.png" />
@@ -1565,6 +1567,8 @@
     <Content Include="Content\Media\S3.mp3" />
     <Content Include="Content\Media\S4.mp3" />
     <Content Include="favicon.ico" />
+    <Content Include="favicon_bk.ico" />
+    <Content Include="favicon_bk2.ico" />
     <Content Include="Global.asax" />
     <Content Include="Localization\SourceFiles\Iwb-zh-Hans.xml" />
     <Content Include="Localization\SourceFiles\Iwb.xml" />

SourceCode/We.Engine/WeEngine.Base/ModelInfo/ModelBase.cs

@@ -59,9 +59,9 @@ namespace WeEngine.ModelInfo
         {
             get
             {
-                return _guideInfos ?? (_guideInfos =
+                return _guideInfos?.Count > 0 ? _guideInfos : _guideInfos =
                     PackageNode?.GuideInfos?.Select(a => new GuideModel().ModelFrom(a)).ToList() ??
-                    new List<GuideModel>());
+                    new List<GuideModel>();
             }
             set => _guideInfos = value;
         }

SourceCode/We.Engine/WeEngine.Web/WeEngine.Web.csproj

@@ -328,6 +328,8 @@
     <Content Include="Content\bootstrap.css" />
     <Content Include="Content\bootstrap.min.css" />
     <Content Include="favicon.ico" />
+    <Content Include="favicon_bk.ico" />
+    <Content Include="favicon_bk2.ico" />
     <Content Include="fonts\glyphicons-halflings-regular.svg" />
     <Content Include="Global.asax" />
     <Content Include="Content\Site.css" />

SourceCode/We.Platform/WePlatform.Application/WeLib/Scene/SceneApplicationService.cs

@@ -696,7 +696,13 @@ namespace WePlatform.WeLib.Scene
                         columnIndex++;
                         behavior.SceneCategory = GetTypeNo(row.GenerateCell(columnIndex).StringCellValue ?? "");
                         columnIndex++;
-                        behavior.BehaviorTag = row.GenerateCell(columnIndex).StringCellValue ?? "";
+                        var behaviorTag = row.GenerateCell(columnIndex).StringCellValue ?? "";
+                        behaviorTag= behaviorTag.Trim().Replace("，",",");
+                        while (behaviorTag.Contains(",,"))
+                        {
+                            behaviorTag= behaviorTag.Trim().Replace(",,",",");
+                        }
+                        behavior.BehaviorTag = behaviorTag;
                         columnIndex++;
                         behavior.Description = description;
                         columnIndex++;

SourceCode/We.Platform/WePlatform.Web/WePlatform.Web.csproj

@@ -494,6 +494,8 @@
     </Content>
     <Content Include="Content\Image\logo.jpg" />
     <Content Include="Content\Image\logo.png" />
+    <Content Include="Content\Image\logo_bk.png" />
+    <Content Include="Content\Image\logo_bk2.png" />
     <Content Include="Content\Image\Upload\home.png" />
     <Content Include="Content\Image\Upload\login.png" />
     <Content Include="Content\Js\packagetree.js" />
@@ -1521,6 +1523,8 @@
     <Content Include="Content\logo.jpg" />
     <Content Include="Content\logo.png" />
     <Content Include="favicon.ico" />
+    <Content Include="favicon_bk.ico" />
+    <Content Include="favicon_bk2.ico" />
     <Content Include="Global.asax" />
     <Content Include="Localization\SourceFiles\WePlatform-zh-Hans.xml" />
     <Content Include="Localization\SourceFiles\WePlatform.xml" />