Merge branch 'xma/dev' into master_xma_local
commit
f81e8ecaab
Binary file not shown.
After Width: | Height: | Size: 34 KiB |
|
@ -0,0 +1,120 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 74f384c2de728aa4d952448aaf8953ad
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: l_lingshou_jukun_en
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
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
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
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
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: l_lingshou_jukun_en
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 355
|
||||
height: 117
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID:
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 845ce57aa88816141b8b5329a7959a09
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 46 KiB |
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e1f2a188f20d210459a41bf57a8eb85d
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: l_lingshou_jukun_vi
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
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
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
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
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: l_lingshou_jukun_vi
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 355
|
||||
height: 117
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID:
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: da7210bb58aeea044972cbc32de4b05a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -11,12 +11,10 @@ end
|
|||
--初始化后调用一次
|
||||
function Exile:OnStart()
|
||||
self.target.isExile = true
|
||||
self.ownPassiveList = self.target.passiveList
|
||||
self.target.passiveList=nil
|
||||
if self.caster.exileTargets then
|
||||
table.insert(self.caster.exileTargets,self.target)
|
||||
end
|
||||
-- self.target.Event:SetIsTrigger(false)
|
||||
self.target.Event:DispatchEvent(BattleEventName.RoleBeExile, self)
|
||||
end
|
||||
|
||||
--间隔N帧触发,返回true时表示继续触发,返回false立刻触发OnEnd
|
||||
|
@ -26,14 +24,12 @@ end
|
|||
|
||||
--效果结束时调用一次
|
||||
function Exile:OnEnd()
|
||||
LogError("放逐结束")
|
||||
self.target.isExile = false
|
||||
--self.target.Event:SetIsTrigger(true)
|
||||
self.target.Event:DispatchEvent(BattleEventName.RoleExileEnd, self)
|
||||
end
|
||||
|
||||
--只有当cover字段为true时触发,返回true则被新效果覆盖
|
||||
function Exile:OnCover(newBuff)
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
|
|
|
@ -164,6 +164,8 @@ BattleEventName = {
|
|||
RecordBuff = indexAdd(), -- buff
|
||||
RecordSecKill = indexAdd(), -- 斩杀
|
||||
DisposeRoleCtrl_noheal = indexAdd(),--处理角色禁疗
|
||||
RoleBeExile = indexAdd(),--角色被放逐
|
||||
RoleExileEnd = indexAdd(),--角色放逐结束
|
||||
}
|
||||
|
||||
BattleMaxFrame = 1000000
|
||||
|
|
|
@ -133,7 +133,8 @@ function EnemyView:onCreate(go, role, position, root)
|
|||
role.Event:AddEvent(BattleEventName.BeSeckill, self.onBeSecKill, self)
|
||||
role.Event:AddEvent(BattleEventName.ShildTrigger, self.OnShieldTrigger, self)
|
||||
role.Event:AddEvent(BattleEventName.ShowHintText,self.OnShowHintText,self)
|
||||
|
||||
role.Event:AddEvent(BattleEventName.RoleBeExile,self.OnRoleExile,self)
|
||||
role.Event:AddEvent(BattleEventName.RoleExileEnd,self.OnRoleExileEnd,self)
|
||||
|
||||
if IsOpenBattleDebug then
|
||||
local URoleProperty = go:GetComponent(typeof(RoleProperty))
|
||||
|
@ -146,6 +147,7 @@ function EnemyView:onCreate(go, role, position, root)
|
|||
self.URoleProperty:AddProperty(name, value)
|
||||
end)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
--
|
||||
|
@ -227,7 +229,16 @@ function EnemyView:Update()
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
--角色被放逐
|
||||
function EnemyView:OnRoleExile(role)
|
||||
local color = Color.New(1,1,1,0.4)
|
||||
Util.SetColor(self.RoleLiveGOGraphic, color)
|
||||
end
|
||||
--角色放逐结束
|
||||
function EnemyView:OnRoleExileEnd(role)
|
||||
local color = Color.New(1, 1, 1, 1)
|
||||
Util.SetColor(self.RoleLiveGOGraphic, color)
|
||||
end
|
||||
-- 缩放
|
||||
function EnemyView:DoScale(scale, dur, func)
|
||||
|
||||
|
@ -276,7 +287,11 @@ function EnemyView:SetHighLight(isLight, eScale, dur, func)
|
|||
end
|
||||
self.hlTween3 = DoTween.To(DG.Tweening.Core.DOGetter_float( function () return sc end),
|
||||
DG.Tweening.Core.DOSetter_float(function (progress)
|
||||
local color = Color.New(progress, progress, progress, 1)
|
||||
local aaa=1
|
||||
if self.role.isExile then
|
||||
aaa=0.4
|
||||
end
|
||||
local color = Color.New(progress, progress, progress,aaa)
|
||||
Util.SetColor(self.GameObject, color)
|
||||
Util.SetColor(self.RoleLiveGOGraphic, color)
|
||||
end), ec, dur):SetEase(Ease.Linear)
|
||||
|
|
|
@ -155,7 +155,8 @@ function PlayerView:onCreate(go, role, position, root)
|
|||
role.Event:AddEvent(BattleEventName.BeSeckill, self.onBeSecKill, self)
|
||||
role.Event:AddEvent(BattleEventName.ShildTrigger, self.OnShieldTrigger, self)
|
||||
role.Event:AddEvent(BattleEventName.ShowHintText,self.OnShowHintText,self)
|
||||
|
||||
role.Event:AddEvent(BattleEventName.RoleBeExile,self.OnRoleExile,self)
|
||||
role.Event:AddEvent(BattleEventName.RoleExileEnd,self.OnRoleExileEnd,self)
|
||||
if IsOpenBattleDebug then
|
||||
local URoleProperty = go:GetComponent(typeof(RoleProperty))
|
||||
if not URoleProperty then
|
||||
|
@ -270,7 +271,16 @@ function PlayerView:DoScale(scale, dur, func)
|
|||
end)
|
||||
end
|
||||
|
||||
|
||||
--角色被放逐
|
||||
function PlayerView:OnRoleExile(role)
|
||||
local color = Color.New(1, 1, 1, 0.4)
|
||||
Util.SetColor(self.liveRender, color)
|
||||
end
|
||||
--角色放逐结束
|
||||
function PlayerView:OnRoleExileEnd(role)
|
||||
local color = Color.New(1, 1, 1, 1)
|
||||
Util.SetColor(self.liveRender, color)
|
||||
end
|
||||
-- 设置高亮
|
||||
function PlayerView:SetHighLight(isLight, eScale, dur, func)
|
||||
-- 设置变灰
|
||||
|
|
|
@ -125,7 +125,7 @@ function PokemonSingleResultPanel:UpdataPanelData(_heroData)
|
|||
this.heroName.text = GetLanguageStrById(heroStaticData.Name)
|
||||
this.Title.text = GetLanguageStrById(heroStaticData.Description)
|
||||
this.icon.sprite=Util.LoadSprite(artResourcesConfig[heroStaticData.Icon].Name)
|
||||
this.content.text = GetLanguageStrById(passiveSkillConfig[heroStaticData.SkillArray[1][2]].Desc)
|
||||
this.content.text = SubString2(GetLanguageStrById(passiveSkillConfig[heroStaticData.SkillArray[1][2]].Desc),230)
|
||||
|
||||
this.rolePanel:SetActive(true)
|
||||
this.goBtn:SetActive(true)
|
||||
|
|
|
@ -22,6 +22,8 @@ namespace GameEditor
|
|||
/// </summary>
|
||||
private static Dictionary<string, Action<TextureImporter, string>> handlers = new Dictionary<string, Action<TextureImporter, string>>
|
||||
{
|
||||
{"/ArtFont_en/", SetUITexture},
|
||||
{"/ArtFont_vi/", SetUITexture},
|
||||
//UI
|
||||
{"/Atlas/", SetUITexture},
|
||||
{"/BG/", SetBGTexture},
|
||||
|
@ -64,7 +66,7 @@ namespace GameEditor
|
|||
{
|
||||
importer.spritePackingTag = GetAtlasName(importer.assetPath);
|
||||
importer.SetTextureSettingsExt(true, TextureImporterType.Sprite, 1, AppConst.PIXELTOWORLD, false, TextureWrapMode.Clamp, FilterMode.Trilinear, TextureImporterNPOTScale.None);
|
||||
//importer.SetPlatformSettingsExt("Android", TextureImporterFormat.ETC2_RGBA8Crunched, MAX_TEXTURE_SIZE, 50, false);
|
||||
importer.SetPlatformSettingsExt("Android", TextureImporterFormat.ETC2_RGBA8Crunched, MAX_TEXTURE_SIZE, 50, false);
|
||||
//importer.SetPlatformSettingsExt("iPhone", TextureImporterFormat.ETC2_RGBA8Crunched, MAX_TEXTURE_SIZE, 50, false);
|
||||
//importer.SetPlatformSettingsExt("Standalone", TextureImporterFormat.RGBA32, MAX_TEXTURE_SIZE, 50, false);
|
||||
}
|
||||
|
|
|
@ -267,6 +267,7 @@ namespace GameEditor.Core.DataConfig
|
|||
for (int i = 0; i < files.Length; i++)
|
||||
{
|
||||
var item = files[i];
|
||||
var itemName = Path.GetFileName(item);
|
||||
ThreadPool.QueueUserWorkItem(q =>
|
||||
{
|
||||
if (IsFileInUse(item))
|
||||
|
@ -274,10 +275,10 @@ namespace GameEditor.Core.DataConfig
|
|||
UnityEngine.Debug.LogError("该表正在编辑,无法导出!:" + item);
|
||||
lock (lockObj)
|
||||
{
|
||||
if (record.ContainsKey(item))
|
||||
if (record.ContainsKey(itemName))
|
||||
{
|
||||
newRecord[item] = record[item];
|
||||
record.Remove(item);
|
||||
newRecord[itemName] = record[itemName];
|
||||
record.Remove(itemName);
|
||||
}
|
||||
count++;
|
||||
}
|
||||
|
@ -285,7 +286,7 @@ namespace GameEditor.Core.DataConfig
|
|||
}
|
||||
|
||||
string crc = FileToCRC32.GetFileCRC32(item);
|
||||
bool isChanged = !record.ContainsKey(item) || record[item] != crc;
|
||||
bool isChanged = !record.ContainsKey(itemName) || record[itemName] != crc;
|
||||
if (!isIncrement || (isIncrement && isChanged))
|
||||
{
|
||||
lock (lockObj)
|
||||
|
@ -296,10 +297,10 @@ namespace GameEditor.Core.DataConfig
|
|||
}
|
||||
lock (lockObj)
|
||||
{
|
||||
newRecord[item] = crc;
|
||||
if (record.ContainsKey(item))
|
||||
newRecord[itemName] = crc;
|
||||
if (record.ContainsKey(itemName))
|
||||
{
|
||||
record.Remove(item);
|
||||
record.Remove(itemName);
|
||||
}
|
||||
count++;
|
||||
}
|
||||
|
|
|
@ -157,6 +157,8 @@ namespace GameEditor.FrameTool
|
|||
|
||||
if (GUILayout.Button("导入", GUILayout.Height(50)))
|
||||
{
|
||||
m_ImportArt.Clear();
|
||||
m_UnImportArt.Clear();
|
||||
m_ArtFontLists[LanguageType.ZH] = GetAllArtFont(LanguageType.ZH);
|
||||
if (m_ChooseAll)
|
||||
{
|
||||
|
|
|
@ -1371,7 +1371,7 @@
|
|||
11371,购买次数
|
||||
11372,是否消耗 100000000
|
||||
11373,\, 购买100次挑战次数?
|
||||
11374,"\""每天每天每天每天每天每天”"
|
||||
11374,\"\"\"每天每天每天每天每天每天”\"
|
||||
11375,击败13只皮皮虾
|
||||
11376,寻找深渊之井\,获得泉水
|
||||
11377,打败嗷嗷大魔王
|
||||
|
@ -1557,7 +1557,7 @@
|
|||
11557,清山影
|
||||
11558,核心特性
|
||||
11559,<color=#D48A07>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧
|
||||
11560," 攻击"
|
||||
11560,\" 攻击\"
|
||||
11561,法宝天赋
|
||||
11562,<color=#D89623>升级</color>吧啦吧啦吧啦吧吧啦吧啦吧啦吧<color=red>吧啦吧啦吧啦吧吧啦吧啦吧啦吧</color>啦啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧吧啦吧
|
||||
11563,击败5名敌人(0/5)
|
||||
|
@ -1963,3 +1963,9 @@
|
|||
11963,检测更新游戏资源...
|
||||
11964,战斗\n编队
|
||||
11965,防守\n编队
|
||||
11966,绝技对血量最好阿德敌人单位造成伤到后期唉哦还是有记录附加眩晕效果
|
||||
11967,增伤 追击 增伤 追击
|
||||
11968,所有秘法职业猎妖所所有秘法职业猎妖所所有秘法职业猎妖所所有秘法职业猎妖所所有秘法职业猎妖所所有秘法职业猎妖所
|
||||
11969,吧啦吧啦吧啦吧吧啦
|
||||
11970,\"每天每天每天每天每天每天”
|
||||
11971, 攻击
|
||||
|
|
Can't render this file because it contains an unexpected character in line 1374 and column 8.
|
Loading…
Reference in New Issue