From c32a5305407cba5e61fd16db9c88d9e26d12f7e6 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 14 Aug 2020 21:06:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=20release=20sdk=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scripts/SDK/Proxy.cs | 2 +- .../Scripts/SDK/Proxy/AndroidProxy.cs | 4 +- Assets/LuaFramework/Scripts/SDK/SDKManager.cs | 4 +- .../ManagedResources/~Lua/Logic/Network.lua | 8 +++- .../DataCenterService/CustomEventManager.lua | 46 +++++++++---------- Assets/Source/Generate/SDK_SDKManagerWrap.cs | 5 +- 6 files changed, 36 insertions(+), 33 deletions(-) diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy.cs index 7a30909a98..20f5e0d3b9 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy.cs @@ -19,7 +19,7 @@ namespace SDK private Queue messages = new Queue(); public void PushMessage(Message msg) { lock (messages) { messages.Enqueue(msg); } } public Message PopMessage() { lock (messages) { return messages.Count > 0 ? messages.Dequeue() : null; } } - public virtual void CustomEvent(string events,string desc) { } + public virtual void CustomEvent(string events,string desc, string type) { } } } diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs index f2f1644dd9..98764c7304 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs @@ -123,9 +123,9 @@ namespace SDK } //sdk打点功能 - public override void CustomEvent(string events, string desc) + public override void CustomEvent(string events, string desc, string type) { - currentActivity.Call("CustomEvent", events, desc); + currentActivity.Call("CustomEvent", events, desc , type); } //登出 public override void Logout() diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs index 59f105fe51..e3c38f9cd7 100644 --- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs +++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs @@ -160,9 +160,9 @@ namespace SDK proxy.Logout(); } //sdk 埋点 - public void CustomEvent(string events, string desc) + public void CustomEvent(string events, string desc, string type) { - proxy.CustomEvent(events,desc); + proxy.CustomEvent(events,desc, type); } /// /// ///////// sdk层回调 diff --git a/Assets/ManagedResources/~Lua/Logic/Network.lua b/Assets/ManagedResources/~Lua/Logic/Network.lua index 677df8afa3..3390fe4d79 100644 --- a/Assets/ManagedResources/~Lua/Logic/Network.lua +++ b/Assets/ManagedResources/~Lua/Logic/Network.lua @@ -261,8 +261,12 @@ function Network:Update() elseif self.resendTimes == self.maxResendTimes then RequestPanel.Hide() MsgPanel.ShowTwo("请求失败,是否重新请求?", function() - Framework.Dispose() - App.Instance:ReStart() + if AppConst.isSDKLogin then + SDKMgr:Logout() + else + Framework.Dispose() + App.Instance:ReStart() + end end, function() self.resendTimes = 0 end, "重新登录") diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index 4f4ca7e7e6..24607c36ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -2,25 +2,25 @@ CustomEventManager = {} local this = CustomEventManager local IsSDKLogin = AppConst.isSDKLogin local FBSDKCustomEvents = { - [1] = {id = 1, info = 1,FBSDKCustomEventType = 1,event = "Registration",data = "用户完成注册或使用第三方渠道首次登陆"}, - [2] = {id = 2, info = 2,FBSDKCustomEventType = 1,event = "Next day login",data = "次日登陆,即 次留"}, - [3] = {id = 3, info = 3,FBSDKCustomEventType = 1,event = "3rd day login",data = "3留" }, - [4] = {id = 4, info = 7,FBSDKCustomEventType = 1,event = "7th day login",data = "7留" }, - [5] = {id = 5, info = 2,FBSDKCustomEventType = 2,event = "特权等级 2",data = "特权等级达到2" }, - [6] = {id = 6, info = 4,FBSDKCustomEventType = 2,event = "特权等级 4",data = "特权等级达到4" }, - [7] = {id = 7, info = 6,FBSDKCustomEventType = 2,event = "特权等级 6",data = "特权等级达到6" }, - [8] = {id = 8, info = 8,FBSDKCustomEventType = 2,event = "特权等级 8",data = "特权等级达到8" }, - [9] = {id = 9, info = 10,FBSDKCustomEventType = 2,event = "特权等级 10",data = "特权等级达到10" }, - [10] = {id = 10, info = 13,FBSDKCustomEventType = 2,event = "特权等级 13",data = "特权等级达到13"}, - [11] = {id = 11, info = 0,FBSDKCustomEventType = 3,event = "New role tutorial",data = "完成新手指引"}, - [12] = {id = 12, info = 10,FBSDKCustomEventType = 4,event = "Levels achieved",data = "角色等级10"}, - [13] = {id = 13, info = 20,FBSDKCustomEventType = 4,event = "Lv. 20",data = "角色等级20" }, - [14] = {id = 14, info = 40,FBSDKCustomEventType = 4,event = "Lv. 40",data = "角色等级40"}, - [15] = {id = 15, info = 80,FBSDKCustomEventType = 4,event = "Lv. 80",data = "角色等级80" }, - [16] = {id = 16, info = 100,FBSDKCustomEventType = 4,event = "Lv. 100",data = "角色等级100" }, - [17] = {id = 17, info = 0,FBSDKCustomEventType = 5,event = "Monthly card",data = "首次购买普通月卡" }, - [18] = {id = 18, info = 0,FBSDKCustomEventType = 6,event = "Supreme card",data = "首次购买豪华月卡" }, - [19] = {id = 19, info = 0,FBSDKCustomEventType = 7,event = "First topup",data = "完成首次充值" }, + [1] = {id = 1,type = 1, info = 1,FBSDKCustomEventType = 1,event = "Registration",data = "用户完成注册或使用第三方渠道首次登陆"}, + [2] = {id = 2, type = 1,info = 2,FBSDKCustomEventType = 1,event = "Next day login",data = "次日登陆,即 次留"}, + [3] = {id = 3, type = 1,info = 3,FBSDKCustomEventType = 1,event = "3rd day login",data = "3留" }, + [4] = {id = 4, type = 1,info = 7,FBSDKCustomEventType = 1,event = "7th day login",data = "7留" }, + [5] = {id = 5, type = 1,info = 2,FBSDKCustomEventType = 2,event = "特权等级 2",data = "特权等级达到2" }, + [6] = {id = 6, type = 1,info = 4,FBSDKCustomEventType = 2,event = "特权等级 4",data = "特权等级达到4" }, + [7] = {id = 7, type = 1,info = 6,FBSDKCustomEventType = 2,event = "特权等级 6",data = "特权等级达到6" }, + [8] = {id = 8, type = 1,info = 8,FBSDKCustomEventType = 2,event = "特权等级 8",data = "特权等级达到8" }, + [9] = {id = 9, type = 1,info = 10,FBSDKCustomEventType = 2,event = "特权等级 10",data = "特权等级达到10" }, + [10] = {id = 10, type = 1,info = 13,FBSDKCustomEventType = 2,event = "特权等级 13",data = "特权等级达到13"}, + [11] = {id = 11, type = 1,info = 0,FBSDKCustomEventType = 3,event = "New role tutorial",data = "完成新手指引"}, + [12] = {id = 12, type = 1,info = 10,FBSDKCustomEventType = 4,event = "Levels achieved",data = "角色等级10"}, + [13] = {id = 13, type = 1,info = 20,FBSDKCustomEventType = 4,event = "Lv. 20",data = "角色等级20" }, + [14] = {id = 14, type = 1,info = 40,FBSDKCustomEventType = 4,event = "Lv. 40",data = "角色等级40"}, + [15] = {id = 15, type = 1,info = 80,FBSDKCustomEventType = 4,event = "Lv. 80",data = "角色等级80" }, + [16] = {id = 16, type = 1,info = 100,FBSDKCustomEventType = 4,event = "Lv. 100",data = "角色等级100" }, + [17] = {id = 17, type = 1,info = 0,FBSDKCustomEventType = 5,event = "Monthly card",data = "首次购买普通月卡" }, + [18] = {id = 18, type = 1,info = 0,FBSDKCustomEventType = 6,event = "Supreme card",data = "首次购买豪华月卡" }, + [19] = {id = 19, type = 1,info = 0,FBSDKCustomEventType = 7,event = "First topup",data = "完成首次充值" }, } function this.SetisFirstLogVal(isDayFirst) if isDayFirst == 0 then--今天第一次登陆 @@ -36,22 +36,20 @@ function this.SendCustomEvents(CustomType,info) local index = 0 for i = 1, #FBSDKCustomEvents do local curFBSDKCustomEvents = FBSDKCustomEvents[i] - -- LogGreen("埋点上报数据1 : "..curFBSDKCustomEvents.event.." "..curFBSDKCustomEvents.data.." "..CustomType.." "..info) if CustomType == curFBSDKCustomEvents.FBSDKCustomEventType and info == curFBSDKCustomEvents.info then - -- LogGreen("埋点上报数据2 : "..curFBSDKCustomEvents.id) index = curFBSDKCustomEvents.id break end end if index > 0 then LogGreen("埋点上报数据 成功 : "..FBSDKCustomEvents[index].event.." "..FBSDKCustomEvents[index].data) - this.SendCustomEvent(FBSDKCustomEvents[index].event,FBSDKCustomEvents[index].data) + this.SendCustomEvent(FBSDKCustomEvents[index].event,FBSDKCustomEvents[index].data,FBSDKCustomEvents[index].type) end end -- 打点事件 -function this.SendCustomEvent(event, data) +function this.SendCustomEvent(event, data,type) if IsSDKLogin then - SDKMgr:CustomEvent(event,data) + SDKMgr:CustomEvent(event,data,type) end end diff --git a/Assets/Source/Generate/SDK_SDKManagerWrap.cs b/Assets/Source/Generate/SDK_SDKManagerWrap.cs index f1c8c6516d..616ceddd72 100644 --- a/Assets/Source/Generate/SDK_SDKManagerWrap.cs +++ b/Assets/Source/Generate/SDK_SDKManagerWrap.cs @@ -211,11 +211,12 @@ public class SDK_SDKManagerWrap { try { - ToLua.CheckArgsCount(L, 3); + ToLua.CheckArgsCount(L, 4); SDK.SDKManager obj = (SDK.SDKManager)ToLua.CheckObject(L, 1); string arg0 = ToLua.CheckString(L, 2); string arg1 = ToLua.CheckString(L, 3); - obj.CustomEvent(arg0, arg1); + string arg2 = ToLua.CheckString(L, 4); + obj.CustomEvent(arg0, arg1, arg2); return 0; } catch (Exception e) From b2e4b6427ee2ea856ccb0d845a2ead80d248de8d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 14 Aug 2020 22:11:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E8=B5=B0=E8=A1=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Manager/TapDBConfig.cs | 13 +++- .../Prefabs/UI/View/ShopView.prefab | 8 +-- .../ManagedResources/~Lua/Common/Managers.lua | 2 + .../ManagedResources/~Lua/Data/ConfigData.lua | 1 + .../~Lua/Modules/Common/MoneyUtil.lua | 68 +++++++++++++++++++ .../~Lua/Modules/Common/MoneyUtil.lua.meta | 7 ++ .../~Lua/Modules/Pay/PayManager.lua | 21 ++---- .../ManagedResources/~Lua/View/ShopView.lua | 2 +- 8 files changed, 100 insertions(+), 22 deletions(-) create mode 100644 Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua.meta diff --git a/Assets/LuaFramework/Scripts/Manager/TapDBConfig.cs b/Assets/LuaFramework/Scripts/Manager/TapDBConfig.cs index 484b6f7958..82958a878e 100644 --- a/Assets/LuaFramework/Scripts/Manager/TapDBConfig.cs +++ b/Assets/LuaFramework/Scripts/Manager/TapDBConfig.cs @@ -9,9 +9,11 @@ namespace GameLogic { public string appid = ""; + public string channel = ""; void Start() { TapDBManager.Instance.SetAppId(appid); + TapDBManager.Instance.SetChannel(channel); } void OnApplicationPause(bool pauseStatus) @@ -39,11 +41,11 @@ namespace GameLogic public void Init() { - string channel = VersionManager.Instance.GetVersionInfo("channel"); - string subChannel = VersionManager.Instance.GetVersionInfo("subChannel"); + //string channel = VersionManager.Instance.GetVersionInfo("channel"); + //string subChannel = VersionManager.Instance.GetVersionInfo("subChannel"); string version = VersionManager.Instance.GetVersionInfo("version"); - TapDBManager.channel = channel + "_" + subChannel; + //TapDBManager.channel = channel + "_" + subChannel; TapDBManager.version = version; } @@ -59,6 +61,11 @@ namespace GameLogic { TapDBManager.appId = appId; } + public void SetChannel(string channel) + { + TapDBManager.channel = channel; + } + public void OnStart() diff --git a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab index 5d87d6acf3..d3734a20c7 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab @@ -1109,7 +1109,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.00000065565, y: -99.69507} - m_SizeDelta: {x: 112, y: 44} + m_SizeDelta: {x: 132, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222986977202393806 CanvasRenderer: @@ -4304,7 +4304,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.000010808, y: -0.00000095367} - m_SizeDelta: {x: 112, y: 44} + m_SizeDelta: {x: 132, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3096389263076999085 CanvasRenderer: @@ -4344,8 +4344,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\xA56" --- !u!1 &3130579941747738974 diff --git a/Assets/ManagedResources/~Lua/Common/Managers.lua b/Assets/ManagedResources/~Lua/Common/Managers.lua index f1c919b217..ff1511fd81 100644 --- a/Assets/ManagedResources/~Lua/Common/Managers.lua +++ b/Assets/ManagedResources/~Lua/Common/Managers.lua @@ -129,6 +129,8 @@ local ManagerNames = { "MapFight/FightUIManager", -- 通用对象池 "Common/Pool/CommonPool", + -- 货币管理 + "Common/MoneyUtil", --幸运转盘 "LuckyTurnTable/LuckyTurnTableManager", --手机绑定 diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index fef6baa1a3..bb2e1ce860 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -157,6 +157,7 @@ ConfigName = { RaceTowerConfig = "RaceTowerConfig", RaceTowerRewardConfig = "RaceTowerRewardConfig", HeroSacrifice = "HeroSacrifice", + ExchangeRate = "ExchangeRate", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua new file mode 100644 index 0000000000..b541b027a4 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua @@ -0,0 +1,68 @@ +MoneyUtil = {} +local this = MoneyUtil + + +this.RMB2O = {} +this.MT = 1 + + +function this.Initialize() + this.MT = ConfigManager.GetConfigData(ConfigName.SpecialConfig, 79).Value + local er = ConfigManager.GetConfig(ConfigName.ExchangeRate) + for _, v in ConfigPairs(er) do + this.RMB2O[v.Price_1] = v + end +end + +-- 获取相应的金额 +function this.GetMoney(rmbp) + if not this.RMB2O[rmbp] then + LogError("表 ExchangeRate 错误: 不包含档位:"..tostring(rmbp)) + return 0 + end + local m = this.RMB2O[rmbp]["Price_"..this.MT] + if not m then + LogError("表 ExchangeRate 错误: 档位:"..tostring(rmbp).." , 未找到对应的货币类型 "..this.MT) + return 0 + end + return m +end + +function this.GetCurMoneyType() + return this.MT +end + +local _t2m = { + [1] = "¥", + [2] = "$", +} +-- 获取货币符号 +function this.GetMoneyMark(mt) + if not mt then + mt = this.MT + end + mt = tonumber(mt) + if _t2m[mt] then + return _t2m[mt] + end + return _t2m[1] +end + +-- 获取货币单位名称 +local _t2n = { + [1] = "元", + [2] = "美元", +} +function this.GetMoneyUnitName(mt) + if not mt then + mt = this.MT + end + mt = tonumber(mt) + if _t2n[mt] then + return _t2n[mt] + end + return _t2n[1] +end + + +return MoneyUtil \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua.meta b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua.meta new file mode 100644 index 0000000000..1e0dabc661 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3c4ecabbff8da494c805cf9f8ec77e2a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 9359f19c8d..f41ef94d31 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -29,25 +29,18 @@ function this.Pay(context) end function this.RequestPay(context) + + local price = MoneyUtil.GetMoney(context.Price) + SDKMgr.onPayCallback = function(payResp) Log("onPayCallback::"..payResp) local str = string.split(payResp, "#") local result = tonumber(str[1]) -- local orderId = str[2] if result == SDK_RESULT.SUCCESS then - DataCenterManager.CommitPayStatus( - "IN_GAME_"..context.Type, - -- SDKMgr:GetPayOrderID(), - "VALID", - tostring(context.Price) - ) + elseif result == SDK_RESULT.FAILED then - DataCenterManager.CommitPayStatus( - "IN_GAME_"..context.Type, - -- SDKMgr:GetPayOrderID(), - "INVALID", - tostring(context.Price) - ) + else --PopupTipPanel.ShowTip("取消充值" .. result) -- DataCenterManager.CommitPayStatus( @@ -62,7 +55,7 @@ function this.RequestPay(context) params.productId = context.Id params.productName = context.Name or "" params.productDesc = context.Desc or "" - params.price = context.Price * 100 -- 以分为单位 + params.price = price * 100 -- 以分为单位 params.ratio = 1 params.buyNum = context.BuyNum or 1 params.coinNum = BagManager.GetItemCountById(16) @@ -88,7 +81,7 @@ function this.RequestPay(context) ThinkingAnalyticsManager.Track("create_order", { goods_id = context.Id, goods_name = context.Name, - order_money_amount = context.Price, + order_money_amount = price, Bundle_id = AppConst.SdkPackageName, }) end diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 747f7bae06..595ca79422 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -523,7 +523,7 @@ function this:RechargeShopItemAdapter(shopItem, itemData) local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId) icon.sprite = Util.LoadSprite(GetResourcePath(itemInfo.Resources)) num.text = itemInfo.Name - price.text = "$" .. itemInfo.Price + price.text = MoneyUtil.GetMoneyMark() .. MoneyUtil.GetMoney(itemInfo.Price) -- 判断首充赠送 local curBuyCount = itemData.buyTimes first:SetActive(curBuyCount < 1)