Merge branch 'hy_en' of ssh://192.168.0.8:29418/xianjing into hy_ios_en

# Conflicts:
#	Assets/Content/Prefabs/UI/UILanuch/UILanuch.prefab

Assets/Content/Config/AndroidShopProductIDCfg.csv

@@ -1,11 +1,11 @@
 id,amount,productID,productName,other
 id,amount,productID,productName,other
-1,0.99,0.99,商品1,
-2,1.99,1.99,商品2,
-3,2.99,2.99,商品3,
-4,3.99,3.99,商品4,
-5,4.99,4.99,商品5,
-6,5.99,5.99,商品6,
-7,6.99,6.99,商品7,
-8,7.99,7.99,商品8,
-9,8.99,8.99,商品9,
+1,99,1001,99 рублей прямая покупка золота,
+2,199,1002,199 рублей прямая покупка золота,
+3,249,1003,249 рублей прямая покупка золота,
+4,449,1004,449 рублей прямая покупка золота,
+5,899,1005,899 рублей прямая покупка золота,
+6,1290,1006,1290 рублей прямая покупка золота,
+7,1790,1007,1790 рублей прямая покупка золота,
+8,4690,1008,4690 рублей прямая покупка золота,
+9,9490,1009,9490 рублей прямая покупка золота,

Assets/Content/Prefabs/UI/UILanuch/UILanuch.prefab

@@ -786,8 +786,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4286743170
+  m_fontColor: {r: 0.50980395, g: 0.50980395, b: 0.50980395, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -958,8 +958,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4286743170
+  m_fontColor: {r: 0.50980395, g: 0.50980395, b: 0.50980395, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -7323,8 +7323,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4286743170
+  m_fontColor: {r: 0.50980395, g: 0.50980395, b: 0.50980395, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -8392,7 +8392,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 500}
-  m_SizeDelta: {x: 632, y: 274}
+  m_SizeDelta: {x: 770.4, y: 360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5882261254970375091
 CanvasRenderer:
@@ -9123,8 +9123,8 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4286743170
+  m_fontColor: {r: 0.50980395, g: 0.50980395, b: 0.50980395, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:

Assets/Editor/Pack/Platform/PackPlatformBaseGUI.cs

@@ -15,7 +15,7 @@ namespace Pack
         {
             0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31
         };
-
+        protected bool IsBuildRes = true;
         public void DrawGUI(bool editable, PackPlatformBase sourcePackPlatform)
         {
             PackGUI.BeginChangeLabelWidth(250);
@@ -33,6 +33,7 @@ namespace Pack
             PackGUI.DrawVersionCodeField("App版本号", false, sourcePackPlatform.gameVersionCode, ref gameVersionCode);
             PackGUI.DrawVersionCodeField("Res版本号", false, sourcePackPlatform.resVersionCode, ref resVersionCode);
             PackGUI.DrawSelectFolderField("AppIcon的路径", Application.dataPath + PackConstant.AppIconSourcePath, sourcePackPlatform.iconRelativePath, ref iconRelativePath);
+            PackGUI.DrawToggleField("打包资源","1111",false,ref IsBuildRes);
             EditorGUI.indentLevel -= 1;
             EditorGUILayout.EndVertical();
 

Assets/Editor/Pack/Platform/PackPlatformUnityBuild.cs

@@ -130,19 +130,25 @@ namespace Pack
                 AssetDatabase.Refresh();
                 ChangeBuildTarget();
                 ChangeLuaConfig();
-                ChangeGameAssets();
-                ChangeLogin();
-                ChangeLogo();
-                CheckAppInfo();
-                ChangeAppIcon();
-                ChangeSplashScreen();
-                ChangePlatformSpecial();
-                ChangePlayerSettings();
-                EditorUtility.ClearProgressBar();
-                AssetDatabase.Refresh();
-                AssetDatabase.SaveAssets();
-                ChangeAssetsObscure();
-                AssetBundleMap.BuildAllAssetBundles(resVersionCode);
+                if (IsBuildRes)
+                {
+                    Debug.Log("打包资源............");
+                    ChangeGameAssets();
+                    ChangeLogin();
+                    ChangeLogo();
+                    CheckAppInfo();
+                    ChangeAppIcon();
+                    ChangeSplashScreen();
+                    ChangePlatformSpecial();
+                    ChangePlayerSettings();
+                    EditorUtility.ClearProgressBar();
+                    AssetDatabase.Refresh();
+                    AssetDatabase.SaveAssets();
+                    ChangeAssetsObscure();
+
+                    AssetBundleMap.BuildAllAssetBundles(resVersionCode);
+                }
+
                 if (Application.isBatchMode)
                 {
                     PackLog.Log(PackConstant.TAG_ResOutPath + BundleBuilderZ.GetAssetbundlesPath());

Assets/Lua/UI/UIDojo/UIDojo2DView.lua

@@ -177,7 +177,7 @@ function UIDojo2DView:ShowCurRewardItem()
 		IconItemCtr:SetData(self,self.rewardItem,{cfgId = itemId},nil,self,self.OnClickRewardItem)
 		local itemData = ManagerContainer.CfgMgr:GetItemById(itemId)
 		if itemData~=nil then
-			self.rewardItemName.text.text = itemData.Name
+			self.rewardItemName.text.text = I18N.T(itemData.Name)
 		end
 	end
 end

Assets/Lua/UI/UILuckyEgg/UILuckyEggView.lua

@@ -107,13 +107,14 @@ function UILuckyEggView:ChangeLogText(TextObj)
 	if package then
 		--LogError("============ package =  "..Inspect(package));
 		local itemCfgData = ManagerContainer.CfgMgr:GetItemById(package.itemId)
+		local iname = I18N.T(itemCfgData.Name)
 		local name = nil
 		if package.nickName and  package.nickName ~= "" then
 			name =  package.nickName
 		else
 			name =  ManagerContainer.DataMgr.UserData:GetUserNickname()
 		end
-		str = ManagerContainer.CfgMgr:GetLanguageValueByKey("BTSmashEggsTips1", name,itemCfgData.Name)
+		str = ManagerContainer.CfgMgr:GetLanguageValueByKey("BTSmashEggsTips1", name.." ",iname)
 	end
 	--LogError("============ Str =  "..str);
 	TextObj.text = str
@@ -132,6 +133,7 @@ function UILuckyEggView:OnShow(data)
 	self:RefreshTopCurrency()
 	self:RefreshCostCurrency()
 	self:ResetEggLoopText()
+	--LogError("show")
 end
 
 function UILuckyEggView:OnDispose()
@@ -391,7 +393,7 @@ function UILuckyEggView:RefreshView()
 		self.btnArrowR:SetActive(true)
 	end
 
-	if cfg and cfg.Type == 5 and self.controller:GetCfgLength_cfg() == 1 then
+	if cfg and cfg.Type == 5 then
 		self.goldenEggToggle:SetActive(false)
 		self.variegationEggToggle:SetActive(true)
 	else
@@ -443,7 +445,7 @@ function UILuckyEggView:RefreshLuckyEggBtn()
 	self.leftAnim:SetActive(true)
 	self.rightAnim:SetActive(true)
 	local egg_active = self.controller:GetEggActiveByPay()
-	self.variegationEggToggle.gameObject:SetActive(egg_active)
+	--self.variegationEggToggle.gameObject:SetActive(egg_active)
 
 	if cfg.Type == 4 then
 		self.goldenEggToggle.toggle.graphic:CrossFadeAlpha(1.0,0.1,true)