[gm]======创角即送提交

dev_chengFeng
wangzhenxing 2022-09-21 16:08:59 +08:00
parent fdaec2ac28
commit a8f46604c9
12 changed files with 95934 additions and 25 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 275 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 06e5c0d437bb16f47b7ffa736ad0b174
TextureImporter:
fileIDToRecycleName: {}
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: f1b5e6fe190300344a20cedb148dfbf0
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GMAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 MiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 572eeaee48425774dab1b61e3ec6fdf1
TextureImporter:
fileIDToRecycleName: {}
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 6dcbf111dc2358c4fb44ff0615ef4d70
vertices: []
indices:
edges: []
weights: []
spritePackingTag: GMAltas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5bf686cbae2790642ae19ca8bd2f958e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4884,7 +4884,7 @@ ParticleSystem:
--- !u!199 &1087165415992768291
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -9896,7 +9896,7 @@ ParticleSystem:
--- !u!199 &2208755362756196332
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14715,7 +14715,7 @@ ParticleSystem:
--- !u!199 &7076679451172437227
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19471,7 +19471,7 @@ ParticleSystem:
--- !u!199 &33490870627226746
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24227,7 +24227,7 @@ ParticleSystem:
--- !u!199 &7685085520827889364
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -28988,7 +28988,7 @@ ParticleSystem:
--- !u!199 &4524127514649587795
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29167,6 +29167,7 @@ RectTransform:
- {fileID: 1620527867463624632}
- {fileID: 7126439585856080069}
- {fileID: 2004216307252945579}
- {fileID: 7728386159724593213}
m_Father: {fileID: 224211705034082258}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -33896,7 +33897,7 @@ ParticleSystem:
--- !u!199 &2283237919016739426
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -39360,7 +39361,7 @@ ParticleSystem:
--- !u!199 &1417475986648243674
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -44276,7 +44277,7 @@ ParticleSystem:
--- !u!199 &7333672717873534349
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -49032,7 +49033,7 @@ ParticleSystem:
--- !u!199 &8564390196082754458
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -53854,7 +53855,7 @@ ParticleSystem:
--- !u!199 &1868018899055753017
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -58602,7 +58603,7 @@ ParticleSystem:
--- !u!199 &1624692952943940704
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -63631,7 +63632,7 @@ ParticleSystem:
--- !u!199 &4663709056039703608
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -63690,6 +63691,66 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!1 &3898035893474608246
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7728386159724593213}
- component: {fileID: 816201034338708204}
m_Layer: 5
m_Name: rewardGrid
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7728386159724593213
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3898035893474608246}
m_LocalRotation: {x: 0, y: 0, z: -0.08715578, w: 0.9961947}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1557706396876227860}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -10}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 341, y: -220}
m_SizeDelta: {x: 100, y: 558}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &816201034338708204
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3898035893474608246}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 100, y: 100}
m_Spacing: {x: 0, y: 20}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!1 &3935377796266618734
GameObject:
m_ObjectHideFlags: 0
@ -69195,7 +69256,7 @@ ParticleSystem:
--- !u!199 &5753430189340505953
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -74279,7 +74340,7 @@ ParticleSystem:
--- !u!199 &6696585287453110623
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -79152,7 +79213,7 @@ ParticleSystem:
--- !u!199 &8297473524324320146
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -83938,7 +83999,7 @@ ParticleSystem:
--- !u!199 &8591025176322949247
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -88694,7 +88755,7 @@ ParticleSystem:
--- !u!199 &3706391575311161378
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -93450,7 +93511,7 @@ ParticleSystem:
--- !u!199 &8285404881472158234
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -98301,7 +98362,7 @@ ParticleSystem:
--- !u!199 &6426026305321061178
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -1636,6 +1636,7 @@ PRIVILEGE_TYPE = {
MONSTERCAMP_BUY_BATTLENUM = 2026, -- 心魔试炼挑战购买次数
JUMPSERVER_GIGHTLADDER_MIANFEINUM = 2010, -- 跨服天梯免费挑战次数
JUMPSERVER_GIGHTLADDER_BUYNUM = 2011, -- 跨服天梯可购买挑战次数
GM_YI_YUAN_UP_TIME = 2201,--gm一元直冲卡充值上线
}
-- 功能开启类型

View File

@ -473,6 +473,7 @@ UIName = {
QuanMinFLPanel=481, --gm全民福利
GMChangePanel=482,--gm修改器
GMCommonConfirmPanel=483,--gm确认弹窗
GMEspecially=484,--gm创角即送
}
SubUIConfig = {

View File

@ -0,0 +1,128 @@
local DailyRecharge = quick_class("DailyRecharge", BasePanel)
local actRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
local gameSetting=ConfigManager.GetConfigData(ConfigName.GameSetting,1)
local kMaxReward = 5
local index = 0
local cursortingOrder
local isFirstOpen = false
function DailyRecharge:InitComponent()
self.spLoader = SpriteLoader.New()
cursortingOrder = 0
self.backBtnNew = Util.GetGameObject(self.transform, "BG")
self.backBtn = Util.GetGameObject(self.transform, "frame")
self.title = Util.GetGameObject(self.backBtn, "bg/title"):GetComponent("Image")
self.items = {}
self.rewardContent = {}
self.rewardContentEffect = {}
self.rewardContentbg = {}
self.rewardList = {}
for i = 1, kMaxReward do
self.rewardContent[i] = Util.GetGameObject(self.backBtn, "bg/rewardContent/itemPos_" .. i)
self.rewardContentEffect[i] = Util.GetGameObject(self.rewardContent[i], "Kuang")
self.rewardContentbg[i] = Util.GetGameObject(self.rewardContent[i], "Image")
effectAdapte(self.rewardContentEffect[i])
self.rewardList[i] = SubUIManager.Open(SubUIConfig.ItemView, self.rewardContent[i].transform)
end
self.dealBtn = Util.GetGameObject(self.backBtn,"bg/dealBtn")
self.dealText = Util.GetGameObject(self.dealBtn, "Text"):GetComponent("Text")
self.dealText.text="立即体验"
self.UI_effect_DailyRechargePanel_particle = Util.GetGameObject(self.transform, "frame/UI_effect_DailyRechargePanel_particle")
end
function DailyRecharge:BindEvent()
Util.AddClick(self.dealBtn, function()
self:ClosePanel()
end)
for i = 1, #self.items do
Util.AddClick(self.items[i].go, function()
if i ~= index then
index = i
self:RefreshPanel()
end
end)
end
end
local func=nil
function DailyRecharge:OnOpen(_func)
func=_func
self.UI_effect_DailyRechargePanel_particle:SetActive(true)
end
function DailyRecharge:AddListener()
end
function DailyRecharge:RemoveListener()
end
function DailyRecharge:OnSortingOrderChange()
Util.AddParticleSortLayer( self.UI_effect_DailyRechargePanel_particle, self.sortingOrder - cursortingOrder)
for i = 1, #self.rewardContentEffect do
Util.AddParticleSortLayer( self.rewardContentEffect[i], self.sortingOrder - cursortingOrder)
end
cursortingOrder = self.sortingOrder
end
function DailyRecharge:OnShow()
self.title.sprite = self.spLoader:LoadSprite("gm_GMEspecially_text_zh")
self.title:SetNativeSize()
self:RefreshPanel()
end
function DailyRecharge:OnClose()
if func then
func()
end
end
function DailyRecharge:OnDestroy()
self.spLoader:Destroy()
end
function DailyRecharge:RefreshPanel()
table.walk(self.rewardList, function(rewardPosItem)
rewardPosItem.gameObject:SetActive(false)
end)
table.walk(self.rewardContent, function(rewardPosItem)
rewardPosItem.gameObject:SetActive(false)
end)
table.walk(self.rewardContentbg, function(rewardPosItem)
rewardPosItem.gameObject:SetActive(false)
end)
-- for i, rewardInfo in ipairs(gameSetting.BTBornItemShow) do
-- self.rewardContent[i].gameObject:SetActive(true)
-- end
LogError("#gameSetting.BTBornItemShow=="..#gameSetting.BTBornItemShow)
for i = 1, #gameSetting.BTBornItemShow do
if self.rewardContent[i] then
self.rewardContent[i].gameObject:SetActive(true)
end
end
self.thread = coroutine.start(function()
coroutine.wait(0.2)
for i, rewardInfo in ipairs(gameSetting.BTBornItemShow) do
if self.rewardList[i] then
self.rewardList[i]:OnOpen(false, rewardInfo, 1.1,true)
self.rewardList[i]:ResetNameColor(Vector4.New(0.298,0.133,0.102,1))
self.rewardList[i].gameObject:SetActive(true)
self.rewardContentbg[i].gameObject:SetActive(true)
end
end
end)
end
function DailyRecharge:OnDealBtnClicked()
end
return DailyRecharge

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0368f0944edf47b48ae0b99c71b6265c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -19,6 +19,8 @@ local curLive
local lastChoose
local orginLayer = 0
local curSex = ROLE_SEX.BOY
local gameSetting=ConfigManager.GetConfigData(ConfigName.GameSetting,1)
--初始化组件(用于子类重写)
function CreateNamePopup:InitComponent()
@ -61,7 +63,7 @@ function CreateNamePopup:InitComponent()
this.boyMask = Util.GetGameObject(this.boyEffect, "kuang_man")
this.bitchMask = Util.GetGameObject(this.bitchEffect, "kuang_woman")
this.rewardGrid=Util.GetGameObject(self.gameObject, "createName/rewardGrid")
effectAdapte(this.boyMask)
effectAdapte(this.bitchMask)
@ -152,8 +154,9 @@ function CreateNamePopup:BindEvent()
PopupTipPanel.ShowTip(Language[10837])
this:ClosePanel()
end
end
-- 类型3 为修改名称 类型1 为创建角色
local type = this.showType == nil and 3 or 1
NameManager.ChangeUserName(type, this.curName, nil, curSex, callBack)
@ -187,11 +190,11 @@ function CreateNamePopup:BindEvent()
CustomEventManager.SendCustomEvents(FBSDKCustomEventType.RoleLv,1)
end
end
-- 类型3 为修改名称 类型1 为创建角色
local type = this.showType == nil and 3 or 1
NameManager.ChangeUserName(type, this.curName, nil, curSex, callBack)
NameManager.ChangeUserName(type, this.curName, nil, curSex)
UIManager.OpenPanel(UIName.GMEspecially,callBack)
end)
-- 随机名称
@ -304,6 +307,11 @@ function CreateNamePopup:OnOpen(...)
this.callBackFunc = args[5]
this.InitName()
this.RefreshShow()
for i=1,#gameSetting.BTBornItemShow do
local view = SubUIManager.Open(SubUIConfig.ItemView,this.rewardGrid.transform)
view:OnOpen(false,gameSetting.BTBornItemShow[i],0.75,true)
view:ResetNameColor(Vector4.New(0.298,0.133,0.10,1))
end
end
function CreateNamePopup:OnShow()