Merge branch 'hy_dny' of ssh://192.168.0.8:29418/xianjing into hy_dny_rgres

Assets/Lua/Core/Constant.lua

@@ -9,6 +9,8 @@ local Constant = {
 
     DeleteAccount = false, -- 删除账户
 
+    OpenSystemLink = false,
+
     HeroLeaderIcon = "FrameNew/label_main",
     HeroBattleIcon = "FrameNew/label_battling",
 

Assets/Lua/Enum/Enum.lua

@@ -1059,6 +1059,8 @@ local Enum = {
         IdolGiftBroad = 16, -- 偶像馈赠播报
         LuckyEgg = 17, -- 砸蛋奖励播报
 
+        SdkLink = 18, 
+
         TimeLimitDel = 100,
     },
 

Assets/Lua/Logic/ChatData.lua

@@ -31,7 +31,9 @@ function ChatData:Init()
 
     table.insert(self.data.systemDatas, 1, welcomeSystemData)
     table.insert(self.data.chatDatas.worldChats, 1, welcomeSystemData)
-
+    if Constant.OpenSystemLink then
+         ManagerContainer.LuaTimerMgr:AddTimer(5000, 1, self, self.AddSdkLink, nil)      
+    end
     if not privateChatPersistentSystem then
         privateChatPersistentSystem = require("PrivateChatPersistentSystem"):new()
     end
@@ -661,4 +663,21 @@ function ChatData:GetChatChannelType()
 	return self.data.channelType or Enum.ChatChannel.World
 end
 
+
+function  ChatData:AddSdkLink()
+     local SdkLinkSystemData = {}
+    SdkLinkSystemData.type = Enum.ChatSystemType.SdkLink
+    SdkLinkSystemData.isSystem = true
+    SdkLinkSystemData.nickname = "SdkLinkTxt"
+    SdkLinkSystemData.sendTime = 0
+
+    --if #self.data.systemDatas >1 then
+    --     local lastData = self.data.systemDatas[#self.data.systemDatas]
+         --SdkLinkSystemData.sendTime = lastData.sendTime + 1 
+    --end
+   
+
+    table.insert(self.data.systemDatas, #self.data.systemDatas + 1, SdkLinkSystemData)
+    table.insert(self.data.chatDatas.worldChats, #self.data.chatDatas.worldChats + 1, SdkLinkSystemData)
+end
 return ChatData

Assets/Lua/UI/Common/ChatTextItemCtr.lua

@@ -28,6 +28,14 @@ function ChatTextItemCtr:SetData(wnd, item, logicData, enterType, onClickOwner,
             --if item.text.symbolTextEvent then
             --    item.text.symbolTextEvent:RegisterClickEvent(wnd, wnd.SystemChatHyperClick)
             --end
+        elseif  logicData.type == Enum.ChatSystemType.SdkLink then
+            item.text.symbolText.raycastTarget = true
+            item.text.symbolText.text = I18N.T(logicData.nickname)
+            item.text.symbolTextEvent:RegisterClickEvent(nil, function (hyperParam)
+                    local lurl = hyperParam
+                    --LogError("SdkLink hyperParam = "..hyperParam)
+                    UnityEngine.Application.OpenURL(lurl)
+                end)
         elseif logicData.type == Enum.ChatSystemType.PassMap then
             local levelData = ManagerContainer.CfgMgr:GetLevelDataById(logicData.paramIds[1])
             if levelData ~= nil then

Build/BuildDependenceResource/Login/港澳台_new/img_login00.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: da1604d17b741bf48b6dfaf419c0b247
+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: -1
+    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: 12
+    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: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    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: d5289f9aecc690d45be49871b113529d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Build/BuildDependenceResource/Login/港澳台_new/img_login01.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: 9eb592dc9e2d3f14fa4e324439f8fb8e
+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: -1
+    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: 10
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 34
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    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: 710dc56643f2b0445a6af77a6d7e764e
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Build/BuildDependenceResource/Login/港澳台_new/img_login02.png.meta

@@ -0,0 +1,132 @@
+fileFormatVersion: 2
+guid: c50558a0b9e0b414b833edfc498548a8
+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: -1
+    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: 10
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 34
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    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: 085835d74a076f24ebce915f61652b9d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Build/BuildDependenceResource/PackConfig.json

@@ -1073,8 +1073,8 @@
                 "VUPLEX_CCU",
                 "FPS_DISABLE"
             ],
-            "logo1RelativePath": "xlwy.png",
-            "loginRelativePath": "Default",
+            "logo1RelativePath": "Tw-new.png",
+            "loginRelativePath": "港澳台_new",
             "gameAssetsPath": "Default",
             "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
@@ -1129,8 +1129,8 @@
                 "VUPLEX_CCU",
                 "FPS_DISABLE"
             ],
-            "logo1RelativePath": "xlwy.png",
-            "loginRelativePath": "Default",
+            "logo1RelativePath": "Tw-new.png",
+            "loginRelativePath": "港澳台_new",
             "gameAssetsPath": "Default",
             "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
@@ -1664,7 +1664,7 @@
         {
             "channelName": "小龙",
             "appName": "萌新冒險家",
-            "distributeName": "正式服（东南亚）",
+            "distributeName": "正式服（新港澳台）",
             "channelUniqueId": "22002013",
             "bundleId": "com.Runjin.Wonderland",
             "gameVersionCode": {
@@ -1685,8 +1685,8 @@
                 "VUPLEX_CCU",
                 "FPS_DISABLE"
             ],
-            "logo1RelativePath": "ntquick.png",
-            "loginRelativePath": "Default",
+            "logo1RelativePath": "Tw-new.png",
+            "loginRelativePath": "港澳台_new",
             "gameAssetsPath": "Default",
             "specialFuncShield": false,
             "splashScreenRelativeFiles": [],