gdl_123 4 달 전
부모
커밋
22fb4f401d

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 97 - 24
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset


+ 9 - 9
Assets/Content/Prefabs/UI/UIRoleMessage/UIRoleMessage.prefab

@@ -1562,7 +1562,7 @@ RectTransform:
   - {fileID: 1029947528906300051}
   - {fileID: 1029947528906300051}
   - {fileID: 916218362501169040}
   - {fileID: 916218362501169040}
   m_Father: {fileID: 5336260516103863365}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -10443,7 +10443,7 @@ RectTransform:
   - {fileID: 8041195238660960075}
   - {fileID: 8041195238660960075}
   - {fileID: 2798881452540532547}
   - {fileID: 2798881452540532547}
   m_Father: {fileID: 5336260516103863365}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 9
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -10914,7 +10914,7 @@ RectTransform:
   - {fileID: 6667425262857259280}
   - {fileID: 6667425262857259280}
   - {fileID: 6285983970634261908}
   - {fileID: 6285983970634261908}
   m_Father: {fileID: 5336260516103863365}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -11022,7 +11022,7 @@ RectTransform:
   - {fileID: 878967767349127146}
   - {fileID: 878967767349127146}
   - {fileID: 9155867645935141185}
   - {fileID: 9155867645935141185}
   m_Father: {fileID: 5336260516103863365}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -12121,7 +12121,7 @@ RectTransform:
   - {fileID: 1195736184721452375}
   - {fileID: 1195736184721452375}
   - {fileID: 8689242455400030297}
   - {fileID: 8689242455400030297}
   m_Father: {fileID: 5336260516103863365}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -18206,13 +18206,13 @@ RectTransform:
   - {fileID: 2458532920963426169}
   - {fileID: 2458532920963426169}
   - {fileID: 1214391448431730003}
   - {fileID: 1214391448431730003}
   - {fileID: 6809832191178612015}
   - {fileID: 6809832191178612015}
+  - {fileID: 5119510253035444366}
   - {fileID: 9054107389942907229}
   - {fileID: 9054107389942907229}
   - {fileID: 120791349556429950}
   - {fileID: 120791349556429950}
   - {fileID: 795751942586452833}
   - {fileID: 795751942586452833}
   - {fileID: 8294743162493022464}
   - {fileID: 8294743162493022464}
   - {fileID: 3002946349750704383}
   - {fileID: 3002946349750704383}
   - {fileID: 1622690878384656972}
   - {fileID: 1622690878384656972}
-  - {fileID: 5119510253035444366}
   m_Father: {fileID: 2322137626752623503}
   m_Father: {fileID: 2322137626752623503}
   m_RootOrder: 2
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18333,7 +18333,7 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 7765473145818416483}
   - {fileID: 7765473145818416483}
   m_Father: {fileID: 5336260516103863365}
   m_Father: {fileID: 5336260516103863365}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -18671,7 +18671,7 @@ MonoBehaviour:
   m_faceColor:
   m_faceColor:
     serializedVersion: 2
     serializedVersion: 2
     rgba: 4294967295
     rgba: 4294967295
-  m_fontSize: 40
+  m_fontSize: 37.5
   m_fontSizeBase: 42
   m_fontSizeBase: 42
   m_fontWeight: 400
   m_fontWeight: 400
   m_enableAutoSizing: 1
   m_enableAutoSizing: 1
@@ -27300,7 +27300,7 @@ PrefabInstance:
     - target: {fileID: 70813078944487029, guid: 02c411c1c49913e42982900775435a4b,
     - target: {fileID: 70813078944487029, guid: 02c411c1c49913e42982900775435a4b,
         type: 3}
         type: 3}
       propertyPath: m_RootOrder
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 70813078944487029, guid: 02c411c1c49913e42982900775435a4b,
     - target: {fileID: 70813078944487029, guid: 02c411c1c49913e42982900775435a4b,
         type: 3}
         type: 3}

BIN
Assets/Content/Raw_Art/UI/UILanuch/img_logo_01.png


+ 5 - 6
Assets/Lua/Core/PlatformPack.lua

@@ -1,10 +1,9 @@
 local PlatformPack = {
 local PlatformPack = {
-	URL_KEY = 'http://43.156.13.116:81//',
-	SERVERLIST_URL = 'http://43.156.13.116:81//serverlist',
-	NOTIFY_URL = 'http://43.156.13.116:88/res/NoticeNew/',
-	SPECIAL_INFO_URL = 'http://43.156.13.116:81//channel',
-	CUSTOMER_SERVICE_INFO_URL = 'http://43.156.13.116:81//vipService',
-	SpecialFuncShield = true,
+	URL_KEY = 'http://110.40.223.119:81//',
+	SERVERLIST_URL = 'http://110.40.223.119:81//serverlist',
+	NOTIFY_URL = 'http://110.40.223.119:88/res/NoticeNew/',
+	SPECIAL_INFO_URL = 'http://110.40.223.119:81//channel',
+	CUSTOMER_SERVICE_INFO_URL = 'http://110.40.223.119:81//vipService',
 }
 }
 
 
 return PlatformPack
 return PlatformPack

+ 4 - 2
Assets/Lua/Managers/PayMgr.lua

@@ -134,7 +134,8 @@ function PayMgr:OnGetPayInfoAck(data)
         end
         end
 
 
         payType = ManagerContainer.OpenPayMgr:GetCurPayMode()
         payType = ManagerContainer.OpenPayMgr:GetCurPayMode()
-
+        --ManagerContainer.SDKEventReportMgr:SendEvent(26)
+        ManagerContainer.SDKEventReportMgr:SendEvent(27)
     --ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付,祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), cbUrl,"ex")
     --ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付,祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), cbUrl,"ex")
     -- and ManagerContainer.OpenPayMgr.platform == "SDKYOUYI_IOS"
     -- and ManagerContainer.OpenPayMgr.platform == "SDKYOUYI_IOS"
         if payType >=1 and UseOpenPay then
         if payType >=1 and UseOpenPay then
@@ -146,11 +147,12 @@ function PayMgr:OnGetPayInfoAck(data)
     
     
     local dbCount = CommonUtil.GetOwnResCountByItemId(40001)
     local dbCount = CommonUtil.GetOwnResCountByItemId(40001)
 
 
-    local dbCb = function ()
+    local dbCb = function ()     
         LogError("============代币流程==============")
         LogError("============代币流程==============")
         local iszg = dbCount >= math.floor(data.amount *100+0.0005)
         local iszg = dbCount >= math.floor(data.amount *100+0.0005)
         local cpid = data.cp_order_id
         local cpid = data.cp_order_id
         if iszg then
         if iszg then
+            ManagerContainer.SDKEventReportMgr:SendEvent(27)
              ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_PAY_ORDER_COMPLETE_REQ, {cp_order_id = cpid})
              ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_PAY_ORDER_COMPLETE_REQ, {cp_order_id = cpid})
         else
         else
             ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("dbPayError")
             ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("dbPayError")

+ 37 - 1
Assets/Lua/Managers/SDKEventReportMgr.lua

@@ -33,6 +33,8 @@ Receive_2days_bonus			=22,		--领取2日签到奖励		Receive_2days_bonus
 Receive_3days_bonus			=23,		--领取3日签到奖励		Receive_3days_bonus
 Receive_3days_bonus			=23,		--领取3日签到奖励		Receive_3days_bonus
 Receive_8days_bonus			=24,		--领取8日签到奖励		Receive_8days_bonus
 Receive_8days_bonus			=24,		--领取8日签到奖励		Receive_8days_bonus
 Receive_30days_bonus		=25,		--领取30日签到奖励		Receive_30days_bonus
 Receive_30days_bonus		=25,		--领取30日签到奖励		Receive_30days_bonus
+ClickGoods					=26,		--点击礼包
+OpenPayPanel				=27,		--打开支付界面
 }
 }
 
 
 --[[
 --[[
@@ -78,6 +80,16 @@ SDKEventReportMgr.SDKEventCfg =
 	[SDKEventReportMgr.EventType.Receive_3days_bonus		]={event="Receive_3days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_3days_bonus		]={event="Receive_3days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_8days_bonus		]={event="Receive_8days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_8days_bonus		]={event="Receive_8days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_30days_bonus		]={event="Receive_30days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_30days_bonus		]={event="Receive_30days_bonus"			,	eventToken=""					,					},
+	[SDKEventReportMgr.EventType.ClickGoods					]={event=""								,	eventToken="bhz9ec"					,
+	other={
+		name = "加入购入车",
+		unique= "FALSE",
+	}				},
+	[SDKEventReportMgr.EventType.OpenPayPanel				]={event=""								,	eventToken="6snb8x"					,
+	other={
+		name = "发起结账",
+		unique= "FALSE",
+	}				},
 },
 },
 --[[
 --[[
 adjust_token:zg6ixp19pdz4
 adjust_token:zg6ixp19pdz4
@@ -118,7 +130,16 @@ adjus事件上报及对应的token
 	[SDKEventReportMgr.EventType.Receive_3days_bonus		]={event="Receive_3days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_3days_bonus		]={event="Receive_3days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_8days_bonus		]={event="Receive_8days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_8days_bonus		]={event="Receive_8days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_30days_bonus		]={event="Receive_30days_bonus"			,	eventToken=""					,					},
 	[SDKEventReportMgr.EventType.Receive_30days_bonus		]={event="Receive_30days_bonus"			,	eventToken=""					,					},
-},
+	[SDKEventReportMgr.EventType.ClickGoods					]={event=""								,	eventToken="bhz9ec"					,
+	other={
+		name = "加入购入车",
+		unique= "FALSE",
+	}				},
+	[SDKEventReportMgr.EventType.OpenPayPanel				]={event=""								,	eventToken="6snb8x"					,
+	other={
+		name = "发起结账",
+		unique= "FALSE",
+	}				},},
 }
 }
 
 
 function SDKEventReportMgr:ctor()
 function SDKEventReportMgr:ctor()
@@ -139,6 +160,7 @@ end
 
 
 function SDKEventReportMgr:SendEvent(type)
 function SDKEventReportMgr:SendEvent(type)
      if not SDKMgr.Instance:IsReportAction() then
      if not SDKMgr.Instance:IsReportAction() then
+		LogError("=====统计发起没开======")
         return
         return
     end
     end
    local curCfg = self:GetCfgByType(type)
    local curCfg = self:GetCfgByType(type)
@@ -146,9 +168,18 @@ function SDKEventReportMgr:SendEvent(type)
 		LogError("没找到对应统计 id ="..type)
 		LogError("没找到对应统计 id ="..type)
 		return
 		return
    end
    end
+   --LogError("=====统计发起======")
      local datas = System.Collections.Generic.Dictionary_object_object()
      local datas = System.Collections.Generic.Dictionary_object_object()
      datas:Add('event', curCfg.event)
      datas:Add('event', curCfg.event)
      datas:Add('eventToken', curCfg.eventToken)
      datas:Add('eventToken', curCfg.eventToken)
+
+	 if curCfg.other ~= nil then	
+		for key, value in pairs(curCfg.other) do
+			--LogError(tostring(key))
+			 datas:Add(tostring(key), value)
+		end
+	 end
+
      SDKMgr.Instance:ReportAction(datas)
      SDKMgr.Instance:ReportAction(datas)
 
 
 end
 end
@@ -182,4 +213,9 @@ function SDKEventReportMgr:OnSC_DNY_SDK_NTF(data)
 	end
 	end
 	self:SendEvent(data.type);
 	self:SendEvent(data.type);
 end
 end
+
+
+function SDKEventReportMgr:SendClickGoods()
+	self:SendEvent(self.EventType.ClickGoods)
+end
 return SDKEventReportMgr
 return SDKEventReportMgr

+ 1 - 0
Assets/Lua/UI/UIActivity/UIActivityHundredRechargeBTView.lua

@@ -93,6 +93,7 @@ function UIActivityHundredRechargeBTView:OnClickDayToggle(tog, params, b)
 end
 end
 
 
 function UIActivityHundredRechargeBTView:OnClickRechargeBtn()
 function UIActivityHundredRechargeBTView:OnClickRechargeBtn()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCode = ManagerContainer.PayMgr:BTHundredRechargePay(2)
 	local errorCode = ManagerContainer.PayMgr:BTHundredRechargePay(2)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	if not errorCodeKey then
 	if not errorCodeKey then

+ 2 - 0
Assets/Lua/UI/UIActivity/UIActivityLimitedGiftView.lua

@@ -226,6 +226,7 @@ end
 function UIActivityLimitedGiftView:OnItemClick(button, params)
 function UIActivityLimitedGiftView:OnItemClick(button, params)
 	local data = params[0]
 	local data = params[0]
 	ManagerContainer.LuaUIMgr:OpenTips(data)
 	ManagerContainer.LuaUIMgr:OpenTips(data)
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 end
 end
 
 
 function UIActivityLimitedGiftView:Update()
 function UIActivityLimitedGiftView:Update()
@@ -313,6 +314,7 @@ end
 
 
 function UIActivityLimitedGiftView:OnPayClick()
 function UIActivityLimitedGiftView:OnPayClick()
 	local id = self.controller:GetLimitRechargeId()
 	local id = self.controller:GetLimitRechargeId()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCode = ManagerContainer.PayMgr:LimitedGiftPay(id)
 	local errorCode = ManagerContainer.PayMgr:LimitedGiftPay(id)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	if not errorCodeKey then
 	if not errorCodeKey then

+ 2 - 0
Assets/Lua/UI/UIActivity/UIActivityTowerView.lua

@@ -712,10 +712,12 @@ end
 function UIActivityTowerView:OnItemClick(button, params)
 function UIActivityTowerView:OnItemClick(button, params)
 	local data = params[0]
 	local data = params[0]
 	ManagerContainer.LuaUIMgr:OpenTips(data)
 	ManagerContainer.LuaUIMgr:OpenTips(data)
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 end
 end
 
 
 function UIActivityTowerView:OnPay(button, params)
 function UIActivityTowerView:OnPay(button, params)
 	local data = params[0]
 	local data = params[0]
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCode = ManagerContainer.PayMgr:RankActivityPay(self.controller:GetType(), data.id)
 	local errorCode = ManagerContainer.PayMgr:RankActivityPay(self.controller:GetType(), data.id)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	if not errorCodeKey then
 	if not errorCodeKey then

+ 1 - 0
Assets/Lua/UI/UIRuneShop/UIRewardsBuyTipsCtr.lua

@@ -78,6 +78,7 @@ function UIRewardsBuyTipsCtr:GetExpUp()
 end 
 end 
 
 
 function UIRewardsBuyTipsCtr:SendPay()
 function UIRewardsBuyTipsCtr:SendPay()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local round = ManagerContainer.DataMgr.RuneShopDataMgr:GetRewardsData():GetShowRewardsRoundData()
 	local round = ManagerContainer.DataMgr.RuneShopDataMgr:GetRewardsData():GetShowRewardsRoundData()
 	local errorCode = ManagerContainer.PayMgr:AirShipPay(round)
 	local errorCode = ManagerContainer.PayMgr:AirShipPay(round)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)
 	local errorCodeKey = ManagerContainer.PayMgr:GetInitPayErrorCodeLangKey(errorCode)

+ 4 - 0
Assets/Lua/UI/UIRuneShop/UIRuneShopBTView.lua

@@ -173,6 +173,7 @@ function UIRuneShopBTView:OnClickGiftItem(button, params)
 	local id = params[0]
 	local id = params[0]
 	local runeShopType = self.controller:GetShopType()
 	local runeShopType = self.controller:GetShopType()
 	local runeShopSubType = self.controller:GetShopSubType()
 	local runeShopSubType = self.controller:GetShopSubType()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	if runeShopType == Enum.RuneShopType.Gifts then
 	if runeShopType == Enum.RuneShopType.Gifts then
 		if runeShopSubType == Enum.RuneShopSubType.Gold then
 		if runeShopSubType == Enum.RuneShopSubType.Gold then
 			ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopGoldBuyTips, {runeShopType, runeShopSubType, id})
 			ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopGoldBuyTips, {runeShopType, runeShopSubType, id})
@@ -184,6 +185,7 @@ end
 
 
 function UIRuneShopBTView:OnClickGiftPrice(button, params)
 function UIRuneShopBTView:OnClickGiftPrice(button, params)
 	-- 直接发起支付
 	-- 直接发起支付
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local id = params[0]
 	local id = params[0]
 	local errorCodeKey = self.controller:SendPay(id)
 	local errorCodeKey = self.controller:SendPay(id)
 	if not errorCodeKey then
 	if not errorCodeKey then
@@ -196,6 +198,7 @@ function UIRuneShopBTView:OnClickLimitedItem(button, params)
 	local itemIdx = params[1]
 	local itemIdx = params[1]
 	local runeShopType = self.controller:GetShopType()
 	local runeShopType = self.controller:GetShopType()
 	local runeShopSubType = self.controller:GetShopSubType()
 	local runeShopSubType = self.controller:GetShopSubType()
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	if runeShopType == Enum.RuneShopType.Gifts then
 	if runeShopType == Enum.RuneShopType.Gifts then
 		if runeShopSubType == Enum.RuneShopSubType.Gold then
 		if runeShopSubType == Enum.RuneShopSubType.Gold then
 			ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopGoldBuyTips, {runeShopType, runeShopSubType, id})
 			ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIRuneShopGoldBuyTips, {runeShopType, runeShopSubType, id})
@@ -211,6 +214,7 @@ function UIRuneShopBTView:OnClickLimitedPrice(button, params)
 	-- 直接发起支付
 	-- 直接发起支付
 	local id = params[0]
 	local id = params[0]
 	local itemIdx = params[1]
 	local itemIdx = params[1]
+	ManagerContainer.SDKEventReportMgr:SendClickGoods()
 	local errorCodeKey = self.controller:SendPay(id)
 	local errorCodeKey = self.controller:SendPay(id)
 	if not errorCodeKey then
 	if not errorCodeKey then
 		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay(errorCodeKey)
 		ManagerContainer.LuaUIMgr:ErrorNoticeDisplay(errorCodeKey)

+ 8 - 0
Assets/Plugins/SDK/NULL/NULLSDKAndroid.cs

@@ -107,4 +107,12 @@ public class NULLSDKAndroid : SDKBase
 	{
 	{
 		throw new System.NotImplementedException();
 		throw new System.NotImplementedException();
 	}
 	}
+
+    public override bool IsReportAction() { return true; }
+
+    public override void ReportAction(Dictionary<object, object> datas)
+    {
+        base.ReportAction(datas);
+        Debug.LogWarning("[NULLSDK][ReportAction] current platform is not SDK !!!");
+    }
 }
 }

+ 1 - 1
Build/BuildDependenceResource/CurPackEnv.ini

@@ -1 +1 @@
-{"m_ChannelUniqueId":"22002012","m_BuildClassName":"Pack.PackPlatformiOS"}
+{"m_ChannelUniqueId":"12002025","m_BuildClassName":"Pack.PackPlatformAndroid"}

+ 4 - 4
ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   useOnDemandResources: 0
   accelerometerFrequency: 60
   accelerometerFrequency: 60
   companyName: mianywl
   companyName: mianywl
-  productName: 'The King of Poring: Origin'
+  productName: "\u4E1C\u5357\u4E9A\u6D4B\u8BD5\u670D"
   defaultCursor: {fileID: 0}
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
   m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1}
@@ -138,7 +138,7 @@ PlayerSettings:
     16:10: 1
     16:10: 1
     16:9: 1
     16:9: 1
     Others: 1
     Others: 1
-  bundleVersion: 0.1.0
+  bundleVersion: 1.0.0.6
   preloadedAssets: []
   preloadedAssets: []
   metroInputSource: 0
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   wsaTransparentSwapchain: 0
@@ -845,10 +845,10 @@ PlayerSettings:
   webGLDecompressionFallback: 1
   webGLDecompressionFallback: 1
   webGLPowerPreference: 1
   webGLPowerPreference: 1
   scriptingDefineSymbols:
   scriptingDefineSymbols:
-    Android: USE_LUA;VUPLEX_CCU
+    Android: USE_LUA;VUPLEX_CCU;FPS_DISABLE;GAME_DEBUG
     Standalone: USE_LUA;VUPLEX_CCU
     Standalone: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
     WebGL: USE_LUA;VUPLEX_CCU
-    iPhone: USE_LUA;VUPLEX_CCU;FPS_DISABLE
+    iPhone: USE_LUA;VUPLEX_CCU
   additionalCompilerArguments: {}
   additionalCompilerArguments: {}
   platformArchitecture:
   platformArchitecture:
     iPhone: 1
     iPhone: 1

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.