Merge branch 'china/ios' into china/dev
# Conflicts: # Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.metadev_chengFeng
commit
0db39ccbe3
|
@ -108,9 +108,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224208791220860236}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 190, y: 39}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 958, y: 39}
|
||||
m_SizeDelta: {x: 208, y: 46}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222079314688239424
|
||||
|
@ -182,9 +182,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224067770939544360}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5465189}
|
||||
m_AnchorMax: {x: 0, y: 0.5465189}
|
||||
m_AnchoredPosition: {x: 191, y: 56}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -339, y: 342}
|
||||
m_SizeDelta: {x: 400, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222077255835528516
|
||||
|
@ -333,10 +333,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224067770939544360}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.282}
|
||||
m_AnchorMax: {x: 1, y: 0.282}
|
||||
m_AnchoredPosition: {x: 12.400024, y: -23.100006}
|
||||
m_SizeDelta: {x: -110.79999, y: 249.2}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -0.000072479, y: 123.899994}
|
||||
m_SizeDelta: {x: 937.14, y: 249.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222769664159705968
|
||||
CanvasRenderer:
|
||||
|
@ -413,10 +413,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224067770939544360}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5941292}
|
||||
m_AnchorMax: {x: 0, y: 0.5941292}
|
||||
m_AnchoredPosition: {x: 233.45996, y: 14.199997}
|
||||
m_SizeDelta: {x: 331.32, y: 63.520004}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -265.54004, y: 325.2}
|
||||
m_SizeDelta: {x: 331.32, y: 63.52002}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222986120914013502
|
||||
CanvasRenderer:
|
||||
|
@ -954,9 +954,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224208791220860236}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -141.41003, y: -121.70996}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 368, y: -121.70996}
|
||||
m_SizeDelta: {x: 282.84, y: 243.43}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222864043009120698
|
||||
|
@ -1299,10 +1299,10 @@ MonoBehaviour:
|
|||
loop: 0
|
||||
loopType: 0
|
||||
targetObj: {fileID: 224067770939544360}
|
||||
- initV3: {x: 190, y: 39, z: 0}
|
||||
- initV3: {x: 958, y: 39, z: 0}
|
||||
initFloat: 0
|
||||
isInit: 0
|
||||
changeV3: {x: -154, y: 39, z: 0}
|
||||
changeV3: {x: 350, y: 39, z: 0}
|
||||
changeFloat: 0
|
||||
duration: 0.3
|
||||
delay: 0
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--[[
|
||||
--[[
|
||||
* @ClassName FirstRechargePanel
|
||||
* @Description 首充
|
||||
* @Date 2019/6/3 11:45
|
||||
|
@ -288,7 +288,11 @@ function FirstRechargePanel:OnRechargeBtnClicked()
|
|||
return
|
||||
end
|
||||
self:ClosePanel()
|
||||
JumpManager.GoJump(36008)
|
||||
if SERVER_VERSION == 1 then
|
||||
JumpManager.GoJump(36010)
|
||||
else
|
||||
JumpManager.GoJump(36008)
|
||||
end
|
||||
end
|
||||
|
||||
function FirstRechargePanel:SetTabRedPointStatus(tabIndex)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require("Base/BasePanel")
|
||||
require("Base/BasePanel")
|
||||
|
||||
local _GuildBuildConfig = {
|
||||
[GUILD_MAP_BUILD_TYPE.HOUSE] = {
|
||||
|
@ -288,7 +288,7 @@ function GuildMainCityPanel:OnShow()
|
|||
this._TimeCounter:Start()
|
||||
end
|
||||
|
||||
if not RECHARGEABLE then--(是否开启充值)
|
||||
if not RECHARGEABLE or SERVER_VERSION == 1 then--(是否开启充值)
|
||||
this.btnRedPacket:SetActive(false)
|
||||
end
|
||||
this.LiveName = "live2d_huyao"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require("Base/BasePanel")
|
||||
require("Base/BasePanel")
|
||||
require("Modules/Map/Logic/TileMapController")
|
||||
require("Modules/Map/Logic/TileMapView")
|
||||
require("Modules/Map/View/MapPointView")
|
||||
|
@ -273,7 +273,7 @@ function this:SetActiveGameObj()
|
|||
this.btnRank.gameObject:SetActive(isShow)
|
||||
this.btnReward.gameObject:SetActive(isShow)
|
||||
this.shiQi.gameObject:SetActive(not isShow)
|
||||
this.endLessTreasure.gameObject:SetActive(not isShow)
|
||||
this.endLessTreasure.gameObject:SetActive(not isShow and SERVER_VERSION == 0)
|
||||
this.TargetRoot.gameObject:SetActive(not isShow)
|
||||
this.leftDown.gameObject:SetActive(isShow)
|
||||
this.heroGridtip1.gameObject:SetActive(not isShow)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- 无尽副本
|
||||
--- 无尽副本
|
||||
--- Generated by EmmyLua(https://github.com/EmmyLua)
|
||||
--- Created by aaa.
|
||||
--- DateTime: 2019/7/30 16:30
|
||||
|
@ -551,7 +551,7 @@ function EndLessMapView:InitCompShow(carbonType)
|
|||
this.selectHeroGrid.gameObject:SetActive(true)
|
||||
this.enemyInfo.gameObject:SetActive(false)
|
||||
this.shiQi.gameObject:SetActive(true)
|
||||
this.endLessTreasure.gameObject:SetActive(true)
|
||||
this.endLessTreasure.gameObject:SetActive(SERVER_VERSION == 0)
|
||||
end
|
||||
-- ================================================
|
||||
-- ============ 初始化设置 =========================
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require("Modules/Map/Logic/TileMapView")
|
||||
require("Modules/Map/Logic/TileMapView")
|
||||
local this = {}
|
||||
local ctrlView = require("Modules/Map/View/MapControllView")
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
UpView = {}
|
||||
UpView = {}
|
||||
local ArenaSetting = ConfigManager.GetConfig(ConfigName.ArenaSetting)
|
||||
local StoreTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig)
|
||||
local _ItemMaxNum = 4
|
||||
|
@ -324,6 +324,11 @@ function UpView:RechargeType(_type)
|
|||
elseif _type == UpViewRechargeType.HeroExchange then--神将置换
|
||||
UIManager.OpenPanel(UIName.ElementDrawCardPanel)
|
||||
elseif _type == UpViewRechargeType.DemonCrystal then
|
||||
LogError(tostring(SERVER_VERSION))
|
||||
if SERVER_VERSION == 1 then
|
||||
JumpManager.GoJump(36010)
|
||||
return
|
||||
end
|
||||
-- 充值商店
|
||||
if not ShopManager.IsActive(SHOP_TYPE.SOUL_STONE_SHOP) then
|
||||
PopupTipPanel.ShowTip(Language[10422])
|
||||
|
|
|
@ -297,7 +297,7 @@ namespace GameEditor.FrameTool
|
|||
//}
|
||||
// 初始化数据
|
||||
updateName = dir_name + "_" + dir_cdn_setting + "_" + DateTime.Now.ToString("yyyy_MM_dd_HH_mm_ss");
|
||||
changeFileName = updateName.Replace("/", "$");
|
||||
changeFileName = updateName.Replace("/", "_");
|
||||
logName = changeFileName + "_UpLoad";
|
||||
tagName = "hotfix/" + dir_name + "/" + dir_cdn_setting + "/" + local_version.version;
|
||||
EditorUtility.DisplayProgressBar("正在获取数据:", updateName, 0f);
|
||||
|
@ -374,6 +374,8 @@ namespace GameEditor.FrameTool
|
|||
new string[]{ "Quick", "mht_china/zf", "cdn_quick", "china/zf_test" },
|
||||
new string[]{ "游心", "mht_china/zf", "cdn_youxin", "china/zf_test" },
|
||||
|
||||
new string[]{ "Quick", "mht_china/zf", "cdn_ios", "china/ios" },
|
||||
|
||||
new string[]{ "先遣-内网", "mht_china/local", "local12_cn_local", "china/local" },
|
||||
new string[]{ "先遣-测试", "mht_china/xq", "cdn_xq_test", "china/test" },
|
||||
new string[]{ "先遣-正式", "mht_china/xq", "cdn_xq_release", "china/test" },
|
||||
|
@ -625,7 +627,7 @@ namespace GameEditor.FrameTool
|
|||
File.Copy(fromPath + UpdateConfigs.FILES, toPath + UpdateConfigs.FILES, true);
|
||||
log.Add(UpdateConfigs.FILES);
|
||||
// write logf
|
||||
string logName = updateName.Replace("/", "$");
|
||||
string logName = updateName.Replace("/", "_");
|
||||
EditorUtility.DisplayProgressBar("正在生成Log文件:", logName, 1f);
|
||||
WriteLog(toPath+"/_log", logName, log.ToArray());
|
||||
// git commit
|
||||
|
@ -653,7 +655,7 @@ namespace GameEditor.FrameTool
|
|||
}
|
||||
// 初始化数据
|
||||
updateName = hfs.dir_name + "_" + hfs.dir_cdn_setting + "_" + DateTime.Now.ToString("yyyy_MM_dd_HH_mm_ss");
|
||||
changeFileName = updateName.Replace("/", "$");
|
||||
changeFileName = updateName.Replace("/", "_");
|
||||
logName = changeFileName + "_UpLoad";
|
||||
EditorUtility.DisplayProgressBar("正在获取数据:", updateName, 0f);
|
||||
log.Add("热更文件版本:" + updateName);
|
||||
|
|
|
@ -133,7 +133,13 @@ namespace GameEditor.Util
|
|||
EditorUtility.DisplayDialog("提示", "文件不存在", "确定");
|
||||
return;
|
||||
}
|
||||
#if PLATFORM_IOS
|
||||
ProcessCommand(Application.dataPath, "open " + tPath); //用记事本
|
||||
|
||||
#else
|
||||
System.Diagnostics.Process.Start("notepad.exe", tPath); //用记事本
|
||||
|
||||
#endif
|
||||
}
|
||||
//返回 数组第一个是文件夹路径 ,以后的是文件名字
|
||||
public static string[] OpenFileWin(string path,string ext = "*.*")
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue