DESKTOP-RH64908\Administrator 926d12f244 Merge branch 'dev_bt_ob2' into develop_bt_ob2 ... # Conflicts: # Assets/ManagedResources/Icons/r_Resource_Coin_xjk20.png.meta # Assets/ManagedResources/Icons/r_Resource_Coin_xjk200.png.meta # Assets/ManagedResources/Icons/r_Resource_Coin_xjk30.png.meta # Assets/ManagedResources/Icons/r_Resource_Coin_xjk300.png.meta # Assets/ManagedResources/Icons/r_Resource_Coin_xjk50.png.meta # Assets/ManagedResources/Icons/r_Resource_Coin_xjk500.png.meta # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua # Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua # Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua		2023-07-03 18:34:50 +08:00
..
PayManager.lua	Merge branch 'dev_bt_ob2' into develop_bt_ob2	2023-07-03 18:34:50 +08:00
PayManager.lua.meta	…