++ use db

Assets/Content/Config/LanguagePackage_cn.csv

@@ -1252,8 +1252,8 @@ Fun77,Pet Contract
 Fun78,Stored Value Wallet
 Fun79,Trial's Bounty
 Fun80,Difficult Missions
-BtnCards,Card
-BtnItems,Card
+BtnCards,Cards
+BtnItems,Items
 TitleBag,Backpack
 FashionSource1,Event
 FashionSourceTxt1,Obtained through operation events
@@ -19203,4 +19203,8 @@ RSLCfg_Name_548,Immortal Hero Costume Gift Pack
 RSLCfg_Name_550,Immortal Hero Costume Great Value Gift Pack
 ZsHmyPmXx,No information about ratings/scores yet~
 QsrYssdWjdMz,Enter player name to search~
-signinTxt,Sign-in Day <color=#FF9600>{0}</color>, Reward: <color=#FF9600>{1}</color>
+signinTxt,Sign-in Day <color=#FF9600>{0}</color>, Reward: <color=#FF9600>{1}</color>
+dbPayError,Insufficient vouchers
+selectPayType,Please select a payment method
+ICfg_Name_40001,Payment Voucher
+ICfg_Describe_40001,Can offset charges incurred during top-up

Assets/Content/Prefabs/UI/PaySelect/UIPayTips.prefab

@@ -210,7 +210,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 95a40c54b9715c147be6ceeecaa27d98, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cd85f16e400f9d24f8cbbbc2776822c4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1367,7 +1367,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 95a40c54b9715c147be6ceeecaa27d98, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cd85f16e400f9d24f8cbbbc2776822c4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2102,7 +2102,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_key: 
+  m_key: selectPayType
 --- !u!1 &6400997323265114428
 GameObject:
   m_ObjectHideFlags: 0

Assets/Lua/Config/ItemCfg2.lua

@@ -9381,13 +9381,13 @@ local ItemCfg2 = {
 ['NatureType']=0,
 ['ActivationItem']=0,
 ['ItemTimeCd']=0,
-},      
+},
 [40001]={
 ['Id']=40001,
-['Name']='ICfg_Name_8',
-['ResType']=27,
+['Name']='ICfg_Name_40001',
+['ResType']=7,
 ['Quality']=4,
-['Composition']=9999,
+['Composition']=999999,
 ['AutoUse']=0,
 ['NeedLevel']=0,
 ['Bang']=1,

Assets/Lua/Config/UICfg.lua

@@ -5966,7 +5966,7 @@ local UICfg = {
 [2200]={
 ['id']=2200,
 ['name']='UIPayTips',
-['type']=9,
+['type']=3,
 ['mainViewType']=0,
 ['need_mask']=false,
 ['lua_path']='',

Assets/Lua/Core/LuaMain.lua

@@ -98,7 +98,7 @@ end
 IsNewLuadll = false
 
 UseOpenPay = false
-UseDbPay = false
+UseDbPay = true
 
 local LuaMain = class("LuaMain")
 

Assets/Lua/Core/PlatformPack.lua

@@ -1,10 +1,9 @@
 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

Assets/Lua/Enum/ProtoMsgId.lua

@@ -721,8 +721,8 @@
 	SC_CLIMBING_TOWER_WJ_BOSS_NTF       = 6065,  -- SCClimbingTowerWjBossNtf **SCClimbingTowerWjBossNtf **login.proto ** [SCClimbingTowerWjBossNtf]
 	CS_CLIMBING_TOWER_WJ_BUFF_REQ       = 6066,  -- CSClimbingTowerWjBuffReq **CSClimbingTowerWjBuffReq **login.proto **game [CSClimbingTowerWjBuffReq]
 	SC_CLIMBING_TOWER_WJ_BUFF_ACK       = 6067,  -- SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
-	CS_PAY_ORDER_COMPLETE_REQ         = 6072,		--	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [SSPayOrderCompleteReq]
-	SC_PAY_ORDER_COMPLETE_ACK         = 6073,		--	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SSPayOrderCompleteAck]
+	CS_PAY_ORDER_COMPLETE_REQ         = 6072,		--	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
+	SC_PAY_ORDER_COMPLETE_ACK         = 6073,		--	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
 
     }
     return ProtoMsgId

Assets/Lua/Logic/BagData.lua

@@ -13,8 +13,13 @@ function BagData:InitBagData(data)
     for i = 1, #data.item_list do
         local itemData = data.item_list[i]
         if itemData and itemData.num > 0 then
+            -- if itemData.config_id == 40001 then
+            --      LogError("40001 itemData.num .. ".. tostring(itemData.num) )
+            --     itemData.num = itemData.num /100.0
+            -- end
             local item = self:ProtocalDataToItemData(itemData)
             local cfgId = item.cfgId
+
             local itemCfgData = cfgMgr:GetItemById(cfgId)
             if not itemCfgData then
                 LogError("[Wboy] .. ".. tostring(cfgId) .. " 道具ID不存在")

Assets/Lua/Managers/OpenPayMgr.lua

@@ -225,6 +225,9 @@ end
 
 
 function OpenPayMgr:GetVersionCfg()
+    if not UseOpenPay then
+        return
+    end
     local url = PlatformPack.NOTIFY_URL .. "VersionCfg.json"
     ManagerContainer.LuaGameMgr:RequestHttpServer(url,function (text)
         self:OnGetVersionCfg(text)

Assets/Lua/Managers/PayMgr.lua

@@ -68,6 +68,7 @@ function PayMgr:RegisterNetEvents()
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_PAY_FOR_GOODS_NTF, self.OnPayCompleteNtf, self)
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_PAY_INFO_NTF, self.OnPayInfoNtf, self)
     ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_PAY_INFO_ORDER_OK_LIST_GET_ACK, self.OnStartUpPayCompleteAck, self)
+    ManagerContainer.NetManager:NetRegister(ProtoMsgId.SC_PAY_ORDER_COMPLETE_ACK, self.OnPayOrdercompleteACK, self)
 end
 
 function PayMgr:UnRegisterNetEvents()
@@ -75,6 +76,7 @@ function PayMgr:UnRegisterNetEvents()
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_PAY_FOR_GOODS_NTF)
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_PAY_INFO_NTF)
     ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_PAY_INFO_ORDER_OK_LIST_GET_ACK)
+    ManagerContainer.NetManager:UnRegisterPbIdCallback(ProtoMsgId.SC_PAY_ORDER_COMPLETE_ACK)
 end
 
 function PayMgr:OnGetPayInfoAck(data)
@@ -120,30 +122,61 @@ function PayMgr:OnGetPayInfoAck(data)
     self:SdkPayResult(false)
     -- 启动支付SDK
 
-    local strArr = string.split(data.goods_name,",")
-
-    local strArrCount = #strArr
-    local cbUrl = data.goods_name
-    local payType = -1
-    if strArrCount  >= 2 then 
-        cbUrl = strArr[1]
-        payType = strArr[2] + 0
-    end
+    local rmbCb = function ()
+        LogError("============正常流程==============")
+        local strArr = string.split(data.goods_name,",")
+        local strArrCount = #strArr
+        local cbUrl = data.goods_name
+        local payType = -1
+        if strArrCount  >= 2 then 
+            cbUrl = strArr[1]
+            payType = strArr[2] + 0
+        end
 
-    payType = ManagerContainer.OpenPayMgr:GetCurPayMode()
+        payType = ManagerContainer.OpenPayMgr:GetCurPayMode()
 
     --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"
-    if payType >=1 and UseOpenPay then
-        ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), cbUrl,"ex")
+        if payType >=1 and UseOpenPay then
+            ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), cbUrl,"ex")
+        else
+            ManagerContainer.LuaGameMgr:SdkPay(data.goods_id,cbUrl, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), nil)
+        end
+    end
+    
+    local dbCount = CommonUtil.GetOwnResCountByItemId(40001)
+
+    local dbCb = function ()
+        LogError("============代币流程==============")
+        local iszg = dbCount >= math.floor(data.amount *100+0.0005)
+        local cpid = data.cp_order_id
+        if iszg then
+             ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_PAY_ORDER_COMPLETE_REQ, {cp_order_id = cpid})
+        else
+            ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("dbPayError")
+        end
+        return iszg
+    end
+
+    if not UseDbPay or dbCount <= 0 then
+        rmbCb()
     else
-        ManagerContainer.LuaGameMgr:SdkPay(data.goods_id,cbUrl, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), nil)
+        ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIPayTips,
+        {
+            selectRmbCallback =rmbCb,
+	        selectDbCallback = dbCb,
+	        dbCount = dbCount,
+            amount = data.amount,
+        })
     end
 
+
     --ManagerContainer.OpenPayMgr:Pay(data.goods_id, data.goods_name, '感谢您的支付，祝你有个愉快的游戏体验', data.count, CommonUtil.GetValidPayPrice(data.amount), tostring(data.cp_order_id), data.goods_name,"ex")
     
 end
 
+-- ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_MD5_GET_REQ, {md5 = paaramsStr})
+
 function PayMgr:OnPayCompleteNtf(data)
      --LogError('[wboy] SC_PAY_FOR_GOODS_NTF ' .. Inspect(data))
     if ManagerContainer.NetManager:IsErrorData(data) then
@@ -454,4 +487,11 @@ function PayMgr:BTHundredRechargePay(goodsId)
     return self:Pay(PayGoodsType.EPayType_BTRecharge100, goodsId ,1 )
 end
 
+
+function PayMgr:OnPayOrdercompleteACK(data)
+    --SC_PAY_ORDER_COMPLETE_ACK
+    if data.error>0 then
+        ManagerContainer.LuaUIMgr:ErrorNoticeDisplay("dbPayError")
+    end
+end
 return PayMgr

Assets/Lua/Pb/protocal.txt

@@ -1,7 +1,7 @@
 
-Ý•
+›—
 protocal.protoserverprotocommon.protoerror_code.protologin.proto
-user.proto"±é

+user.proto"�ê

 Request7
 CS_PING_REQè 
(2.serverproto.CSPingReqR	CSPINGREQ:
 CS_LOGIN_REQê 
(2.serverproto.CSLoginReqR
@@ -372,7 +372,8 @@ $CS_RUNE_SPECIAL_PRIVILEGE_REWARD_REQ
 CS_CLIMBING_TOWER_WJ_BEGIN_REQ«/ 
(2&.serverproto.CSClimbingTowerWjBeginReqRCSCLIMBINGTOWERWJBEGINREQd
 CS_CLIMBING_TOWER_WJ_END_REQ­/ 
(2$.serverproto.CSClimbingTowerWjEndReqRCSCLIMBINGTOWERWJENDREQg
 CS_CLIMBING_TOWER_WJ_RANK_REQ¯/ 
(2%.serverproto.CSClimbingTowerWjRankReqRCSCLIMBINGTOWERWJRANKREQg
-CS_CLIMBING_TOWER_WJ_BUFF_REQ²/ 
(2%.serverproto.CSClimbingTowerWjBuffReqRCSCLIMBINGTOWERWJBUFFREQ"Æ«
+CS_CLIMBING_TOWER_WJ_BUFF_REQ²/ 
(2%.serverproto.CSClimbingTowerWjBuffReqRCSCLIMBINGTOWERWJBUFFREQ]
+CS_PAY_ORDER_COMPLETE_REQ¸/ 
(2".serverproto.CSPayOrderCompleteReqRCSPAYORDERCOMPLETEREQ"¥¬
 Response7
 SC_PING_ACKé 
(2.serverproto.SCPingAckR	SCPINGACK:
 SC_LOGIN_ACKë 
(2.serverproto.SCLoginAckR
@@ -856,4 +857,5 @@ $SC_RUNE_SPECIAL_PRIVILEGE_REWARD_ACK
 SC_CLIMBING_TOWER_WJ_END_ACK®/ 
(2$.serverproto.SCClimbingTowerWjEndAckRSCCLIMBINGTOWERWJENDACKg
 SC_CLIMBING_TOWER_WJ_RANK_ACK°/ 
(2%.serverproto.SCClimbingTowerWjRankAckRSCCLIMBINGTOWERWJRANKACKg
 SC_CLIMBING_TOWER_WJ_BOSS_NTF±/ 
(2%.serverproto.SCClimbingTowerWjBossNtfRSCCLIMBINGTOWERWJBOSSNTFg
-SC_CLIMBING_TOWER_WJ_BUFF_ACK³/ 
(2%.serverproto.SCClimbingTowerWjBuffAckRSCCLIMBINGTOWERWJBUFFACKbproto3
+SC_CLIMBING_TOWER_WJ_BUFF_ACK³/ 
(2%.serverproto.SCClimbingTowerWjBuffAckRSCCLIMBINGTOWERWJBUFFACK]
+SC_PAY_ORDER_COMPLETE_ACK¹/ 
(2".serverproto.SCPayOrderCompleteAckRSCPAYORDERCOMPLETEACKbproto3

Assets/Lua/UI/PaySelect/UIPayTipsCtr.lua

@@ -13,7 +13,7 @@ function UIPayTipsCtr:SetData(data)
 	if data == nil then return end
 	self.data = data
 
-	local payData = data[0]
+	local payData = data
 	self.selectRmbCallback = payData.selectRmbCallback
 	self.selectDbCallback = payData.selectDbCallback
 	self.amount = payData.amount
@@ -42,12 +42,13 @@ end
 
 function UIPayTipsCtr:InvokeDbCb()
 	if self.selectDbCallback then
-		self.selectDbCallback()
+		return self.selectDbCallback()
 	end
+	return false
 end
 
 function UIPayTipsCtr:IsDbZg()
-	return self.dbCount >= self.amount
+	return self.dbCount >= math.floor(self.amount*100+0.0005)
 end
 
 return UIPayTipsCtr

Assets/Lua/UI/PaySelect/UIPayTipsView.lua

@@ -8,7 +8,9 @@ end
 
 function UIPayTipsView:AddEventListener()
 	ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name)
-
+	self.uiBase:AddButtonEventListener(self.btnClose.button,self,self.OnClickClose)
+	self.uiBase:AddButtonEventListener(self.btnDb.button,self,self.OnClickDbBtn)
+	self.uiBase:AddButtonEventListener(self.btnRmb.button,self,self.OnClickRmbBtn)
 end
 
 function UIPayTipsView:FillContent(data, uiBase)
@@ -21,30 +23,34 @@ function UIPayTipsView:FillContent(data, uiBase)
 	self:InitGenerate(self.transform, data)
 
 	self:Init()
+	
 end
 
 function UIPayTipsView:Init()
-	self.rmbPrice.number.text.text = tostring(self.controller.amount)
+	self.rmbPrice.number.text.text = FloatToPrice(self.controller.amount)
 
-	self.dbNum.number.text.text = tostring(self.controller.dbCount)
+	self.dbNum.number.text.text = FloatToPrice(self.controller.dbCount)
 	local colorTxt = "<color=%s>%s</color>"
 
 	local isdbzg = self.controller:IsDbZg()
 
-	self.dbbtn.interactable = isdbzg
+	--self.btnDb.interactable = isdbzg
 
 	if isdbzg then
-		self.dbPrice.number.text.text = tostring(self.controller.amount)
+		self.dbPrice.number.text.text = FloatToInt(self.controller.amount*100)
 	else
-		self.dbPrice.number.text.text = string.format(colorTxt,"#FF0000",tostring(self.controller.amount))
+		self.dbPrice.number.text.text = string.format(colorTxt,"#FF0000", FloatToInt(self.controller.amount*100))
 	end
 
 end
 
+function FloatToInt(num)
+	return tostring(math.floor(num+0.005))
+end
+
 function UIPayTipsView:RemoveEventListener()
 	ManagerContainer.LuaEventMgr:Unregister(self.uiData.name)
-	self.uibase:AddButtonEventListener(self.dbbtn.button,self,self.OnClickDbBtn)
-	self.uibase:AddButtonEventListener(self.rmbbtn.button,self,self.OnClickRmbBtn)
+	
 end
 
 function UIPayTipsView:AddUIEventListener()
@@ -68,11 +74,19 @@ function UIPayTipsView:OnDispose()
 end
 
 function UIPayTipsView:OnClickDbBtn()
-	self.controller:InvokeDbCb()
+	if self.controller:InvokeDbCb() then
+		self:UIClose()
+	end
 end
 
 function UIPayTipsView:OnClickRmbBtn()
 	self.controller:InvokeRmbCb()
+	self:UIClose()
+end
+
+
+function UIPayTipsView:OnClickClose()
+	self:UIClose()
 end
 
 return UIPayTipsView

Build/BuildDependenceResource/CurPackEnv.ini

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

ProjectSettings/ProjectSettings.asset

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

ProtocolGen/proto/ProtoMsgId.lua

@@ -721,8 +721,8 @@
 	SC_CLIMBING_TOWER_WJ_BOSS_NTF       = 6065,  -- SCClimbingTowerWjBossNtf **SCClimbingTowerWjBossNtf **login.proto ** [SCClimbingTowerWjBossNtf]
 	CS_CLIMBING_TOWER_WJ_BUFF_REQ       = 6066,  -- CSClimbingTowerWjBuffReq **CSClimbingTowerWjBuffReq **login.proto **game [CSClimbingTowerWjBuffReq]
 	SC_CLIMBING_TOWER_WJ_BUFF_ACK       = 6067,  -- SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
-	CS_PAY_ORDER_COMPLETE_REQ         = 6072,		--	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [SSPayOrderCompleteReq]
-	SC_PAY_ORDER_COMPLETE_ACK         = 6073,		--	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SSPayOrderCompleteAck]
+	CS_PAY_ORDER_COMPLETE_REQ         = 6072,		--	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
+	SC_PAY_ORDER_COMPLETE_ACK         = 6073,		--	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
 
     }
     return ProtoMsgId

ProtocolGen/proto/messagedefclient.proto

@@ -724,6 +724,6 @@ enum protoMsgId{
 	SC_CLIMBING_TOWER_WJ_BOSS_NTF       = 6065;  // SCClimbingTowerWjBossNtf **SCClimbingTowerWjBossNtf **login.proto ** [SCClimbingTowerWjBossNtf]
 	CS_CLIMBING_TOWER_WJ_BUFF_REQ       = 6066;  // CSClimbingTowerWjBuffReq **CSClimbingTowerWjBuffReq **login.proto **game [CSClimbingTowerWjBuffReq]
 	SC_CLIMBING_TOWER_WJ_BUFF_ACK       = 6067;  // SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
-	CS_PAY_ORDER_COMPLETE_REQ         = 6072;		//	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [SSPayOrderCompleteReq]
-	SC_PAY_ORDER_COMPLETE_ACK         = 6073;		//	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SSPayOrderCompleteAck]
+	CS_PAY_ORDER_COMPLETE_REQ         = 6072;		//	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
+	SC_PAY_ORDER_COMPLETE_ACK         = 6073;		//	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
 }

ProtocolGen/proto/protocal.proto

@@ -321,7 +321,7 @@ message Request {
      CSClimbingTowerWjEndReq         	CS_CLIMBING_TOWER_WJ_END_REQ           =  6061;         // CSClimbingTowerWjEndReq **CSClimbingTowerWjEndReq **login.proto **game [CSClimbingTowerWjEndReq]
      CSClimbingTowerWjRankReq         	CS_CLIMBING_TOWER_WJ_RANK_REQ           =  6063;         // CSClimbingTowerWjRankReq **CSClimbingTowerWjRankReq **login.proto **game [CSClimbingTowerWjRankReq]
      CSClimbingTowerWjBuffReq         	CS_CLIMBING_TOWER_WJ_BUFF_REQ           =  6066;         // CSClimbingTowerWjBuffReq **CSClimbingTowerWjBuffReq **login.proto **game [CSClimbingTowerWjBuffReq]
-     SSPayOrderCompleteReq         	CS_PAY_ORDER_COMPLETE_REQ             =  6072;         //	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [SSPayOrderCompleteReq]
+     CSPayOrderCompleteReq         	CS_PAY_ORDER_COMPLETE_REQ             =  6072;         //	CSPayOrderCompleteReq **CSPayOrderCompleteReq **login.proto **game [CSPayOrderCompleteReq]
 }
 message Response {
      SCPingAck           	SC_PING_ACK                          =  1001;         //	SCPingAck **SCPingAck **login.proto ** [SCPingAck]
@@ -732,5 +732,5 @@ message Response {
      SCClimbingTowerWjRankAck           	SC_CLIMBING_TOWER_WJ_RANK_ACK           =  6064;         // SCClimbingTowerWjRankAck **SCClimbingTowerWjRankAck **login.proto ** [SCClimbingTowerWjRankAck]
      SCClimbingTowerWjBossNtf           	SC_CLIMBING_TOWER_WJ_BOSS_NTF           =  6065;         // SCClimbingTowerWjBossNtf **SCClimbingTowerWjBossNtf **login.proto ** [SCClimbingTowerWjBossNtf]
      SCClimbingTowerWjBuffAck           	SC_CLIMBING_TOWER_WJ_BUFF_ACK           =  6067;         // SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
-     SSPayOrderCompleteAck           	SC_PAY_ORDER_COMPLETE_ACK             =  6073;         //	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SSPayOrderCompleteAck]
+     SCPayOrderCompleteAck           	SC_PAY_ORDER_COMPLETE_ACK             =  6073;         //	SCPayOrderCompleteAck **SCPayOrderCompleteAck **login.proto **game [SCPayOrderCompleteAck]
 }

UserSettings/AndroidLogcatSettings.asset

@@ -2,40 +2,40 @@
     "m_SelectedDeviceId": "192.168.0.53:5555",
     "m_SelectedProcess": {
         "deviceId": "192.168.0.53:5555",
-        "name": "com.hues.daew",
-        "processId": 4385,
+        "name": "com.metasensor.ro.mi",
+        "processId": 4117,
         "exited": false
     },
     "m_SelectedPriority": 0,
     "m_KnownProcessesForSerialization": [
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3178,
+            "name": "com.Runjin.Wonderland.gp",
+            "processId": 2704,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3398,
+            "name": "com.xjro.yy",
+            "processId": 2861,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3668,
+            "name": "com.metasensor.ro.mi",
+            "processId": 2702,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 3839,
+            "name": "com.metasensor.ro.mi",
+            "processId": 3428,
             "exited": true
         },
         {
             "deviceId": "192.168.0.53:5555",
-            "name": "com.hues.daew",
-            "processId": 4385,
+            "name": "com.metasensor.ro.mi",
+            "processId": 4117,
             "exited": false
         }
     ],

UserSettings/Layouts/default-2021.dwlt

@@ -43,7 +43,7 @@ MonoBehaviour:
     width: 1304
     height: 903
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: Console
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -67,8 +67,8 @@ MonoBehaviour:
     y: 0
     width: 546
     height: 963
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 200, y: 221}
+  m_MaxSize: {x: 4000, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -97,7 +97,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 221}
   m_MaxSize: {x: 4000, y: 4021}
   vertical: 0
-  controlID: 19
+  controlID: 20
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -193,7 +193,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 188
+  controlID: 67
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -218,7 +218,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 189
+  controlID: 48
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -243,7 +243,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 78
+  controlID: 49
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -263,8 +263,8 @@ MonoBehaviour:
     y: 0
     width: 464
     height: 541
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 17}
@@ -289,8 +289,8 @@ MonoBehaviour:
     y: 0
     width: 462
     height: 541
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -307,7 +307,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -316,14 +316,14 @@ MonoBehaviour:
     y: 541
     width: 926
     height: 312
-  m_MinSize: {x: 231, y: 271}
-  m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 16}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
   - {fileID: 16}
   - {fileID: 20}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -485,23 +485,23 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Content/Raw_Art/UI/UILanuch
+    - Assets/Content/Prefabs/UI
     m_Globs: []
     m_OriginalText: 
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Content/Raw_Art/UI/UILanuch
+  - Assets/Content/Prefabs/UI/PaySelect
   m_LastFoldersGridSize: 16
   m_LastProjectPath: E:\Project\Unity\bt_client_2022_S
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 1041}
-    m_SelectedIDs: 00920000
-    m_LastClickedID: 37376
-    m_ExpandedIDs: 000000004e5f0000505f0000525f0000545f0000565f0000585f00005a5f00005c5f00005e5f0000ca91000000ca9a3b
+    scrollPos: {x: 0, y: 881}
+    m_SelectedIDs: 3e620000
+    m_LastClickedID: 25150
+    m_ExpandedIDs: 000000003c6200003e6200004262000046620000486200004a6200004c6200004e620000506200006462000096620000a662000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -529,7 +529,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000004e5f0000505f0000525f0000545f0000565f0000585f00005a5f00005c5f00005e5f0000
+    m_ExpandedIDs: 000000003c6200003e62000040620000426200004462000046620000486200004a6200004c6200004e62000050620000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -556,7 +556,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: c62300002cdf01008cb00c0000cf0c0076280d007e660c0098660c0060940c0008a10c00e6950c008ec90c00c2f8010000000000084604006c410400a2010500b6610000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -573,7 +573,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 12}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -618,23 +618,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 6c620000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: defaffff
+      m_ExpandedIDs: b858f8ff108cf8ff148cf8ff168cf8ff1e8cf8ff2a8cf8ff488cf8ff94f7faff0a03fbff5c03fbff9206fbffa006fbffcc06fbff1a0afbff5a11fbfff812fbff2833fbffe837fbff2439fbff163dfbff1c40fbff5243fbff7846fbff2a4ffbff6451fbff8c53fbff7057fbffc25afbffb669fbffdc6cfbff046ffbff3e71fbffce72fbffb276fbff867efbff7a89fbff62e5fbff88e7fbff8eebfbffe820fcffae39fcffc046fcffa649fcffd665fcffc869fcfff06cfcff966efcff2e70fcff4271fcffa072fcfff475fcff1a78fcfff679fcff6080fcffdc82fcff2a86fcffd288fcff708afcff9a8cfcffd08ffcff2a93fcff3096fcff4298fcff689bfcffe09cfcff5aa0fcff7aa4fcffb4a6fcff98aafcff72abfcff64affcff88b0fcff26bffcffacccfcffc8d2fcffb6defcffa4e0fcff34e2fcff08eafcff92eefcff86fdfcff3806fdff6609fdff0e34fdfff43afdff723cfdff783cfdff40d8fdff98f8fffff4fffffff6610000ccce1d0028cf1d00d8d21d00
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: CanvasWebViewPrefabView
+        m_OriginalName: CanvasWebViewPrefabView
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: 1953534
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 11}
       m_SearchString: 
@@ -937,9 +937,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.14410615, y: -2.2118068, z: 1.0871732}
+    m_Target: {x: -0.8499879, y: 1.1609719, z: 1.2630944}
     speed: 2
-    m_Value: {x: 0.14410615, y: -2.2118068, z: 1.0871732}
+    m_Value: {x: -0.8499879, y: 1.1609719, z: 1.2630944}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -990,9 +990,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 3.300978
+    m_Target: 5.1832547
     speed: 2
-    m_Value: 3.300978
+    m_Value: 5.1832547
   m_Ortho:
     m_Target: 1
     speed: 2